diff --git a/src/ansys_sphinx_theme/_templates/autosummary/base.rst b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/_templates/autosummary/base.rst
similarity index 100%
rename from src/ansys_sphinx_theme/_templates/autosummary/base.rst
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/_templates/autosummary/base.rst
diff --git a/src/ansys_sphinx_theme/_templates/autosummary/class.rst b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/_templates/autosummary/class.rst
similarity index 100%
rename from src/ansys_sphinx_theme/_templates/autosummary/class.rst
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/_templates/autosummary/class.rst
diff --git a/src/ansys_sphinx_theme/announcement_layout.html b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/components/announcement_version.html
similarity index 91%
rename from src/ansys_sphinx_theme/announcement_layout.html
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/components/announcement_version.html
index 96e868e8..5feeeeb0 100644
--- a/src/ansys_sphinx_theme/announcement_layout.html
+++ b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/components/announcement_version.html
@@ -1,4 +1,3 @@
-{% if theme_switcher %}
-{% endif %}
diff --git a/src/ansys_sphinx_theme/breadcrumbs.html b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/components/breadcrumbs.html
similarity index 100%
rename from src/ansys_sphinx_theme/breadcrumbs.html
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/components/breadcrumbs.html
diff --git a/src/ansys_sphinx_theme/layout.html b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/layout.html
similarity index 87%
rename from src/ansys_sphinx_theme/layout.html
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/layout.html
index 839fe6bd..6c6c32a7 100644
--- a/src/ansys_sphinx_theme/layout.html
+++ b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/layout.html
@@ -26,9 +26,12 @@
{% block docs_navbar %}
{{ super() }}
- {% include 'announcement_layout.html' %}
+
+ {% if theme_switcher %}
+ {% include 'components/announcement_version.html' %}
+ {% endif %}
+
{% if theme_show_breadcrumbs %}
- {% include 'breadcrumbs.html' %}
+ {% include 'components/breadcrumbs.html' %}
{% endif %}
{% endblock %}
-
diff --git a/src/ansys_sphinx_theme/static/404.rst b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/404.rst
similarity index 100%
rename from src/ansys_sphinx_theme/static/404.rst
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/404.rst
diff --git a/src/ansys_sphinx_theme/static/ansys-favicon.png b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys-favicon.png
similarity index 100%
rename from src/ansys_sphinx_theme/static/ansys-favicon.png
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys-favicon.png
diff --git a/src/ansys_sphinx_theme/static/ansys_logo_black.jpg b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys_logo_black.jpg
similarity index 100%
rename from src/ansys_sphinx_theme/static/ansys_logo_black.jpg
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys_logo_black.jpg
diff --git a/src/ansys_sphinx_theme/static/ansys_logo_black_cropped.jpg b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys_logo_black_cropped.jpg
similarity index 100%
rename from src/ansys_sphinx_theme/static/ansys_logo_black_cropped.jpg
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys_logo_black_cropped.jpg
diff --git a/src/ansys_sphinx_theme/static/ansys_logo_white.pdf b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys_logo_white.pdf
similarity index 100%
rename from src/ansys_sphinx_theme/static/ansys_logo_white.pdf
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys_logo_white.pdf
diff --git a/src/ansys_sphinx_theme/static/ansys_logo_white_cropped.pdf b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys_logo_white_cropped.pdf
similarity index 100%
rename from src/ansys_sphinx_theme/static/ansys_logo_white_cropped.pdf
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/ansys_logo_white_cropped.pdf
diff --git a/src/ansys_sphinx_theme/static/css/ansys_sphinx_theme.css b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/css/ansys_sphinx_theme.css
similarity index 100%
rename from src/ansys_sphinx_theme/static/css/ansys_sphinx_theme.css
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/css/ansys_sphinx_theme.css
diff --git a/src/ansys_sphinx_theme/static/css/breadcrumbs.css b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/css/breadcrumbs.css
similarity index 100%
rename from src/ansys_sphinx_theme/static/css/breadcrumbs.css
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/css/breadcrumbs.css
diff --git a/src/ansys_sphinx_theme/static/fonts/SourceSansPro-Light.ttf b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/fonts/SourceSansPro-Light.ttf
similarity index 100%
rename from src/ansys_sphinx_theme/static/fonts/SourceSansPro-Light.ttf
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/fonts/SourceSansPro-Light.ttf
diff --git a/src/ansys_sphinx_theme/static/fonts/SourceSansPro-Regular.ttf b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/fonts/SourceSansPro-Regular.ttf
similarity index 100%
rename from src/ansys_sphinx_theme/static/fonts/SourceSansPro-Regular.ttf
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/fonts/SourceSansPro-Regular.ttf
diff --git a/src/ansys_sphinx_theme/static/fonts/SourceSansPro-SemiBold.ttf b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/fonts/SourceSansPro-SemiBold.ttf
similarity index 100%
rename from src/ansys_sphinx_theme/static/fonts/SourceSansPro-SemiBold.ttf
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/fonts/SourceSansPro-SemiBold.ttf
diff --git a/src/ansys_sphinx_theme/static/js/download_target_blank.js b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/js/download_target_blank.js
similarity index 100%
rename from src/ansys_sphinx_theme/static/js/download_target_blank.js
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/js/download_target_blank.js
diff --git a/src/ansys_sphinx_theme/static/pyansys-logo-black-cropped.png b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys-logo-black-cropped.png
similarity index 100%
rename from src/ansys_sphinx_theme/static/pyansys-logo-black-cropped.png
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys-logo-black-cropped.png
diff --git a/src/ansys_sphinx_theme/static/pyansys-logo-white-cropped.png b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys-logo-white-cropped.png
similarity index 100%
rename from src/ansys_sphinx_theme/static/pyansys-logo-white-cropped.png
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys-logo-white-cropped.png
diff --git a/src/ansys_sphinx_theme/static/pyansys_dark.png b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys_dark.png
similarity index 100%
rename from src/ansys_sphinx_theme/static/pyansys_dark.png
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys_dark.png
diff --git a/src/ansys_sphinx_theme/static/pyansys_dark_square.png b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys_dark_square.png
similarity index 100%
rename from src/ansys_sphinx_theme/static/pyansys_dark_square.png
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys_dark_square.png
diff --git a/src/ansys_sphinx_theme/static/pyansys_light.png b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys_light.png
similarity index 100%
rename from src/ansys_sphinx_theme/static/pyansys_light.png
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys_light.png
diff --git a/src/ansys_sphinx_theme/static/pyansys_light_square.png b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys_light_square.png
similarity index 100%
rename from src/ansys_sphinx_theme/static/pyansys_light_square.png
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/pyansys_light_square.png
diff --git a/src/ansys_sphinx_theme/static/watermark.pdf b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/watermark.pdf
similarity index 100%
rename from src/ansys_sphinx_theme/static/watermark.pdf
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/static/watermark.pdf
diff --git a/src/ansys_sphinx_theme/theme.conf b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/theme.conf
similarity index 86%
rename from src/ansys_sphinx_theme/theme.conf
rename to src/ansys_sphinx_theme/theme/ansys_sphinx_theme/theme.conf
index 069fe209..f0112da9 100644
--- a/src/ansys_sphinx_theme/theme.conf
+++ b/src/ansys_sphinx_theme/theme/ansys_sphinx_theme/theme.conf
@@ -10,4 +10,5 @@ show_breadcrumbs = True
show_icons = True
hidden_icons =
additional_breadcrumbs =
-switcher =
\ No newline at end of file
+use_edit_page_button = True
+switcher =