diff --git a/layouts/_default/_markup/render-image.html b/layouts/_markup/render-image.html
similarity index 100%
rename from layouts/_default/_markup/render-image.html
rename to layouts/_markup/render-image.html
diff --git a/layouts/_default/_markup/render-link.html b/layouts/_markup/render-link.html
similarity index 100%
rename from layouts/_default/_markup/render-link.html
rename to layouts/_markup/render-link.html
diff --git a/layouts/partials/booking-links.html b/layouts/_partials/booking-links.html
similarity index 100%
rename from layouts/partials/booking-links.html
rename to layouts/_partials/booking-links.html
diff --git a/layouts/partials/booking.html b/layouts/_partials/booking.html
similarity index 100%
rename from layouts/partials/booking.html
rename to layouts/_partials/booking.html
diff --git a/layouts/partials/button.html b/layouts/_partials/button.html
similarity index 100%
rename from layouts/partials/button.html
rename to layouts/_partials/button.html
diff --git a/layouts/partials/content.html b/layouts/_partials/content.html
similarity index 100%
rename from layouts/partials/content.html
rename to layouts/_partials/content.html
diff --git a/layouts/partials/contentNavigation.html b/layouts/_partials/contentNavigation.html
similarity index 100%
rename from layouts/partials/contentNavigation.html
rename to layouts/_partials/contentNavigation.html
diff --git a/layouts/partials/dialog.html b/layouts/_partials/dialog.html
similarity index 100%
rename from layouts/partials/dialog.html
rename to layouts/_partials/dialog.html
diff --git a/layouts/partials/expander.html b/layouts/_partials/expander.html
similarity index 100%
rename from layouts/partials/expander.html
rename to layouts/_partials/expander.html
diff --git a/layouts/partials/fip-validity/comparison.html b/layouts/_partials/fip-validity/comparison.html
similarity index 100%
rename from layouts/partials/fip-validity/comparison.html
rename to layouts/_partials/fip-validity/comparison.html
diff --git a/layouts/partials/fip-validity/dialog.html b/layouts/_partials/fip-validity/dialog.html
similarity index 100%
rename from layouts/partials/fip-validity/dialog.html
rename to layouts/_partials/fip-validity/dialog.html
diff --git a/layouts/partials/fip-validity/issuer-dropdown.html b/layouts/_partials/fip-validity/issuer-dropdown.html
similarity index 100%
rename from layouts/partials/fip-validity/issuer-dropdown.html
rename to layouts/_partials/fip-validity/issuer-dropdown.html
diff --git a/layouts/partials/fip-validity/main.html b/layouts/_partials/fip-validity/main.html
similarity index 100%
rename from layouts/partials/fip-validity/main.html
rename to layouts/_partials/fip-validity/main.html
diff --git a/layouts/partials/fip-validity/table.html b/layouts/_partials/fip-validity/table.html
similarity index 100%
rename from layouts/partials/fip-validity/table.html
rename to layouts/_partials/fip-validity/table.html
diff --git a/layouts/partials/fip-validity/value.html b/layouts/_partials/fip-validity/value.html
similarity index 100%
rename from layouts/partials/fip-validity/value.html
rename to layouts/_partials/fip-validity/value.html
diff --git a/layouts/partials/flag.html b/layouts/_partials/flag.html
similarity index 100%
rename from layouts/partials/flag.html
rename to layouts/_partials/flag.html
diff --git a/layouts/partials/footer.html b/layouts/_partials/footer.html
similarity index 100%
rename from layouts/partials/footer.html
rename to layouts/_partials/footer.html
diff --git a/layouts/partials/head.html b/layouts/_partials/head.html
similarity index 100%
rename from layouts/partials/head.html
rename to layouts/_partials/head.html
diff --git a/layouts/partials/head/js.html b/layouts/_partials/head/js.html
similarity index 100%
rename from layouts/partials/head/js.html
rename to layouts/_partials/head/js.html
diff --git a/layouts/partials/head/search.html b/layouts/_partials/head/search.html
similarity index 100%
rename from layouts/partials/head/search.html
rename to layouts/_partials/head/search.html
diff --git a/layouts/partials/headMeta.html b/layouts/_partials/headMeta.html
similarity index 100%
rename from layouts/partials/headMeta.html
rename to layouts/_partials/headMeta.html
diff --git a/layouts/partials/header-logo.html b/layouts/_partials/header-logo.html
similarity index 100%
rename from layouts/partials/header-logo.html
rename to layouts/_partials/header-logo.html
diff --git a/layouts/partials/header.html b/layouts/_partials/header.html
similarity index 100%
rename from layouts/partials/header.html
rename to layouts/_partials/header.html
diff --git a/layouts/partials/helper/contentImage.html b/layouts/_partials/helper/contentImage.html
similarity index 100%
rename from layouts/partials/helper/contentImage.html
rename to layouts/_partials/helper/contentImage.html
diff --git a/layouts/partials/helper/dateHuman.html b/layouts/_partials/helper/dateHuman.html
similarity index 100%
rename from layouts/partials/helper/dateHuman.html
rename to layouts/_partials/helper/dateHuman.html
diff --git a/layouts/partials/helper/dateMachine.html b/layouts/_partials/helper/dateMachine.html
similarity index 100%
rename from layouts/partials/helper/dateMachine.html
rename to layouts/_partials/helper/dateMachine.html
diff --git a/layouts/partials/helper/stripNewlines.html b/layouts/_partials/helper/stripNewlines.html
similarity index 100%
rename from layouts/partials/helper/stripNewlines.html
rename to layouts/_partials/helper/stripNewlines.html
diff --git a/layouts/partials/highlight.html b/layouts/_partials/highlight.html
similarity index 100%
rename from layouts/partials/highlight.html
rename to layouts/_partials/highlight.html
diff --git a/layouts/partials/icon.html b/layouts/_partials/icon.html
similarity index 100%
rename from layouts/partials/icon.html
rename to layouts/_partials/icon.html
diff --git a/layouts/partials/identify-operator.html b/layouts/_partials/identify-operator.html
similarity index 100%
rename from layouts/partials/identify-operator.html
rename to layouts/_partials/identify-operator.html
diff --git a/layouts/partials/image-compression.html b/layouts/_partials/image-compression.html
similarity index 100%
rename from layouts/partials/image-compression.html
rename to layouts/_partials/image-compression.html
diff --git a/layouts/partials/image.html b/layouts/_partials/image.html
similarity index 100%
rename from layouts/partials/image.html
rename to layouts/_partials/image.html
diff --git a/layouts/partials/increase-headings.html b/layouts/_partials/increase-headings.html
similarity index 100%
rename from layouts/partials/increase-headings.html
rename to layouts/_partials/increase-headings.html
diff --git a/layouts/partials/intersector.html b/layouts/_partials/intersector.html
similarity index 100%
rename from layouts/partials/intersector.html
rename to layouts/_partials/intersector.html
diff --git a/layouts/partials/link.html b/layouts/_partials/link.html
similarity index 100%
rename from layouts/partials/link.html
rename to layouts/_partials/link.html
diff --git a/layouts/partials/nav-dropdown.html b/layouts/_partials/nav-dropdown.html
similarity index 100%
rename from layouts/partials/nav-dropdown.html
rename to layouts/_partials/nav-dropdown.html
diff --git a/layouts/partials/navigation.html b/layouts/_partials/navigation.html
similarity index 100%
rename from layouts/partials/navigation.html
rename to layouts/_partials/navigation.html
diff --git a/layouts/partials/operator-logo.html b/layouts/_partials/operator-logo.html
similarity index 100%
rename from layouts/partials/operator-logo.html
rename to layouts/_partials/operator-logo.html
diff --git a/layouts/partials/prefix-footnotes.html b/layouts/_partials/prefix-footnotes.html
similarity index 100%
rename from layouts/partials/prefix-footnotes.html
rename to layouts/_partials/prefix-footnotes.html
diff --git a/layouts/partials/prefix-heading-ids.html b/layouts/_partials/prefix-heading-ids.html
similarity index 100%
rename from layouts/partials/prefix-heading-ids.html
rename to layouts/_partials/prefix-heading-ids.html
diff --git a/layouts/partials/related.html b/layouts/_partials/related.html
similarity index 100%
rename from layouts/partials/related.html
rename to layouts/_partials/related.html
diff --git a/layouts/partials/search-button-mobile.html b/layouts/_partials/search-button-mobile.html
similarity index 100%
rename from layouts/partials/search-button-mobile.html
rename to layouts/_partials/search-button-mobile.html
diff --git a/layouts/partials/search-button.html b/layouts/_partials/search-button.html
similarity index 100%
rename from layouts/partials/search-button.html
rename to layouts/_partials/search-button.html
diff --git a/layouts/partials/search.html b/layouts/_partials/search.html
similarity index 100%
rename from layouts/partials/search.html
rename to layouts/_partials/search.html
diff --git a/layouts/partials/shortcut-tile.html b/layouts/_partials/shortcut-tile.html
similarity index 100%
rename from layouts/partials/shortcut-tile.html
rename to layouts/_partials/shortcut-tile.html
diff --git a/layouts/partials/snackbar.html b/layouts/_partials/snackbar.html
similarity index 100%
rename from layouts/partials/snackbar.html
rename to layouts/_partials/snackbar.html
diff --git a/layouts/partials/structuredData.html b/layouts/_partials/structuredData.html
similarity index 100%
rename from layouts/partials/structuredData.html
rename to layouts/_partials/structuredData.html
diff --git a/layouts/partials/tag.html b/layouts/_partials/tag.html
similarity index 100%
rename from layouts/partials/tag.html
rename to layouts/_partials/tag.html
diff --git a/layouts/partials/teaser.html b/layouts/_partials/teaser.html
similarity index 100%
rename from layouts/partials/teaser.html
rename to layouts/_partials/teaser.html
diff --git a/layouts/partials/theme-toggle-button.html b/layouts/_partials/theme-toggle-button.html
similarity index 100%
rename from layouts/partials/theme-toggle-button.html
rename to layouts/_partials/theme-toggle-button.html
diff --git a/layouts/partials/toc.html b/layouts/_partials/toc.html
similarity index 100%
rename from layouts/partials/toc.html
rename to layouts/_partials/toc.html
diff --git a/layouts/partials/train-category.html b/layouts/_partials/train-category.html
similarity index 100%
rename from layouts/partials/train-category.html
rename to layouts/_partials/train-category.html
diff --git a/layouts/partials/updateDate.html b/layouts/_partials/updateDate.html
similarity index 100%
rename from layouts/partials/updateDate.html
rename to layouts/_partials/updateDate.html
diff --git a/layouts/shortcodes/booking-section.html b/layouts/_shortcodes/booking-section.html
similarity index 100%
rename from layouts/shortcodes/booking-section.html
rename to layouts/_shortcodes/booking-section.html
diff --git a/layouts/shortcodes/booking.html b/layouts/_shortcodes/booking.html
similarity index 100%
rename from layouts/shortcodes/booking.html
rename to layouts/_shortcodes/booking.html
diff --git a/layouts/shortcodes/button.html b/layouts/_shortcodes/button.html
similarity index 100%
rename from layouts/shortcodes/button.html
rename to layouts/_shortcodes/button.html
diff --git a/layouts/shortcodes/contact-form.html b/layouts/_shortcodes/contact-form.html
similarity index 100%
rename from layouts/shortcodes/contact-form.html
rename to layouts/_shortcodes/contact-form.html
diff --git a/layouts/shortcodes/dialog.html b/layouts/_shortcodes/dialog.html
similarity index 100%
rename from layouts/shortcodes/dialog.html
rename to layouts/_shortcodes/dialog.html
diff --git a/layouts/shortcodes/expander.html b/layouts/_shortcodes/expander.html
similarity index 100%
rename from layouts/shortcodes/expander.html
rename to layouts/_shortcodes/expander.html
diff --git a/layouts/shortcodes/faq.html b/layouts/_shortcodes/faq.html
similarity index 100%
rename from layouts/shortcodes/faq.html
rename to layouts/_shortcodes/faq.html
diff --git a/layouts/shortcodes/fip-validity-comparison.html b/layouts/_shortcodes/fip-validity-comparison.html
similarity index 100%
rename from layouts/shortcodes/fip-validity-comparison.html
rename to layouts/_shortcodes/fip-validity-comparison.html
diff --git a/layouts/shortcodes/fip-validity.html b/layouts/_shortcodes/fip-validity.html
similarity index 100%
rename from layouts/shortcodes/fip-validity.html
rename to layouts/_shortcodes/fip-validity.html
diff --git a/layouts/shortcodes/float-image.html b/layouts/_shortcodes/float-image.html
similarity index 100%
rename from layouts/shortcodes/float-image.html
rename to layouts/_shortcodes/float-image.html
diff --git a/layouts/shortcodes/highlight.html b/layouts/_shortcodes/highlight.html
similarity index 100%
rename from layouts/shortcodes/highlight.html
rename to layouts/_shortcodes/highlight.html
diff --git a/layouts/shortcodes/icon.html b/layouts/_shortcodes/icon.html
similarity index 100%
rename from layouts/shortcodes/icon.html
rename to layouts/_shortcodes/icon.html
diff --git a/layouts/shortcodes/identify-operator.html b/layouts/_shortcodes/identify-operator.html
similarity index 100%
rename from layouts/shortcodes/identify-operator.html
rename to layouts/_shortcodes/identify-operator.html
diff --git a/layouts/shortcodes/intersector.html b/layouts/_shortcodes/intersector.html
similarity index 100%
rename from layouts/shortcodes/intersector.html
rename to layouts/_shortcodes/intersector.html
diff --git a/layouts/shortcodes/satellite.html b/layouts/_shortcodes/satellite.html
similarity index 100%
rename from layouts/shortcodes/satellite.html
rename to layouts/_shortcodes/satellite.html
diff --git a/layouts/shortcodes/team-members.html b/layouts/_shortcodes/team-members.html
similarity index 100%
rename from layouts/shortcodes/team-members.html
rename to layouts/_shortcodes/team-members.html
diff --git a/layouts/shortcodes/train-category.html b/layouts/_shortcodes/train-category.html
similarity index 100%
rename from layouts/shortcodes/train-category.html
rename to layouts/_shortcodes/train-category.html
diff --git a/layouts/shortcodes/wip.html b/layouts/_shortcodes/wip.html
similarity index 100%
rename from layouts/shortcodes/wip.html
rename to layouts/_shortcodes/wip.html
diff --git a/layouts/_default/baseof.html b/layouts/baseof.html
similarity index 100%
rename from layouts/_default/baseof.html
rename to layouts/baseof.html
diff --git a/layouts/_default/home.html b/layouts/home.html
similarity index 100%
rename from layouts/_default/home.html
rename to layouts/home.html
diff --git a/layouts/_default/list.html b/layouts/list.html
similarity index 100%
rename from layouts/_default/list.html
rename to layouts/list.html
diff --git a/layouts/_default/rss.xml b/layouts/rss.xml
similarity index 100%
rename from layouts/_default/rss.xml
rename to layouts/rss.xml
diff --git a/layouts/_default/single.html b/layouts/single.html
similarity index 100%
rename from layouts/_default/single.html
rename to layouts/single.html