diff --git a/os-client-config/releasenotes/source/conf.py b/os-client-config/releasenotes/source/conf.py
deleted file mode 100644
index 1d0365645..000000000
--- a/os-client-config/releasenotes/source/conf.py
+++ /dev/null
@@ -1,265 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Os-Client-Config Release Notes documentation build configuration file, created by
-# sphinx-quickstart on Thu Nov  5 11:50:32 2015.
-#
-# This file is execfile()d with the current directory set to its
-# containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
-
-# If extensions (or modules to document with autodoc) are in another directory,
-# add these directories to sys.path here. If the directory is relative to the
-# documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.insert(0, os.path.abspath('.'))
-
-# -- General configuration ------------------------------------------------
-
-# If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
-import openstackdocstheme
-
-# Add any Sphinx extension module names here, as strings. They can be
-# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-# ones.
-extensions = [
-    'reno.sphinxext',
-]
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
-
-# The suffix of source filenames.
-source_suffix = '.rst'
-
-# The encoding of source files.
-#source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = 'index'
-
-# General information about the project.
-project = u'os-client-config Release Notes'
-copyright = u'2015, os-client-config developers'
-
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-import pbr.version
-occ_version = pbr.version.VersionInfo('os-client-config')
-# The short X.Y version.
-version = occ_version.canonical_version_string()
-# The full version, including alpha/beta/rc tags.
-release = occ_version.version_string_with_vcs()
-
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-#language = None
-
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-#today = ''
-# Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
-
-# List of patterns, relative to source directory, that match files and
-# directories to ignore when looking for source files.
-exclude_patterns = []
-
-# The reST default role (used for this markup: `text`) to use for all
-# documents.
-#default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-#add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-#show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
-
-# A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
-
-# If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
-
-
-# -- Options for HTML output ----------------------------------------------
-
-# The theme to use for HTML and HTML Help pages.  See the documentation for
-# a list of builtin themes.
-html_theme = 'openstackdocs'
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-#html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
-html_theme_path = [openstackdocstheme.get_html_theme_path()]
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-#html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-#html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-#html_favicon = None
-
-# Add any paths that contain custom static files (such as style sheets) here,
-# relative to this directory. They are copied after the builtin static files,
-# so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# Add any extra paths that contain custom files (such as robots.txt or
-# .htaccess) here, relative to this directory. These files are copied
-# directly to the root of the documentation.
-#html_extra_path = []
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-#html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-#html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-#html_additional_pages = {}
-
-# If false, no module index is generated.
-#html_domain_indices = True
-
-# If false, no index is generated.
-#html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-#html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-#html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = 'OCCReleaseNotesdoc'
-
-
-# -- Options for LaTeX output ---------------------------------------------
-
-latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-latex_documents = [
-  ('index', 'OCCReleaseNotes.tex', u'os-client-config Release Notes Documentation',
-   u'os-client-config developers', 'manual'),
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-#latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-#latex_use_parts = False
-
-# If true, show page references after internal links.
-#latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-#latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-#latex_appendices = []
-
-# If false, no module index is generated.
-#latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    ('index', 'occreleasenotes', u'os-client-config Release Notes Documentation',
-     [u'os-client-config developers'], 1)
-]
-
-# If true, show URL addresses after external links.
-#man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-  ('index', 'OCCReleaseNotes', u'os-client-config Release Notes Documentation',
-   u'os-client-config developers', 'OCCReleaseNotes',
-   'One line description of project.',
-   'Miscellaneous'),
-]
-
-# Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
-
-# If false, no module index is generated.
-#texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
-
-# -- Options for Internationalization output ------------------------------
-locale_dirs = ['locale/']
diff --git a/os-client-config/releasenotes/source/index.rst b/os-client-config/releasenotes/source/index.rst
deleted file mode 100644
index 405f263a0..000000000
--- a/os-client-config/releasenotes/source/index.rst
+++ /dev/null
@@ -1,21 +0,0 @@
-================================
- os-client-config Release Notes
-================================
-
-Contents
-========
-
-.. toctree::
-   :maxdepth: 2
-
-   unreleased
-   pike
-   ocata
-   newton
-   mitaka
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`search`
diff --git a/os-client-config/releasenotes/source/unreleased.rst b/os-client-config/releasenotes/source/unreleased.rst
deleted file mode 100644
index 875030f9d..000000000
--- a/os-client-config/releasenotes/source/unreleased.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-============================
-Current Series Release Notes
-============================
-
-.. release-notes::
diff --git a/shade/releasenotes/notes/add-jmespath-support-f47b7a503dbbfda1.yaml b/releasenotes/notes/add-jmespath-support-f47b7a503dbbfda1.yaml
similarity index 100%
rename from shade/releasenotes/notes/add-jmespath-support-f47b7a503dbbfda1.yaml
rename to releasenotes/notes/add-jmespath-support-f47b7a503dbbfda1.yaml
diff --git a/shade/releasenotes/notes/add-list_flavor_access-e038253e953e6586.yaml b/releasenotes/notes/add-list_flavor_access-e038253e953e6586.yaml
similarity index 100%
rename from shade/releasenotes/notes/add-list_flavor_access-e038253e953e6586.yaml
rename to releasenotes/notes/add-list_flavor_access-e038253e953e6586.yaml
diff --git a/shade/releasenotes/notes/add-server-console-078ed2696e5b04d9.yaml b/releasenotes/notes/add-server-console-078ed2696e5b04d9.yaml
similarity index 100%
rename from shade/releasenotes/notes/add-server-console-078ed2696e5b04d9.yaml
rename to releasenotes/notes/add-server-console-078ed2696e5b04d9.yaml
diff --git a/shade/releasenotes/notes/add-show-all-images-flag-352748b6c3d99f3f.yaml b/releasenotes/notes/add-show-all-images-flag-352748b6c3d99f3f.yaml
similarity index 100%
rename from shade/releasenotes/notes/add-show-all-images-flag-352748b6c3d99f3f.yaml
rename to releasenotes/notes/add-show-all-images-flag-352748b6c3d99f3f.yaml
diff --git a/shade/releasenotes/notes/add_description_create_user-0ddc9a0ef4da840d.yaml b/releasenotes/notes/add_description_create_user-0ddc9a0ef4da840d.yaml
similarity index 100%
rename from shade/releasenotes/notes/add_description_create_user-0ddc9a0ef4da840d.yaml
rename to releasenotes/notes/add_description_create_user-0ddc9a0ef4da840d.yaml
diff --git a/shade/releasenotes/notes/add_designate_recordsets_support-69af0a6b317073e7.yaml b/releasenotes/notes/add_designate_recordsets_support-69af0a6b317073e7.yaml
similarity index 100%
rename from shade/releasenotes/notes/add_designate_recordsets_support-69af0a6b317073e7.yaml
rename to releasenotes/notes/add_designate_recordsets_support-69af0a6b317073e7.yaml
diff --git a/shade/releasenotes/notes/add_designate_zones_support-35fa9b8b09995b43.yaml b/releasenotes/notes/add_designate_zones_support-35fa9b8b09995b43.yaml
similarity index 100%
rename from shade/releasenotes/notes/add_designate_zones_support-35fa9b8b09995b43.yaml
rename to releasenotes/notes/add_designate_zones_support-35fa9b8b09995b43.yaml
diff --git a/shade/releasenotes/notes/add_host_aggregate_support-471623faf45ec3c3.yaml b/releasenotes/notes/add_host_aggregate_support-471623faf45ec3c3.yaml
similarity index 100%
rename from shade/releasenotes/notes/add_host_aggregate_support-471623faf45ec3c3.yaml
rename to releasenotes/notes/add_host_aggregate_support-471623faf45ec3c3.yaml
diff --git a/shade/releasenotes/notes/add_magnum_baymodel_support-e35e5aab0b14ff75.yaml b/releasenotes/notes/add_magnum_baymodel_support-e35e5aab0b14ff75.yaml
similarity index 100%
rename from shade/releasenotes/notes/add_magnum_baymodel_support-e35e5aab0b14ff75.yaml
rename to releasenotes/notes/add_magnum_baymodel_support-e35e5aab0b14ff75.yaml
diff --git a/shade/releasenotes/notes/add_magnum_services_support-3d95f9dcc60b5573.yaml b/releasenotes/notes/add_magnum_services_support-3d95f9dcc60b5573.yaml
similarity index 100%
rename from shade/releasenotes/notes/add_magnum_services_support-3d95f9dcc60b5573.yaml
rename to releasenotes/notes/add_magnum_services_support-3d95f9dcc60b5573.yaml
diff --git a/shade/releasenotes/notes/add_server_group_support-dfa472e3dae7d34d.yaml b/releasenotes/notes/add_server_group_support-dfa472e3dae7d34d.yaml
similarity index 100%
rename from shade/releasenotes/notes/add_server_group_support-dfa472e3dae7d34d.yaml
rename to releasenotes/notes/add_server_group_support-dfa472e3dae7d34d.yaml
diff --git a/shade/releasenotes/notes/add_update_server-8761059d6de7e68b.yaml b/releasenotes/notes/add_update_server-8761059d6de7e68b.yaml
similarity index 100%
rename from shade/releasenotes/notes/add_update_server-8761059d6de7e68b.yaml
rename to releasenotes/notes/add_update_server-8761059d6de7e68b.yaml
diff --git a/shade/releasenotes/notes/add_update_service-28e590a7a7524053.yaml b/releasenotes/notes/add_update_service-28e590a7a7524053.yaml
similarity index 100%
rename from shade/releasenotes/notes/add_update_service-28e590a7a7524053.yaml
rename to releasenotes/notes/add_update_service-28e590a7a7524053.yaml
diff --git a/shade/releasenotes/notes/always-detail-cluster-templates-3eb4b5744ba327ac.yaml b/releasenotes/notes/always-detail-cluster-templates-3eb4b5744ba327ac.yaml
similarity index 100%
rename from shade/releasenotes/notes/always-detail-cluster-templates-3eb4b5744ba327ac.yaml
rename to releasenotes/notes/always-detail-cluster-templates-3eb4b5744ba327ac.yaml
diff --git a/shade/releasenotes/notes/bug-2001080-de52ead3c5466792.yaml b/releasenotes/notes/bug-2001080-de52ead3c5466792.yaml
similarity index 100%
rename from shade/releasenotes/notes/bug-2001080-de52ead3c5466792.yaml
rename to releasenotes/notes/bug-2001080-de52ead3c5466792.yaml
diff --git a/shade/releasenotes/notes/cache-in-use-volumes-c7fa8bb378106fe3.yaml b/releasenotes/notes/cache-in-use-volumes-c7fa8bb378106fe3.yaml
similarity index 100%
rename from shade/releasenotes/notes/cache-in-use-volumes-c7fa8bb378106fe3.yaml
rename to releasenotes/notes/cache-in-use-volumes-c7fa8bb378106fe3.yaml
diff --git a/os-client-config/releasenotes/notes/catch-up-release-notes-e385fad34e9f3d6e.yaml b/releasenotes/notes/catch-up-release-notes-e385fad34e9f3d6e.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/catch-up-release-notes-e385fad34e9f3d6e.yaml
rename to releasenotes/notes/catch-up-release-notes-e385fad34e9f3d6e.yaml
diff --git a/shade/releasenotes/notes/change-attach-vol-return-value-4834a1f78392abb1.yaml b/releasenotes/notes/change-attach-vol-return-value-4834a1f78392abb1.yaml
similarity index 100%
rename from shade/releasenotes/notes/change-attach-vol-return-value-4834a1f78392abb1.yaml
rename to releasenotes/notes/change-attach-vol-return-value-4834a1f78392abb1.yaml
diff --git a/shade/releasenotes/notes/cinder_volume_backups_support-6f7ceab440853833.yaml b/releasenotes/notes/cinder_volume_backups_support-6f7ceab440853833.yaml
similarity index 100%
rename from shade/releasenotes/notes/cinder_volume_backups_support-6f7ceab440853833.yaml
rename to releasenotes/notes/cinder_volume_backups_support-6f7ceab440853833.yaml
diff --git a/shade/releasenotes/notes/cinderv2-norm-fix-037189c60b43089f.yaml b/releasenotes/notes/cinderv2-norm-fix-037189c60b43089f.yaml
similarity index 100%
rename from shade/releasenotes/notes/cinderv2-norm-fix-037189c60b43089f.yaml
rename to releasenotes/notes/cinderv2-norm-fix-037189c60b43089f.yaml
diff --git a/os-client-config/releasenotes/notes/cloud-profile-status-e0d29b5e2f10e95c.yaml b/releasenotes/notes/cloud-profile-status-e0d29b5e2f10e95c.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/cloud-profile-status-e0d29b5e2f10e95c.yaml
rename to releasenotes/notes/cloud-profile-status-e0d29b5e2f10e95c.yaml
diff --git a/shade/releasenotes/notes/compute-quotas-b07a0f24dfac8444.yaml b/releasenotes/notes/compute-quotas-b07a0f24dfac8444.yaml
similarity index 100%
rename from shade/releasenotes/notes/compute-quotas-b07a0f24dfac8444.yaml
rename to releasenotes/notes/compute-quotas-b07a0f24dfac8444.yaml
diff --git a/shade/releasenotes/notes/compute-usage-defaults-5f5b2936f17ff400.yaml b/releasenotes/notes/compute-usage-defaults-5f5b2936f17ff400.yaml
similarity index 100%
rename from shade/releasenotes/notes/compute-usage-defaults-5f5b2936f17ff400.yaml
rename to releasenotes/notes/compute-usage-defaults-5f5b2936f17ff400.yaml
diff --git a/shade/releasenotes/notes/config-flavor-specs-ca712e17971482b6.yaml b/releasenotes/notes/config-flavor-specs-ca712e17971482b6.yaml
similarity index 100%
rename from shade/releasenotes/notes/config-flavor-specs-ca712e17971482b6.yaml
rename to releasenotes/notes/config-flavor-specs-ca712e17971482b6.yaml
diff --git a/shade/releasenotes/notes/create-stack-fix-12dbb59a48ac7442.yaml b/releasenotes/notes/create-stack-fix-12dbb59a48ac7442.yaml
similarity index 100%
rename from shade/releasenotes/notes/create-stack-fix-12dbb59a48ac7442.yaml
rename to releasenotes/notes/create-stack-fix-12dbb59a48ac7442.yaml
diff --git a/shade/releasenotes/notes/create_server_network_fix-c4a56b31d2850a4b.yaml b/releasenotes/notes/create_server_network_fix-c4a56b31d2850a4b.yaml
similarity index 100%
rename from shade/releasenotes/notes/create_server_network_fix-c4a56b31d2850a4b.yaml
rename to releasenotes/notes/create_server_network_fix-c4a56b31d2850a4b.yaml
diff --git a/shade/releasenotes/notes/create_service_norm-319a97433d68fa6a.yaml b/releasenotes/notes/create_service_norm-319a97433d68fa6a.yaml
similarity index 100%
rename from shade/releasenotes/notes/create_service_norm-319a97433d68fa6a.yaml
rename to releasenotes/notes/create_service_norm-319a97433d68fa6a.yaml
diff --git a/shade/releasenotes/notes/data-model-cf50d86982646370.yaml b/releasenotes/notes/data-model-cf50d86982646370.yaml
similarity index 100%
rename from shade/releasenotes/notes/data-model-cf50d86982646370.yaml
rename to releasenotes/notes/data-model-cf50d86982646370.yaml
diff --git a/shade/releasenotes/notes/delete-image-objects-9d4b4e0fff36a23f.yaml b/releasenotes/notes/delete-image-objects-9d4b4e0fff36a23f.yaml
similarity index 100%
rename from shade/releasenotes/notes/delete-image-objects-9d4b4e0fff36a23f.yaml
rename to releasenotes/notes/delete-image-objects-9d4b4e0fff36a23f.yaml
diff --git a/shade/releasenotes/notes/delete-obj-return-a3ecf0415b7a2989.yaml b/releasenotes/notes/delete-obj-return-a3ecf0415b7a2989.yaml
similarity index 100%
rename from shade/releasenotes/notes/delete-obj-return-a3ecf0415b7a2989.yaml
rename to releasenotes/notes/delete-obj-return-a3ecf0415b7a2989.yaml
diff --git a/shade/releasenotes/notes/delete_project-399f9b3107014dde.yaml b/releasenotes/notes/delete_project-399f9b3107014dde.yaml
similarity index 100%
rename from shade/releasenotes/notes/delete_project-399f9b3107014dde.yaml
rename to releasenotes/notes/delete_project-399f9b3107014dde.yaml
diff --git a/shade/releasenotes/notes/domain_operations_name_or_id-baba4cac5b67234d.yaml b/releasenotes/notes/domain_operations_name_or_id-baba4cac5b67234d.yaml
similarity index 100%
rename from shade/releasenotes/notes/domain_operations_name_or_id-baba4cac5b67234d.yaml
rename to releasenotes/notes/domain_operations_name_or_id-baba4cac5b67234d.yaml
diff --git a/shade/releasenotes/notes/dual-stack-networks-8a81941c97d28deb.yaml b/releasenotes/notes/dual-stack-networks-8a81941c97d28deb.yaml
similarity index 100%
rename from shade/releasenotes/notes/dual-stack-networks-8a81941c97d28deb.yaml
rename to releasenotes/notes/dual-stack-networks-8a81941c97d28deb.yaml
diff --git a/shade/releasenotes/notes/endpoint-from-catalog-bad36cb0409a4e6a.yaml b/releasenotes/notes/endpoint-from-catalog-bad36cb0409a4e6a.yaml
similarity index 100%
rename from shade/releasenotes/notes/endpoint-from-catalog-bad36cb0409a4e6a.yaml
rename to releasenotes/notes/endpoint-from-catalog-bad36cb0409a4e6a.yaml
diff --git a/shade/releasenotes/notes/false-not-attribute-error-49484d0fdc61f75d.yaml b/releasenotes/notes/false-not-attribute-error-49484d0fdc61f75d.yaml
similarity index 100%
rename from shade/releasenotes/notes/false-not-attribute-error-49484d0fdc61f75d.yaml
rename to releasenotes/notes/false-not-attribute-error-49484d0fdc61f75d.yaml
diff --git a/shade/releasenotes/notes/feature-server-metadata-50caf18cec532160.yaml b/releasenotes/notes/feature-server-metadata-50caf18cec532160.yaml
similarity index 100%
rename from shade/releasenotes/notes/feature-server-metadata-50caf18cec532160.yaml
rename to releasenotes/notes/feature-server-metadata-50caf18cec532160.yaml
diff --git a/shade/releasenotes/notes/fip_timeout-035c4bb3ff92fa1f.yaml b/releasenotes/notes/fip_timeout-035c4bb3ff92fa1f.yaml
similarity index 100%
rename from shade/releasenotes/notes/fip_timeout-035c4bb3ff92fa1f.yaml
rename to releasenotes/notes/fip_timeout-035c4bb3ff92fa1f.yaml
diff --git a/os-client-config/releasenotes/notes/fix-compat-with-old-keystoneauth-66e11ee9d008b962.yaml b/releasenotes/notes/fix-compat-with-old-keystoneauth-66e11ee9d008b962.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/fix-compat-with-old-keystoneauth-66e11ee9d008b962.yaml
rename to releasenotes/notes/fix-compat-with-old-keystoneauth-66e11ee9d008b962.yaml
diff --git a/shade/releasenotes/notes/fix-config-drive-a148b7589f7e1022.yaml b/releasenotes/notes/fix-config-drive-a148b7589f7e1022.yaml
similarity index 100%
rename from shade/releasenotes/notes/fix-config-drive-a148b7589f7e1022.yaml
rename to releasenotes/notes/fix-config-drive-a148b7589f7e1022.yaml
diff --git a/shade/releasenotes/notes/fix-delete-ips-1d4eebf7bc4d4733.yaml b/releasenotes/notes/fix-delete-ips-1d4eebf7bc4d4733.yaml
similarity index 100%
rename from shade/releasenotes/notes/fix-delete-ips-1d4eebf7bc4d4733.yaml
rename to releasenotes/notes/fix-delete-ips-1d4eebf7bc4d4733.yaml
diff --git a/shade/releasenotes/notes/fix-list-networks-a592725df64c306e.yaml b/releasenotes/notes/fix-list-networks-a592725df64c306e.yaml
similarity index 100%
rename from shade/releasenotes/notes/fix-list-networks-a592725df64c306e.yaml
rename to releasenotes/notes/fix-list-networks-a592725df64c306e.yaml
diff --git a/shade/releasenotes/notes/fix-missing-futures-a0617a1c1ce6e659.yaml b/releasenotes/notes/fix-missing-futures-a0617a1c1ce6e659.yaml
similarity index 100%
rename from shade/releasenotes/notes/fix-missing-futures-a0617a1c1ce6e659.yaml
rename to releasenotes/notes/fix-missing-futures-a0617a1c1ce6e659.yaml
diff --git a/shade/releasenotes/notes/fix-properties-key-conflict-2161ca1faaad6731.yaml b/releasenotes/notes/fix-properties-key-conflict-2161ca1faaad6731.yaml
similarity index 100%
rename from shade/releasenotes/notes/fix-properties-key-conflict-2161ca1faaad6731.yaml
rename to releasenotes/notes/fix-properties-key-conflict-2161ca1faaad6731.yaml
diff --git a/shade/releasenotes/notes/fix-supplemental-fips-c9cd58aac12eb30e.yaml b/releasenotes/notes/fix-supplemental-fips-c9cd58aac12eb30e.yaml
similarity index 100%
rename from shade/releasenotes/notes/fix-supplemental-fips-c9cd58aac12eb30e.yaml
rename to releasenotes/notes/fix-supplemental-fips-c9cd58aac12eb30e.yaml
diff --git a/shade/releasenotes/notes/fix-update-domain-af47b066ac52eb7f.yaml b/releasenotes/notes/fix-update-domain-af47b066ac52eb7f.yaml
similarity index 100%
rename from shade/releasenotes/notes/fix-update-domain-af47b066ac52eb7f.yaml
rename to releasenotes/notes/fix-update-domain-af47b066ac52eb7f.yaml
diff --git a/shade/releasenotes/notes/fixed-magnum-type-7406f0a60525f858.yaml b/releasenotes/notes/fixed-magnum-type-7406f0a60525f858.yaml
similarity index 100%
rename from shade/releasenotes/notes/fixed-magnum-type-7406f0a60525f858.yaml
rename to releasenotes/notes/fixed-magnum-type-7406f0a60525f858.yaml
diff --git a/shade/releasenotes/notes/flavor_fix-a53c6b326dc34a2c.yaml b/releasenotes/notes/flavor_fix-a53c6b326dc34a2c.yaml
similarity index 100%
rename from shade/releasenotes/notes/flavor_fix-a53c6b326dc34a2c.yaml
rename to releasenotes/notes/flavor_fix-a53c6b326dc34a2c.yaml
diff --git a/shade/releasenotes/notes/fnmatch-name-or-id-f658fe26f84086c8.yaml b/releasenotes/notes/fnmatch-name-or-id-f658fe26f84086c8.yaml
similarity index 100%
rename from shade/releasenotes/notes/fnmatch-name-or-id-f658fe26f84086c8.yaml
rename to releasenotes/notes/fnmatch-name-or-id-f658fe26f84086c8.yaml
diff --git a/shade/releasenotes/notes/get-limits-c383c512f8e01873.yaml b/releasenotes/notes/get-limits-c383c512f8e01873.yaml
similarity index 100%
rename from shade/releasenotes/notes/get-limits-c383c512f8e01873.yaml
rename to releasenotes/notes/get-limits-c383c512f8e01873.yaml
diff --git a/shade/releasenotes/notes/get-usage-72d249ff790d1b8f.yaml b/releasenotes/notes/get-usage-72d249ff790d1b8f.yaml
similarity index 100%
rename from shade/releasenotes/notes/get-usage-72d249ff790d1b8f.yaml
rename to releasenotes/notes/get-usage-72d249ff790d1b8f.yaml
diff --git a/shade/releasenotes/notes/get_object_api-968483adb016bce1.yaml b/releasenotes/notes/get_object_api-968483adb016bce1.yaml
similarity index 100%
rename from shade/releasenotes/notes/get_object_api-968483adb016bce1.yaml
rename to releasenotes/notes/get_object_api-968483adb016bce1.yaml
diff --git a/shade/releasenotes/notes/glance-image-pagination-0b4dfef22b25852b.yaml b/releasenotes/notes/glance-image-pagination-0b4dfef22b25852b.yaml
similarity index 100%
rename from shade/releasenotes/notes/glance-image-pagination-0b4dfef22b25852b.yaml
rename to releasenotes/notes/glance-image-pagination-0b4dfef22b25852b.yaml
diff --git a/shade/releasenotes/notes/grant-revoke-assignments-231d3f9596a1ae75.yaml b/releasenotes/notes/grant-revoke-assignments-231d3f9596a1ae75.yaml
similarity index 100%
rename from shade/releasenotes/notes/grant-revoke-assignments-231d3f9596a1ae75.yaml
rename to releasenotes/notes/grant-revoke-assignments-231d3f9596a1ae75.yaml
diff --git a/shade/releasenotes/notes/image-flavor-by-name-54865b00ebbf1004.yaml b/releasenotes/notes/image-flavor-by-name-54865b00ebbf1004.yaml
similarity index 100%
rename from shade/releasenotes/notes/image-flavor-by-name-54865b00ebbf1004.yaml
rename to releasenotes/notes/image-flavor-by-name-54865b00ebbf1004.yaml
diff --git a/shade/releasenotes/notes/image-from-volume-9acf7379f5995b5b.yaml b/releasenotes/notes/image-from-volume-9acf7379f5995b5b.yaml
similarity index 100%
rename from shade/releasenotes/notes/image-from-volume-9acf7379f5995b5b.yaml
rename to releasenotes/notes/image-from-volume-9acf7379f5995b5b.yaml
diff --git a/shade/releasenotes/notes/infer-secgroup-source-58d840aaf1a1f485.yaml b/releasenotes/notes/infer-secgroup-source-58d840aaf1a1f485.yaml
similarity index 100%
rename from shade/releasenotes/notes/infer-secgroup-source-58d840aaf1a1f485.yaml
rename to releasenotes/notes/infer-secgroup-source-58d840aaf1a1f485.yaml
diff --git a/os-client-config/releasenotes/notes/ironic-microversion-ba5b0f36f11196a6.yaml b/releasenotes/notes/ironic-microversion-ba5b0f36f11196a6.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/ironic-microversion-ba5b0f36f11196a6.yaml
rename to releasenotes/notes/ironic-microversion-ba5b0f36f11196a6.yaml
diff --git a/shade/releasenotes/notes/less-file-hashing-d2497337da5acbef.yaml b/releasenotes/notes/less-file-hashing-d2497337da5acbef.yaml
similarity index 100%
rename from shade/releasenotes/notes/less-file-hashing-d2497337da5acbef.yaml
rename to releasenotes/notes/less-file-hashing-d2497337da5acbef.yaml
diff --git a/shade/releasenotes/notes/list-az-names-a38c277d1192471b.yaml b/releasenotes/notes/list-az-names-a38c277d1192471b.yaml
similarity index 100%
rename from shade/releasenotes/notes/list-az-names-a38c277d1192471b.yaml
rename to releasenotes/notes/list-az-names-a38c277d1192471b.yaml
diff --git a/shade/releasenotes/notes/list-role-assignments-keystone-v2-b127b12b4860f50c.yaml b/releasenotes/notes/list-role-assignments-keystone-v2-b127b12b4860f50c.yaml
similarity index 100%
rename from shade/releasenotes/notes/list-role-assignments-keystone-v2-b127b12b4860f50c.yaml
rename to releasenotes/notes/list-role-assignments-keystone-v2-b127b12b4860f50c.yaml
diff --git a/shade/releasenotes/notes/list-servers-all-projects-349e6dc665ba2e8d.yaml b/releasenotes/notes/list-servers-all-projects-349e6dc665ba2e8d.yaml
similarity index 100%
rename from shade/releasenotes/notes/list-servers-all-projects-349e6dc665ba2e8d.yaml
rename to releasenotes/notes/list-servers-all-projects-349e6dc665ba2e8d.yaml
diff --git a/os-client-config/releasenotes/notes/load-yaml-3177efca78e5c67a.yaml b/releasenotes/notes/load-yaml-3177efca78e5c67a.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/load-yaml-3177efca78e5c67a.yaml
rename to releasenotes/notes/load-yaml-3177efca78e5c67a.yaml
diff --git a/shade/releasenotes/notes/log-request-ids-37507cb6eed9a7da.yaml b/releasenotes/notes/log-request-ids-37507cb6eed9a7da.yaml
similarity index 100%
rename from shade/releasenotes/notes/log-request-ids-37507cb6eed9a7da.yaml
rename to releasenotes/notes/log-request-ids-37507cb6eed9a7da.yaml
diff --git a/os-client-config/releasenotes/notes/magic-fixes-dca4ae4dac2441a8.yaml b/releasenotes/notes/magic-fixes-dca4ae4dac2441a8.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/magic-fixes-dca4ae4dac2441a8.yaml
rename to releasenotes/notes/magic-fixes-dca4ae4dac2441a8.yaml
diff --git a/os-client-config/releasenotes/notes/make-rest-client-dd3d365632a26fa0.yaml b/releasenotes/notes/make-rest-client-dd3d365632a26fa0.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/make-rest-client-dd3d365632a26fa0.yaml
rename to releasenotes/notes/make-rest-client-dd3d365632a26fa0.yaml
diff --git a/shade/releasenotes/notes/make_object_metadata_easier.yaml-e9751723e002e06f.yaml b/releasenotes/notes/make_object_metadata_easier.yaml-e9751723e002e06f.yaml
similarity index 100%
rename from shade/releasenotes/notes/make_object_metadata_easier.yaml-e9751723e002e06f.yaml
rename to releasenotes/notes/make_object_metadata_easier.yaml-e9751723e002e06f.yaml
diff --git a/releasenotes/notes/merge-shade-os-client-config-29878734ad643e33.yaml b/releasenotes/notes/merge-shade-os-client-config-29878734ad643e33.yaml
new file mode 100644
index 000000000..f7718aabb
--- /dev/null
+++ b/releasenotes/notes/merge-shade-os-client-config-29878734ad643e33.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - The shade and os-client-config libraries have been
+    merged into python-openstacksdk.
diff --git a/shade/releasenotes/notes/meta-passthrough-d695bff4f9366b65.yaml b/releasenotes/notes/meta-passthrough-d695bff4f9366b65.yaml
similarity index 100%
rename from shade/releasenotes/notes/meta-passthrough-d695bff4f9366b65.yaml
rename to releasenotes/notes/meta-passthrough-d695bff4f9366b65.yaml
diff --git a/os-client-config/releasenotes/notes/min-max-legacy-version-301242466ddefa93.yaml b/releasenotes/notes/min-max-legacy-version-301242466ddefa93.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/min-max-legacy-version-301242466ddefa93.yaml
rename to releasenotes/notes/min-max-legacy-version-301242466ddefa93.yaml
diff --git a/shade/releasenotes/notes/multiple-updates-b48cc2f6db2e526d.yaml b/releasenotes/notes/multiple-updates-b48cc2f6db2e526d.yaml
similarity index 100%
rename from shade/releasenotes/notes/multiple-updates-b48cc2f6db2e526d.yaml
rename to releasenotes/notes/multiple-updates-b48cc2f6db2e526d.yaml
diff --git a/shade/releasenotes/notes/net_provider-dd64b697476b7094.yaml b/releasenotes/notes/net_provider-dd64b697476b7094.yaml
similarity index 100%
rename from shade/releasenotes/notes/net_provider-dd64b697476b7094.yaml
rename to releasenotes/notes/net_provider-dd64b697476b7094.yaml
diff --git a/os-client-config/releasenotes/notes/network-list-e6e9dafdd8446263.yaml b/releasenotes/notes/network-list-e6e9dafdd8446263.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/network-list-e6e9dafdd8446263.yaml
rename to releasenotes/notes/network-list-e6e9dafdd8446263.yaml
diff --git a/shade/releasenotes/notes/network-quotas-b98cce9ffeffdbf4.yaml b/releasenotes/notes/network-quotas-b98cce9ffeffdbf4.yaml
similarity index 100%
rename from shade/releasenotes/notes/network-quotas-b98cce9ffeffdbf4.yaml
rename to releasenotes/notes/network-quotas-b98cce9ffeffdbf4.yaml
diff --git a/shade/releasenotes/notes/new-floating-attributes-213cdf5681d337e1.yaml b/releasenotes/notes/new-floating-attributes-213cdf5681d337e1.yaml
similarity index 100%
rename from shade/releasenotes/notes/new-floating-attributes-213cdf5681d337e1.yaml
rename to releasenotes/notes/new-floating-attributes-213cdf5681d337e1.yaml
diff --git a/shade/releasenotes/notes/no-more-troveclient-0a4739c21432ac63.yaml b/releasenotes/notes/no-more-troveclient-0a4739c21432ac63.yaml
similarity index 100%
rename from shade/releasenotes/notes/no-more-troveclient-0a4739c21432ac63.yaml
rename to releasenotes/notes/no-more-troveclient-0a4739c21432ac63.yaml
diff --git a/shade/releasenotes/notes/norm_role_assignments-a13f41768e62d40c.yaml b/releasenotes/notes/norm_role_assignments-a13f41768e62d40c.yaml
similarity index 100%
rename from shade/releasenotes/notes/norm_role_assignments-a13f41768e62d40c.yaml
rename to releasenotes/notes/norm_role_assignments-a13f41768e62d40c.yaml
diff --git a/shade/releasenotes/notes/normalize-images-1331bea7bfffa36a.yaml b/releasenotes/notes/normalize-images-1331bea7bfffa36a.yaml
similarity index 100%
rename from shade/releasenotes/notes/normalize-images-1331bea7bfffa36a.yaml
rename to releasenotes/notes/normalize-images-1331bea7bfffa36a.yaml
diff --git a/shade/releasenotes/notes/nova-flavor-to-rest-0a5757e35714a690.yaml b/releasenotes/notes/nova-flavor-to-rest-0a5757e35714a690.yaml
similarity index 100%
rename from shade/releasenotes/notes/nova-flavor-to-rest-0a5757e35714a690.yaml
rename to releasenotes/notes/nova-flavor-to-rest-0a5757e35714a690.yaml
diff --git a/shade/releasenotes/notes/nova-old-microversion-5e4b8e239ba44096.yaml b/releasenotes/notes/nova-old-microversion-5e4b8e239ba44096.yaml
similarity index 100%
rename from shade/releasenotes/notes/nova-old-microversion-5e4b8e239ba44096.yaml
rename to releasenotes/notes/nova-old-microversion-5e4b8e239ba44096.yaml
diff --git a/os-client-config/releasenotes/notes/option-precedence-1fecab21fdfb2c33.yaml b/releasenotes/notes/option-precedence-1fecab21fdfb2c33.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/option-precedence-1fecab21fdfb2c33.yaml
rename to releasenotes/notes/option-precedence-1fecab21fdfb2c33.yaml
diff --git a/shade/releasenotes/notes/remove-magnumclient-875b3e513f98f57c.yaml b/releasenotes/notes/remove-magnumclient-875b3e513f98f57c.yaml
similarity index 100%
rename from shade/releasenotes/notes/remove-magnumclient-875b3e513f98f57c.yaml
rename to releasenotes/notes/remove-magnumclient-875b3e513f98f57c.yaml
diff --git a/shade/releasenotes/notes/remove-novaclient-3f8d4db20d5f9582.yaml b/releasenotes/notes/remove-novaclient-3f8d4db20d5f9582.yaml
similarity index 100%
rename from shade/releasenotes/notes/remove-novaclient-3f8d4db20d5f9582.yaml
rename to releasenotes/notes/remove-novaclient-3f8d4db20d5f9582.yaml
diff --git a/shade/releasenotes/notes/removed-glanceclient-105c7fba9481b9be.yaml b/releasenotes/notes/removed-glanceclient-105c7fba9481b9be.yaml
similarity index 100%
rename from shade/releasenotes/notes/removed-glanceclient-105c7fba9481b9be.yaml
rename to releasenotes/notes/removed-glanceclient-105c7fba9481b9be.yaml
diff --git a/shade/releasenotes/notes/removed-swiftclient-aff22bfaeee5f59f.yaml b/releasenotes/notes/removed-swiftclient-aff22bfaeee5f59f.yaml
similarity index 100%
rename from shade/releasenotes/notes/removed-swiftclient-aff22bfaeee5f59f.yaml
rename to releasenotes/notes/removed-swiftclient-aff22bfaeee5f59f.yaml
diff --git a/shade/releasenotes/notes/router_ext_gw-b86582317bca8b39.yaml b/releasenotes/notes/router_ext_gw-b86582317bca8b39.yaml
similarity index 100%
rename from shade/releasenotes/notes/router_ext_gw-b86582317bca8b39.yaml
rename to releasenotes/notes/router_ext_gw-b86582317bca8b39.yaml
diff --git a/os-client-config/releasenotes/notes/sdk-helper-41f8d815cfbcfb00.yaml b/releasenotes/notes/sdk-helper-41f8d815cfbcfb00.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/sdk-helper-41f8d815cfbcfb00.yaml
rename to releasenotes/notes/sdk-helper-41f8d815cfbcfb00.yaml
diff --git a/shade/releasenotes/notes/server-create-error-id-66c698c7e633fb8b.yaml b/releasenotes/notes/server-create-error-id-66c698c7e633fb8b.yaml
similarity index 100%
rename from shade/releasenotes/notes/server-create-error-id-66c698c7e633fb8b.yaml
rename to releasenotes/notes/server-create-error-id-66c698c7e633fb8b.yaml
diff --git a/shade/releasenotes/notes/server-security-groups-840ab28c04f359de.yaml b/releasenotes/notes/server-security-groups-840ab28c04f359de.yaml
similarity index 100%
rename from shade/releasenotes/notes/server-security-groups-840ab28c04f359de.yaml
rename to releasenotes/notes/server-security-groups-840ab28c04f359de.yaml
diff --git a/shade/releasenotes/notes/service_enabled_flag-c917b305d3f2e8fd.yaml b/releasenotes/notes/service_enabled_flag-c917b305d3f2e8fd.yaml
similarity index 100%
rename from shade/releasenotes/notes/service_enabled_flag-c917b305d3f2e8fd.yaml
rename to releasenotes/notes/service_enabled_flag-c917b305d3f2e8fd.yaml
diff --git a/os-client-config/releasenotes/notes/session-client-b581a6e5d18c8f04.yaml b/releasenotes/notes/session-client-b581a6e5d18c8f04.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/session-client-b581a6e5d18c8f04.yaml
rename to releasenotes/notes/session-client-b581a6e5d18c8f04.yaml
diff --git a/os-client-config/releasenotes/notes/shade-helper-568f8cb372eef6d9.yaml b/releasenotes/notes/shade-helper-568f8cb372eef6d9.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/shade-helper-568f8cb372eef6d9.yaml
rename to releasenotes/notes/shade-helper-568f8cb372eef6d9.yaml
diff --git a/shade/releasenotes/notes/stack-update-5886e91fd6e423bf.yaml b/releasenotes/notes/stack-update-5886e91fd6e423bf.yaml
similarity index 100%
rename from shade/releasenotes/notes/stack-update-5886e91fd6e423bf.yaml
rename to releasenotes/notes/stack-update-5886e91fd6e423bf.yaml
diff --git a/os-client-config/releasenotes/notes/started-using-reno-242e2b0cd27f9480.yaml b/releasenotes/notes/started-using-reno-242e2b0cd27f9480.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/started-using-reno-242e2b0cd27f9480.yaml
rename to releasenotes/notes/started-using-reno-242e2b0cd27f9480.yaml
diff --git a/shade/releasenotes/notes/stream-to-file-91f48d6dcea399c6.yaml b/releasenotes/notes/stream-to-file-91f48d6dcea399c6.yaml
similarity index 100%
rename from shade/releasenotes/notes/stream-to-file-91f48d6dcea399c6.yaml
rename to releasenotes/notes/stream-to-file-91f48d6dcea399c6.yaml
diff --git a/shade/releasenotes/notes/strict-mode-d493abc0c3e87945.yaml b/releasenotes/notes/strict-mode-d493abc0c3e87945.yaml
similarity index 100%
rename from shade/releasenotes/notes/strict-mode-d493abc0c3e87945.yaml
rename to releasenotes/notes/strict-mode-d493abc0c3e87945.yaml
diff --git a/shade/releasenotes/notes/swift-upload-lock-d18f3d42b3a0719a.yaml b/releasenotes/notes/swift-upload-lock-d18f3d42b3a0719a.yaml
similarity index 100%
rename from shade/releasenotes/notes/swift-upload-lock-d18f3d42b3a0719a.yaml
rename to releasenotes/notes/swift-upload-lock-d18f3d42b3a0719a.yaml
diff --git a/shade/releasenotes/notes/update_endpoint-f87c1f42d0c0d1ef.yaml b/releasenotes/notes/update_endpoint-f87c1f42d0c0d1ef.yaml
similarity index 100%
rename from shade/releasenotes/notes/update_endpoint-f87c1f42d0c0d1ef.yaml
rename to releasenotes/notes/update_endpoint-f87c1f42d0c0d1ef.yaml
diff --git a/shade/releasenotes/notes/use-interface-ip-c5cb3e7c91150096.yaml b/releasenotes/notes/use-interface-ip-c5cb3e7c91150096.yaml
similarity index 100%
rename from shade/releasenotes/notes/use-interface-ip-c5cb3e7c91150096.yaml
rename to releasenotes/notes/use-interface-ip-c5cb3e7c91150096.yaml
diff --git a/os-client-config/releasenotes/notes/vendor-updates-f11184ba56bb27cf.yaml b/releasenotes/notes/vendor-updates-f11184ba56bb27cf.yaml
similarity index 100%
rename from os-client-config/releasenotes/notes/vendor-updates-f11184ba56bb27cf.yaml
rename to releasenotes/notes/vendor-updates-f11184ba56bb27cf.yaml
diff --git a/shade/releasenotes/notes/version-discovery-a501c4e9e9869f77.yaml b/releasenotes/notes/version-discovery-a501c4e9e9869f77.yaml
similarity index 100%
rename from shade/releasenotes/notes/version-discovery-a501c4e9e9869f77.yaml
rename to releasenotes/notes/version-discovery-a501c4e9e9869f77.yaml
diff --git a/shade/releasenotes/notes/volume-quotas-5b674ee8c1f71eb6.yaml b/releasenotes/notes/volume-quotas-5b674ee8c1f71eb6.yaml
similarity index 100%
rename from shade/releasenotes/notes/volume-quotas-5b674ee8c1f71eb6.yaml
rename to releasenotes/notes/volume-quotas-5b674ee8c1f71eb6.yaml
diff --git a/shade/releasenotes/notes/volume-types-a07a14ae668e7dd2.yaml b/releasenotes/notes/volume-types-a07a14ae668e7dd2.yaml
similarity index 100%
rename from shade/releasenotes/notes/volume-types-a07a14ae668e7dd2.yaml
rename to releasenotes/notes/volume-types-a07a14ae668e7dd2.yaml
diff --git a/shade/releasenotes/notes/wait-on-image-snapshot-27cd2eacab2fabd8.yaml b/releasenotes/notes/wait-on-image-snapshot-27cd2eacab2fabd8.yaml
similarity index 100%
rename from shade/releasenotes/notes/wait-on-image-snapshot-27cd2eacab2fabd8.yaml
rename to releasenotes/notes/wait-on-image-snapshot-27cd2eacab2fabd8.yaml
diff --git a/shade/releasenotes/notes/wait_for_server-8dc8446b7c673d36.yaml b/releasenotes/notes/wait_for_server-8dc8446b7c673d36.yaml
similarity index 100%
rename from shade/releasenotes/notes/wait_for_server-8dc8446b7c673d36.yaml
rename to releasenotes/notes/wait_for_server-8dc8446b7c673d36.yaml
diff --git a/shade/releasenotes/notes/workaround-transitive-deps-1e7a214f3256b77e.yaml b/releasenotes/notes/workaround-transitive-deps-1e7a214f3256b77e.yaml
similarity index 100%
rename from shade/releasenotes/notes/workaround-transitive-deps-1e7a214f3256b77e.yaml
rename to releasenotes/notes/workaround-transitive-deps-1e7a214f3256b77e.yaml
diff --git a/os-client-config/releasenotes/source/_static/.placeholder b/releasenotes/source/_static/.placeholder
similarity index 100%
rename from os-client-config/releasenotes/source/_static/.placeholder
rename to releasenotes/source/_static/.placeholder
diff --git a/os-client-config/releasenotes/source/_templates/.placeholder b/releasenotes/source/_templates/.placeholder
similarity index 100%
rename from os-client-config/releasenotes/source/_templates/.placeholder
rename to releasenotes/source/_templates/.placeholder
diff --git a/shade/releasenotes/source/conf.py b/releasenotes/source/conf.py
similarity index 100%
rename from shade/releasenotes/source/conf.py
rename to releasenotes/source/conf.py
diff --git a/shade/releasenotes/source/index.rst b/releasenotes/source/index.rst
similarity index 100%
rename from shade/releasenotes/source/index.rst
rename to releasenotes/source/index.rst
diff --git a/shade/releasenotes/source/mainline.rst b/releasenotes/source/mainline.rst
similarity index 100%
rename from shade/releasenotes/source/mainline.rst
rename to releasenotes/source/mainline.rst
diff --git a/os-client-config/releasenotes/source/mitaka.rst b/releasenotes/source/mitaka.rst
similarity index 100%
rename from os-client-config/releasenotes/source/mitaka.rst
rename to releasenotes/source/mitaka.rst
diff --git a/os-client-config/releasenotes/source/newton.rst b/releasenotes/source/newton.rst
similarity index 100%
rename from os-client-config/releasenotes/source/newton.rst
rename to releasenotes/source/newton.rst
diff --git a/os-client-config/releasenotes/source/ocata.rst b/releasenotes/source/ocata.rst
similarity index 100%
rename from os-client-config/releasenotes/source/ocata.rst
rename to releasenotes/source/ocata.rst
diff --git a/os-client-config/releasenotes/source/pike.rst b/releasenotes/source/pike.rst
similarity index 100%
rename from os-client-config/releasenotes/source/pike.rst
rename to releasenotes/source/pike.rst
diff --git a/shade/releasenotes/source/unreleased.rst b/releasenotes/source/unreleased.rst
similarity index 100%
rename from shade/releasenotes/source/unreleased.rst
rename to releasenotes/source/unreleased.rst
diff --git a/shade/releasenotes/notes/started-using-reno-242e2b0cd27f9480.yaml b/shade/releasenotes/notes/started-using-reno-242e2b0cd27f9480.yaml
deleted file mode 100644
index d7cfb5145..000000000
--- a/shade/releasenotes/notes/started-using-reno-242e2b0cd27f9480.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-other:
-- Started using reno for release notes.
diff --git a/shade/releasenotes/source/_static/.placeholder b/shade/releasenotes/source/_static/.placeholder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/shade/releasenotes/source/_templates/.placeholder b/shade/releasenotes/source/_templates/.placeholder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/shade/releasenotes/source/pike.rst b/shade/releasenotes/source/pike.rst
deleted file mode 100644
index e43bfc0ce..000000000
--- a/shade/releasenotes/source/pike.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-===================================
- Pike Series Release Notes
-===================================
-
-.. release-notes::
-   :branch: stable/pike