diff --git a/layouts/doc/DocApiSection.vue b/components/doc/DocApiSection.vue
similarity index 99%
rename from layouts/doc/DocApiSection.vue
rename to components/doc/DocApiSection.vue
index 11eb8b646..2fe05f7a7 100644
--- a/layouts/doc/DocApiSection.vue
+++ b/components/doc/DocApiSection.vue
@@ -12,6 +12,7 @@
 <script>
 import APIDocs from '@/doc/common/apidoc/index.json';
 import DocApiTable from './DocApiTable.vue';
+
 export default {
     props: {
         header: {
diff --git a/layouts/doc/DocApiTable.vue b/components/doc/DocApiTable.vue
similarity index 100%
rename from layouts/doc/DocApiTable.vue
rename to components/doc/DocApiTable.vue
diff --git a/layouts/doc/DocComponent.vue b/components/doc/DocComponent.vue
similarity index 100%
rename from layouts/doc/DocComponent.vue
rename to components/doc/DocComponent.vue
diff --git a/layouts/doc/DocSectionCode.vue b/components/doc/DocSectionCode.vue
similarity index 100%
rename from layouts/doc/DocSectionCode.vue
rename to components/doc/DocSectionCode.vue
diff --git a/layouts/doc/DocSectionNav.vue b/components/doc/DocSectionNav.vue
similarity index 100%
rename from layouts/doc/DocSectionNav.vue
rename to components/doc/DocSectionNav.vue
diff --git a/layouts/doc/DocSectionText.vue b/components/doc/DocSectionText.vue
similarity index 100%
rename from layouts/doc/DocSectionText.vue
rename to components/doc/DocSectionText.vue
diff --git a/layouts/doc/DocSections.vue b/components/doc/DocSections.vue
similarity index 100%
rename from layouts/doc/DocSections.vue
rename to components/doc/DocSections.vue
diff --git a/layouts/doc/codeeditor/index.js b/components/doc/codeeditor/index.js
similarity index 100%
rename from layouts/doc/codeeditor/index.js
rename to components/doc/codeeditor/index.js
diff --git a/layouts/doc/codeeditor/services.js b/components/doc/codeeditor/services.js
similarity index 100%
rename from layouts/doc/codeeditor/services.js
rename to components/doc/codeeditor/services.js
diff --git a/layouts/doc/codeeditor/templates.js b/components/doc/codeeditor/templates.js
similarity index 100%
rename from layouts/doc/codeeditor/templates.js
rename to components/doc/codeeditor/templates.js
diff --git a/layouts/doc/helpers/PTHelper.js b/components/doc/helpers/PTHelper.js
similarity index 100%
rename from layouts/doc/helpers/PTHelper.js
rename to components/doc/helpers/PTHelper.js
diff --git a/layouts/AppCodeHighlight.js b/components/layout/CodeHighlight.js
similarity index 100%
rename from layouts/AppCodeHighlight.js
rename to components/layout/CodeHighlight.js
diff --git a/layouts/DevelopmentSection.vue b/components/layout/DevelopmentSection.vue
similarity index 100%
rename from layouts/DevelopmentSection.vue
rename to components/layout/DevelopmentSection.vue
diff --git a/doc/accordion/pt/index.vue b/doc/accordion/pt/index.vue
index 370ed2349..68787d734 100644
--- a/doc/accordion/pt/index.vue
+++ b/doc/accordion/pt/index.vue
@@ -10,10 +10,11 @@
 </template>
 
 <script>
-import { getPTOption } from '@/layouts/doc/helpers/PTHelper.js';
+import DocApiTable from '@/components/doc/DocApiTable.vue';
+import { getPTOption } from '@/components/doc/helpers/PTHelper.js';
 import PtDoc from './PTDoc.vue';
 import PTImage from './PTImage.vue';
-import DocApiTable from '@/layouts/doc/DocApiTable.vue';
+
 export default {
     data() {
         return {
diff --git a/doc/panel/pt/index.vue b/doc/panel/pt/index.vue
index a2157127e..34b0778c9 100644
--- a/doc/panel/pt/index.vue
+++ b/doc/panel/pt/index.vue
@@ -10,10 +10,11 @@
 </template>
 
 <script>
-import { getPTOption } from '@/layouts/doc/helpers/PTHelper.js';
+import DocApiTable from '@/components/doc/DocApiTable.vue';
+import { getPTOption } from '@/components/doc/helpers/PTHelper.js';
 import PtDoc from './PTDoc.vue';
 import PTImage from './PTImage.vue';
-import DocApiTable from '@/layouts/doc/DocApiTable.vue';
+
 export default {
     data() {
         return {
diff --git a/plugins/primeVue.js b/plugins/primeVue.js
index b942ce2e8..bf1f72d3b 100644
--- a/plugins/primeVue.js
+++ b/plugins/primeVue.js
@@ -98,14 +98,14 @@ import TreeTable from '@/components/lib/treetable/TreeTable';
 import TriStateCheckbox from '@/components/lib/tristatecheckbox/TriStateCheckbox';
 import VirtualScroller from '@/components/lib/virtualscroller/VirtualScroller';
 
-import CodeHighlight from '@/layouts/AppCodeHighlight';
-import DevelopmentSection from '@/layouts/DevelopmentSection';
-import DocApiSection from '@/layouts/doc/DocApiSection';
-import DocComponent from '@/layouts/doc/DocComponent';
-import DocSectionCode from '@/layouts/doc/DocSectionCode';
-import DocSectionNav from '@/layouts/doc/DocSectionNav';
-import DocSections from '@/layouts/doc/DocSections';
-import DocSectionText from '@/layouts/doc/DocSectionText';
+import DocApiSection from '@/components/doc/DocApiSection';
+import DocComponent from '@/components/doc/DocComponent';
+import DocSectionCode from '@/components/doc/DocSectionCode';
+import DocSectionNav from '@/components/doc/DocSectionNav';
+import DocSections from '@/components/doc/DocSections';
+import DocSectionText from '@/components/doc/DocSectionText';
+import CodeHighlight from '@/components/layout/CodeHighlight';
+import DevelopmentSection from '@/components/layout/DevelopmentSection';
 
 export default defineNuxtPlugin((nuxtApp) => {
     nuxtApp.vueApp.use(PrimeVue, { ripple: true });
@@ -118,8 +118,8 @@ export default defineNuxtPlugin((nuxtApp) => {
     nuxtApp.vueApp.directive('tooltip', Tooltip);
     nuxtApp.vueApp.directive('ripple', Ripple);
     nuxtApp.vueApp.directive('styleclass', StyleClass);
-    nuxtApp.vueApp.directive('code', CodeHighlight);
     nuxtApp.vueApp.directive('focustrap', FocusTrap);
+    nuxtApp.vueApp.directive('code', CodeHighlight);
 
     nuxtApp.vueApp.component('Accordion', Accordion);
     nuxtApp.vueApp.component('AccordionTab', AccordionTab);
@@ -212,11 +212,12 @@ export default defineNuxtPlugin((nuxtApp) => {
     nuxtApp.vueApp.component('Galleria', Galleria);
     nuxtApp.vueApp.component('VirtualScroller', VirtualScroller);
 
-    nuxtApp.vueApp.component('DevelopmentSection', DevelopmentSection);
     nuxtApp.vueApp.component('DocSections', DocSections);
     nuxtApp.vueApp.component('DocSectionText', DocSectionText);
     nuxtApp.vueApp.component('DocSectionCode', DocSectionCode);
     nuxtApp.vueApp.component('DocSectionNav', DocSectionNav);
     nuxtApp.vueApp.component('DocApiSection', DocApiSection);
     nuxtApp.vueApp.component('DocComponent', DocComponent);
+
+    nuxtApp.vueApp.component('DevelopmentSection', DevelopmentSection);
 });