diff --git a/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectForm.schema.tsx b/src/containers/Projects/containers/ProjectFormDialog/ProjectForm.schema.tsx
similarity index 100%
rename from src/containers/Projects/containers/ProjectFormDialog/containers/ProjectForm.schema.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/ProjectForm.schema.tsx
diff --git a/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectForm.tsx b/src/containers/Projects/containers/ProjectFormDialog/ProjectForm.tsx
similarity index 100%
rename from src/containers/Projects/containers/ProjectFormDialog/containers/ProjectForm.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/ProjectForm.tsx
diff --git a/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormContent.tsx b/src/containers/Projects/containers/ProjectFormDialog/ProjectFormContent.tsx
similarity index 100%
rename from src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormContent.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/ProjectFormContent.tsx
diff --git a/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormDialogContent.tsx b/src/containers/Projects/containers/ProjectFormDialog/ProjectFormDialogContent.tsx
similarity index 100%
rename from src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormDialogContent.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/ProjectFormDialogContent.tsx
diff --git a/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormFields.tsx b/src/containers/Projects/containers/ProjectFormDialog/ProjectFormFields.tsx
similarity index 100%
rename from src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormFields.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/ProjectFormFields.tsx
diff --git a/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormFloatingActions.tsx b/src/containers/Projects/containers/ProjectFormDialog/ProjectFormFloatingActions.tsx
similarity index 100%
rename from src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormFloatingActions.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/ProjectFormFloatingActions.tsx
diff --git a/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormProvider.tsx b/src/containers/Projects/containers/ProjectFormDialog/ProjectFormProvider.tsx
similarity index 100%
rename from src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormProvider.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/ProjectFormProvider.tsx
diff --git a/src/containers/Projects/containers/ProjectFormDialog/index.tsx b/src/containers/Projects/containers/ProjectFormDialog/index.tsx
index 371af527c..c9d035d86 100644
--- a/src/containers/Projects/containers/ProjectFormDialog/index.tsx
+++ b/src/containers/Projects/containers/ProjectFormDialog/index.tsx
@@ -5,7 +5,7 @@ import withDialogRedux from 'components/DialogReduxConnect';
 import { compose } from 'utils';
 
 const ProjectDialogContent = React.lazy(
-  () => import('./containers/ProjectFormDialogContent'),
+  () => import('./ProjectFormDialogContent'),
 );
 
 /**
diff --git a/src/containers/Projects/containers/TaskFormDialog/containers/TaskForm.schema.tsx b/src/containers/Projects/containers/TaskFormDialog/TaskForm.schema.tsx
similarity index 100%
rename from src/containers/Projects/containers/TaskFormDialog/containers/TaskForm.schema.tsx
rename to src/containers/Projects/containers/TaskFormDialog/TaskForm.schema.tsx
diff --git a/src/containers/Projects/containers/TaskFormDialog/containers/TaskForm.tsx b/src/containers/Projects/containers/TaskFormDialog/TaskForm.tsx
similarity index 100%
rename from src/containers/Projects/containers/TaskFormDialog/containers/TaskForm.tsx
rename to src/containers/Projects/containers/TaskFormDialog/TaskForm.tsx
diff --git a/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormContent.tsx b/src/containers/Projects/containers/TaskFormDialog/TaskFormContent.tsx
similarity index 100%
rename from src/containers/Projects/containers/TaskFormDialog/containers/TaskFormContent.tsx
rename to src/containers/Projects/containers/TaskFormDialog/TaskFormContent.tsx
diff --git a/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormDialogContent.tsx b/src/containers/Projects/containers/TaskFormDialog/TaskFormDialogContent.tsx
similarity index 100%
rename from src/containers/Projects/containers/TaskFormDialog/containers/TaskFormDialogContent.tsx
rename to src/containers/Projects/containers/TaskFormDialog/TaskFormDialogContent.tsx
diff --git a/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormFields.tsx b/src/containers/Projects/containers/TaskFormDialog/TaskFormFields.tsx
similarity index 100%
rename from src/containers/Projects/containers/TaskFormDialog/containers/TaskFormFields.tsx
rename to src/containers/Projects/containers/TaskFormDialog/TaskFormFields.tsx
diff --git a/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormFloatingActions.tsx b/src/containers/Projects/containers/TaskFormDialog/TaskFormFloatingActions.tsx
similarity index 100%
rename from src/containers/Projects/containers/TaskFormDialog/containers/TaskFormFloatingActions.tsx
rename to src/containers/Projects/containers/TaskFormDialog/TaskFormFloatingActions.tsx
diff --git a/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormProvider.tsx b/src/containers/Projects/containers/TaskFormDialog/TaskFormProvider.tsx
similarity index 100%
rename from src/containers/Projects/containers/TaskFormDialog/containers/TaskFormProvider.tsx
rename to src/containers/Projects/containers/TaskFormDialog/TaskFormProvider.tsx
diff --git a/src/containers/Projects/containers/TaskFormDialog/index.tsx b/src/containers/Projects/containers/TaskFormDialog/index.tsx
index c22bae264..d57287c46 100644
--- a/src/containers/Projects/containers/TaskFormDialog/index.tsx
+++ b/src/containers/Projects/containers/TaskFormDialog/index.tsx
@@ -6,7 +6,7 @@ import withDialogRedux from 'components/DialogReduxConnect';
 import { compose } from 'utils';
 
 const TaskFormDialogContent = React.lazy(
-  () => import('./containers/TaskFormDialogContent'),
+  () => import('./TaskFormDialogContent'),
 );
 
 /**