diff --git a/plop/generators/apiActions.generator.ts b/plop/generators/apiActions.generator.ts
index e87007ea..d17956d8 100644
--- a/plop/generators/apiActions.generator.ts
+++ b/plop/generators/apiActions.generator.ts
@@ -16,17 +16,17 @@ export const apiActionsGenerator: PlopGeneratorConfig = {
     {
       type: 'add',
       path: 'src/api/actions/{{camelCase name}}/{{camelCase name}}.mutations.ts',
-      templateFile: 'plop-templates/apiActions/apiActions.mutations.hbs',
+      templateFile: 'plop/templates/apiActions/apiActions.mutations.hbs',
     },
     {
       type: 'add',
       path: 'src/api/actions/{{camelCase name}}/{{camelCase name}}.queries.ts',
-      templateFile: 'plop-templates/apiActions/apiActions.queries.hbs',
+      templateFile: 'plop/templates/apiActions/apiActions.queries.hbs',
     },
     {
       type: 'add',
       path: 'src/api/actions/{{camelCase name}}/{{camelCase name}}.types.ts',
-      templateFile: 'plop-templates/apiActions/apiActions.types.hbs',
+      templateFile: 'plop/templates/apiActions/apiActions.types.hbs',
     },
     {
       type: 'modify',
diff --git a/plop/generators/apiMutation.generator.ts b/plop/generators/apiMutation.generator.ts
index 29a7dce5..8aa1d8a9 100644
--- a/plop/generators/apiMutation.generator.ts
+++ b/plop/generators/apiMutation.generator.ts
@@ -42,7 +42,7 @@ export const apiMutationGenerator = (toKebabCase: Function): PlopGeneratorConfig
       type: 'modify',
       path: 'src/api/actions/{{collection}}/{{collection}}.types.ts',
       pattern: getPlaceholderPattern('API_ACTION_TYPES'),
-      templateFile: 'plop-templates/apiMutation/apiMutation.types.hbs',
+      templateFile: 'plop/templates/apiMutation/apiMutation.types.hbs',
     },
     {
       type: 'modify',
@@ -54,7 +54,7 @@ export const apiMutationGenerator = (toKebabCase: Function): PlopGeneratorConfig
       type: 'modify',
       path: 'src/api/actions/{{collection}}/{{collection}}.mutations.ts',
       pattern: getPlaceholderPattern('MUTATION_FUNCTIONS_SETUP'),
-      templateFile: 'plop-templates/apiMutation/apiMutation.hbs',
+      templateFile: 'plop/templates/apiMutation/apiMutation.hbs',
     }
   ],
 });
diff --git a/plop/generators/apiQuery.generator.ts b/plop/generators/apiQuery.generator.ts
index ae1bd18b..0bbea156 100644
--- a/plop/generators/apiQuery.generator.ts
+++ b/plop/generators/apiQuery.generator.ts
@@ -30,7 +30,7 @@ export const apiQueryGenerator = (toKebabCase: Function): PlopGeneratorConfig =>
       type: 'modify',
       path: 'src/api/actions/{{collection}}/{{collection}}.types.ts',
       pattern: getPlaceholderPattern('API_ACTION_TYPES'),
-      templateFile: 'plop-templates/apiQuery/apiQuery.types.hbs',
+      templateFile: 'plop/templates/apiQuery/apiQuery.types.hbs',
     },
     {
       type: 'modify',
@@ -42,7 +42,7 @@ export const apiQueryGenerator = (toKebabCase: Function): PlopGeneratorConfig =>
       type: 'modify',
       path: 'src/api/actions/{{collection}}/{{collection}}.queries.ts',
       pattern: getPlaceholderPattern('QUERY_FUNCTIONS_SETUP'),
-      templateFile: 'plop-templates/apiQuery/apiQuery.hbs',
+      templateFile: 'plop/templates/apiQuery/apiQuery.hbs',
     }
   ],
 });
diff --git a/plop/generators/appComponent.generator.ts b/plop/generators/appComponent.generator.ts
index 0d398b0c..cd012a1f 100644
--- a/plop/generators/appComponent.generator.ts
+++ b/plop/generators/appComponent.generator.ts
@@ -21,17 +21,17 @@ export const appComponentGenerator: PlopGeneratorConfig = {
     {
       type: 'add',
       path: `src/app/{{directory}}/{{camelCase name}}/{{pascalCase name}}.tsx`,
-      templateFile: 'plop-templates/component/Component.hbs',
+      templateFile: 'plop/templates/component/Component.hbs',
     },
     {
       type: 'add',
       path: `src/app/{{directory}}/{{camelCase name}}/{{pascalCase name}}.test.tsx`,
-      templateFile: 'plop-templates/component/Component.test.hbs',
+      templateFile: 'plop/templates/component/Component.test.hbs',
     },
     {
       type: 'add',
       path: `src/app/{{directory}}/{{camelCase name}}/{{pascalCase name}}.types.ts`,
-      templateFile: 'plop-templates/component/Component.types.hbs',
+      templateFile: 'plop/templates/component/Component.types.hbs',
     },
   ],
 };
diff --git a/plop/generators/appContainerComponent.generator.ts b/plop/generators/appContainerComponent.generator.ts
index 42ce273a..cd5cee43 100644
--- a/plop/generators/appContainerComponent.generator.ts
+++ b/plop/generators/appContainerComponent.generator.ts
@@ -21,22 +21,22 @@ export const appContainerComponentGenerator: PlopGeneratorConfig = {
     {
       type: 'add',
       path: `src/app/{{directory}}/{{camelCase name}}/{{pascalCase name}}.tsx`,
-      templateFile: 'plop-templates/component/Component.hbs',
+      templateFile: 'plop/templates/component/Component.hbs',
     },
     {
       type: 'add',
       path: `src/app/{{directory}}/{{camelCase name}}/{{pascalCase name}}.test.tsx`,
-      templateFile: 'plop-templates/component/Component.test.hbs',
+      templateFile: 'plop/templates/component/Component.test.hbs',
     },
     {
       type: 'add',
       path: `src/app/{{directory}}/{{camelCase name}}/{{pascalCase name}}Container.tsx`,
-      templateFile: 'plop-templates/component/Container.hbs',
+      templateFile: 'plop/templates/component/Container.hbs',
     },
     {
       type: 'add',
       path: `src/app/{{directory}}/{{camelCase name}}/{{pascalCase name}}.types.ts`,
-      templateFile: 'plop-templates/component/ContainerComponent.types.hbs',
+      templateFile: 'plop/templates/component/ContainerComponent.types.hbs',
     },
   ],
 };
diff --git a/plop/generators/context.generator.ts b/plop/generators/context.generator.ts
index 71d4a335..fd6f47b4 100644
--- a/plop/generators/context.generator.ts
+++ b/plop/generators/context.generator.ts
@@ -15,37 +15,37 @@ export const contextGenerator: PlopGeneratorConfig = {
     {
       type: 'add',
       path: 'src/context/{{camelCase name}}/{{camelCase name}}Context/{{pascalCase name}}Context.ts',
-      templateFile: 'plop-templates/context/Context.hbs',
+      templateFile: 'plop/templates/context/Context.hbs',
     },
     {
       type: 'add',
       path: 'src/context/{{camelCase name}}/{{camelCase name}}Context/{{pascalCase name}}Context.types.ts',
-      templateFile: 'plop-templates/context/Context.types.hbs',
+      templateFile: 'plop/templates/context/Context.types.hbs',
     },
     {
       type: 'add',
       path: 'src/context/{{camelCase name}}/{{camelCase name}}Context/{{pascalCase name}}Context.test.tsx',
-      templateFile: 'plop-templates/context/Context.test.hbs',
+      templateFile: 'plop/templates/context/Context.test.hbs',
     },
     {
       type: 'add',
       path: 'src/context/{{camelCase name}}/{{camelCase name}}ContextController/{{pascalCase name}}ContextController.tsx',
-      templateFile: 'plop-templates/context/ContextController.hbs',
+      templateFile: 'plop/templates/context/ContextController.hbs',
     },
     {
       type: 'add',
       path: 'src/context/{{camelCase name}}/{{camelCase name}}ContextController/{{pascalCase name}}ContextController.types.ts',
-      templateFile: 'plop-templates/context/ContextController.types.hbs',
+      templateFile: 'plop/templates/context/ContextController.types.hbs',
     },
     {
       type: 'add',
       path: 'src/hooks/use{{pascalCase name}}/use{{pascalCase name}}.ts',
-      templateFile: 'plop-templates/context/useContext.hbs',
+      templateFile: 'plop/templates/context/useContext.hbs',
     },
     {
       type: 'add',
       path: 'src/hooks/use{{pascalCase name}}/use{{pascalCase name}}.test.tsx',
-      templateFile: 'plop-templates/context/useContext.test.hbs',
+      templateFile: 'plop/templates/context/useContext.test.hbs',
     },
   ],
 };
diff --git a/plop/generators/customHook.generator.ts b/plop/generators/customHook.generator.ts
index b28dd2ce..a5dd5a03 100644
--- a/plop/generators/customHook.generator.ts
+++ b/plop/generators/customHook.generator.ts
@@ -15,18 +15,18 @@ export const customHookGenerator: PlopGeneratorConfig = {
     {
       type: 'add',
       path: 'src/hooks/{{camelCase name}}/{{camelCase name}}.tsx',
-      templateFile: 'plop-templates/hook/hook.hbs',
+      templateFile: 'plop/templates/hook/hook.hbs',
     },
     {
       type: 'add',
       path: 'src/hooks/{{camelCase name}}/{{camelCase name}}.test.tsx',
-      templateFile: 'plop-templates/hook/hook.test.hbs',
+      templateFile: 'plop/templates/hook/hook.test.hbs',
     },
     {
       type: 'modify',
       path: 'src/hooks/index.ts',
       pattern: 'export',
-      templateFile: 'plop-templates/hook/hook.index.hbs',
+      templateFile: 'plop/templates/hook/hook.index.hbs',
     },
   ],
 };
diff --git a/plop/generators/uiComponent.generator.ts b/plop/generators/uiComponent.generator.ts
index 1f9d7b6a..501bee6c 100644
--- a/plop/generators/uiComponent.generator.ts
+++ b/plop/generators/uiComponent.generator.ts
@@ -15,23 +15,23 @@ export const uiComponentGenerator: PlopGeneratorConfig = {
     {
       type: 'add',
       path: `src/ui/{{camelCase name}}/{{pascalCase name}}.tsx`,
-      templateFile: 'plop-templates/component/Component.hbs',
+      templateFile: 'plop/templates/component/Component.hbs',
     },
     {
       type: 'add',
       path: `src/ui/{{camelCase name}}/{{pascalCase name}}.test.tsx`,
-      templateFile: 'plop-templates/component/Component.test.hbs',
+      templateFile: 'plop/templates/component/Component.test.hbs',
     },
     {
       type: 'add',
       path: `src/ui/{{camelCase name}}/{{pascalCase name}}.types.ts`,
-      templateFile: 'plop-templates/component/Component.types.hbs',
+      templateFile: 'plop/templates/component/Component.types.hbs',
     },
     {
       type: 'modify',
       path: 'src/ui/index.ts',
       pattern: 'export',
-      templateFile: 'plop-templates/component/Component.index.hbs',
+      templateFile: 'plop/templates/component/Component.index.hbs',
     },
   ]
 };
diff --git a/plop-templates/apiActions/apiActions.mutations.hbs b/plop/templates/apiActions/apiActions.mutations.hbs
similarity index 100%
rename from plop-templates/apiActions/apiActions.mutations.hbs
rename to plop/templates/apiActions/apiActions.mutations.hbs
diff --git a/plop-templates/apiActions/apiActions.queries.hbs b/plop/templates/apiActions/apiActions.queries.hbs
similarity index 100%
rename from plop-templates/apiActions/apiActions.queries.hbs
rename to plop/templates/apiActions/apiActions.queries.hbs
diff --git a/plop-templates/apiActions/apiActions.types.hbs b/plop/templates/apiActions/apiActions.types.hbs
similarity index 100%
rename from plop-templates/apiActions/apiActions.types.hbs
rename to plop/templates/apiActions/apiActions.types.hbs
diff --git a/plop-templates/apiMutation/apiMutation.hbs b/plop/templates/apiMutation/apiMutation.hbs
similarity index 100%
rename from plop-templates/apiMutation/apiMutation.hbs
rename to plop/templates/apiMutation/apiMutation.hbs
diff --git a/plop-templates/apiMutation/apiMutation.types.hbs b/plop/templates/apiMutation/apiMutation.types.hbs
similarity index 100%
rename from plop-templates/apiMutation/apiMutation.types.hbs
rename to plop/templates/apiMutation/apiMutation.types.hbs
diff --git a/plop-templates/apiQuery/apiQuery.hbs b/plop/templates/apiQuery/apiQuery.hbs
similarity index 100%
rename from plop-templates/apiQuery/apiQuery.hbs
rename to plop/templates/apiQuery/apiQuery.hbs
diff --git a/plop-templates/apiQuery/apiQuery.types.hbs b/plop/templates/apiQuery/apiQuery.types.hbs
similarity index 100%
rename from plop-templates/apiQuery/apiQuery.types.hbs
rename to plop/templates/apiQuery/apiQuery.types.hbs
diff --git a/plop-templates/component/Component.hbs b/plop/templates/component/Component.hbs
similarity index 100%
rename from plop-templates/component/Component.hbs
rename to plop/templates/component/Component.hbs
diff --git a/plop-templates/component/Component.index.hbs b/plop/templates/component/Component.index.hbs
similarity index 100%
rename from plop-templates/component/Component.index.hbs
rename to plop/templates/component/Component.index.hbs
diff --git a/plop-templates/component/Component.test.hbs b/plop/templates/component/Component.test.hbs
similarity index 100%
rename from plop-templates/component/Component.test.hbs
rename to plop/templates/component/Component.test.hbs
diff --git a/plop-templates/component/Component.types.hbs b/plop/templates/component/Component.types.hbs
similarity index 100%
rename from plop-templates/component/Component.types.hbs
rename to plop/templates/component/Component.types.hbs
diff --git a/plop-templates/component/Container.hbs b/plop/templates/component/Container.hbs
similarity index 100%
rename from plop-templates/component/Container.hbs
rename to plop/templates/component/Container.hbs
diff --git a/plop-templates/component/ContainerComponent.types.hbs b/plop/templates/component/ContainerComponent.types.hbs
similarity index 100%
rename from plop-templates/component/ContainerComponent.types.hbs
rename to plop/templates/component/ContainerComponent.types.hbs
diff --git a/plop-templates/context/Context.hbs b/plop/templates/context/Context.hbs
similarity index 100%
rename from plop-templates/context/Context.hbs
rename to plop/templates/context/Context.hbs
diff --git a/plop-templates/context/Context.test.hbs b/plop/templates/context/Context.test.hbs
similarity index 100%
rename from plop-templates/context/Context.test.hbs
rename to plop/templates/context/Context.test.hbs
diff --git a/plop-templates/context/Context.types.hbs b/plop/templates/context/Context.types.hbs
similarity index 100%
rename from plop-templates/context/Context.types.hbs
rename to plop/templates/context/Context.types.hbs
diff --git a/plop-templates/context/ContextController.hbs b/plop/templates/context/ContextController.hbs
similarity index 100%
rename from plop-templates/context/ContextController.hbs
rename to plop/templates/context/ContextController.hbs
diff --git a/plop-templates/context/ContextController.types.hbs b/plop/templates/context/ContextController.types.hbs
similarity index 100%
rename from plop-templates/context/ContextController.types.hbs
rename to plop/templates/context/ContextController.types.hbs
diff --git a/plop-templates/context/useContext.hbs b/plop/templates/context/useContext.hbs
similarity index 100%
rename from plop-templates/context/useContext.hbs
rename to plop/templates/context/useContext.hbs
diff --git a/plop-templates/context/useContext.test.hbs b/plop/templates/context/useContext.test.hbs
similarity index 100%
rename from plop-templates/context/useContext.test.hbs
rename to plop/templates/context/useContext.test.hbs
diff --git a/plop-templates/hook/hook.hbs b/plop/templates/hook/hook.hbs
similarity index 100%
rename from plop-templates/hook/hook.hbs
rename to plop/templates/hook/hook.hbs
diff --git a/plop-templates/hook/hook.index.hbs b/plop/templates/hook/hook.index.hbs
similarity index 100%
rename from plop-templates/hook/hook.index.hbs
rename to plop/templates/hook/hook.index.hbs
diff --git a/plop-templates/hook/hook.test.hbs b/plop/templates/hook/hook.test.hbs
similarity index 100%
rename from plop-templates/hook/hook.test.hbs
rename to plop/templates/hook/hook.test.hbs