diff --git a/frontends/nextjs/src/components/editors/LuaBlocksEditor.module.scss b/frontends/nextjs/src/components/editors/lua/LuaBlocksEditor.module.scss
similarity index 100%
rename from frontends/nextjs/src/components/editors/LuaBlocksEditor.module.scss
rename to frontends/nextjs/src/components/editors/lua/LuaBlocksEditor.module.scss
diff --git a/frontends/nextjs/src/components/editors/LuaBlocksEditor.tsx b/frontends/nextjs/src/components/editors/lua/LuaBlocksEditor.tsx
similarity index 100%
rename from frontends/nextjs/src/components/editors/LuaBlocksEditor.tsx
rename to frontends/nextjs/src/components/editors/lua/LuaBlocksEditor.tsx
diff --git a/frontends/nextjs/src/components/editors/LuaEditor.tsx b/frontends/nextjs/src/components/editors/lua/LuaEditor.tsx
similarity index 100%
rename from frontends/nextjs/src/components/editors/LuaEditor.tsx
rename to frontends/nextjs/src/components/editors/lua/LuaEditor.tsx
diff --git a/frontends/nextjs/src/components/editors/LuaSnippetLibrary.tsx b/frontends/nextjs/src/components/editors/lua/LuaSnippetLibrary.tsx
similarity index 100%
rename from frontends/nextjs/src/components/editors/LuaSnippetLibrary.tsx
rename to frontends/nextjs/src/components/editors/lua/LuaSnippetLibrary.tsx
diff --git a/frontends/nextjs/src/components/editors/SchemaEditor.tsx b/frontends/nextjs/src/components/editors/schema/SchemaEditor.tsx
similarity index 100%
rename from frontends/nextjs/src/components/editors/SchemaEditor.tsx
rename to frontends/nextjs/src/components/editors/schema/SchemaEditor.tsx
diff --git a/frontends/nextjs/src/components/editors/SchemaEditorLevel4.tsx b/frontends/nextjs/src/components/editors/schema/SchemaEditorLevel4.tsx
similarity index 100%
rename from frontends/nextjs/src/components/editors/SchemaEditorLevel4.tsx
rename to frontends/nextjs/src/components/editors/schema/SchemaEditorLevel4.tsx
diff --git a/frontends/nextjs/src/components/managers/ComponentCatalog.tsx b/frontends/nextjs/src/components/managers/component/ComponentCatalog.tsx
similarity index 100%
rename from frontends/nextjs/src/components/managers/ComponentCatalog.tsx
rename to frontends/nextjs/src/components/managers/component/ComponentCatalog.tsx
diff --git a/frontends/nextjs/src/components/managers/ComponentConfigDialog.tsx b/frontends/nextjs/src/components/managers/component/ComponentConfigDialog.tsx
similarity index 100%
rename from frontends/nextjs/src/components/managers/ComponentConfigDialog.tsx
rename to frontends/nextjs/src/components/managers/component/ComponentConfigDialog.tsx
diff --git a/frontends/nextjs/src/components/managers/ComponentHierarchyEditor.tsx b/frontends/nextjs/src/components/managers/component/ComponentHierarchyEditor.tsx
similarity index 100%
rename from frontends/nextjs/src/components/managers/ComponentHierarchyEditor.tsx
rename to frontends/nextjs/src/components/managers/component/ComponentHierarchyEditor.tsx
diff --git a/frontends/nextjs/src/components/managers/CssClassBuilder.tsx b/frontends/nextjs/src/components/managers/css/CssClassBuilder.tsx
similarity index 100%
rename from frontends/nextjs/src/components/managers/CssClassBuilder.tsx
rename to frontends/nextjs/src/components/managers/css/CssClassBuilder.tsx
diff --git a/frontends/nextjs/src/components/managers/CssClassManager.tsx b/frontends/nextjs/src/components/managers/css/CssClassManager.tsx
similarity index 100%
rename from frontends/nextjs/src/components/managers/CssClassManager.tsx
rename to frontends/nextjs/src/components/managers/css/CssClassManager.tsx
diff --git a/frontends/nextjs/src/components/managers/DatabaseManager.tsx b/frontends/nextjs/src/components/managers/database/DatabaseManager.tsx
similarity index 100%
rename from frontends/nextjs/src/components/managers/DatabaseManager.tsx
rename to frontends/nextjs/src/components/managers/database/DatabaseManager.tsx
diff --git a/frontends/nextjs/src/components/managers/PackageImportExport.tsx b/frontends/nextjs/src/components/managers/package/PackageImportExport.tsx
similarity index 100%
rename from frontends/nextjs/src/components/managers/PackageImportExport.tsx
rename to frontends/nextjs/src/components/managers/package/PackageImportExport.tsx
diff --git a/frontends/nextjs/src/components/managers/PackageManager.tsx b/frontends/nextjs/src/components/managers/package/PackageManager.tsx
similarity index 100%
rename from frontends/nextjs/src/components/managers/PackageManager.tsx
rename to frontends/nextjs/src/components/managers/package/PackageManager.tsx