diff --git a/src/components/DialogsContainer.js b/src/components/DialogsContainer.js
index 4cad1a95a..8d1a0c56c 100644
--- a/src/components/DialogsContainer.js
+++ b/src/components/DialogsContainer.js
@@ -40,8 +40,8 @@ import BranchActivateDialog from '../containers/Dialogs/BranchActivateDialog';
 import WarehouseActivateDialog from '../containers/Dialogs/WarehouseActivateDialog';
 import CustomerOpeningBalanceDialog from '../containers/Dialogs/CustomerOpeningBalanceDialog';
 import VendorOpeningBalanceDialog from '../containers/Dialogs/VendorOpeningBalanceDialog';
-import ProjectDialog from '../containers/Dialogs/ProjectDialog';
-import TaskDialog from '../containers/Dialogs/TaskDialog';
+import ProjectFormDialog from '../containers/Projects/containers/ProjectFormDialog';
+import TaskFormDialog from '../containers/Projects/containers/TaskFormDialog';
 
 /**
  * Dialogs container.
@@ -92,8 +92,8 @@ export default function DialogsContainer() {
       <WarehouseActivateDialog dialogName={'warehouse-activate'} />
       <CustomerOpeningBalanceDialog dialogName={'customer-opening-balance'} />
       <VendorOpeningBalanceDialog dialogName={'vendor-opening-balance'} />
-      <ProjectDialog dialogName={'project-form'} />
-      <TaskDialog dialogName={'task-form'} />
+      <ProjectFormDialog dialogName={'project-form'} />
+      <TaskFormDialog dialogName={'task-form'} />
     </div>
   );
 }
diff --git a/src/containers/Dialogs/ProjectDialog/containers/ProjectForm.schema.tsx b/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectForm.schema.tsx
similarity index 100%
rename from src/containers/Dialogs/ProjectDialog/containers/ProjectForm.schema.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/containers/ProjectForm.schema.tsx
diff --git a/src/containers/Dialogs/ProjectDialog/containers/ProjectForm.tsx b/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectForm.tsx
similarity index 100%
rename from src/containers/Dialogs/ProjectDialog/containers/ProjectForm.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/containers/ProjectForm.tsx
diff --git a/src/containers/Dialogs/ProjectDialog/containers/ProjectFormContent.tsx b/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormContent.tsx
similarity index 100%
rename from src/containers/Dialogs/ProjectDialog/containers/ProjectFormContent.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormContent.tsx
diff --git a/src/containers/Dialogs/ProjectDialog/containers/ProjectDialogContent.tsx b/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormDialogContent.tsx
similarity index 80%
rename from src/containers/Dialogs/ProjectDialog/containers/ProjectDialogContent.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormDialogContent.tsx
index 97397608d..63921866e 100644
--- a/src/containers/Dialogs/ProjectDialog/containers/ProjectDialogContent.tsx
+++ b/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormDialogContent.tsx
@@ -4,10 +4,10 @@ import { ProjectFormProvider } from './ProjectFormProvider';
 import ProjectForm from './ProjectForm';
 
 /**
- * Project dialog content.
+ * Project form dialog content.
  * @returns {ReactNode}
  */
-export default function ProjectDialogContent({
+export default function ProjectFormDialogContent({
   // #ownProps
   dialogName,
   project,
diff --git a/src/containers/Dialogs/ProjectDialog/containers/ProjectFormFields.tsx b/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormFields.tsx
similarity index 100%
rename from src/containers/Dialogs/ProjectDialog/containers/ProjectFormFields.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormFields.tsx
diff --git a/src/containers/Dialogs/ProjectDialog/containers/ProjectFormFloatingActions.tsx b/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormFloatingActions.tsx
similarity index 100%
rename from src/containers/Dialogs/ProjectDialog/containers/ProjectFormFloatingActions.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormFloatingActions.tsx
diff --git a/src/containers/Dialogs/ProjectDialog/containers/ProjectFormProvider.tsx b/src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormProvider.tsx
similarity index 100%
rename from src/containers/Dialogs/ProjectDialog/containers/ProjectFormProvider.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/containers/ProjectFormProvider.tsx
diff --git a/src/containers/Dialogs/ProjectDialog/index.tsx b/src/containers/Projects/containers/ProjectFormDialog/index.tsx
similarity index 73%
rename from src/containers/Dialogs/ProjectDialog/index.tsx
rename to src/containers/Projects/containers/ProjectFormDialog/index.tsx
index 0d777c323..371af527c 100644
--- a/src/containers/Dialogs/ProjectDialog/index.tsx
+++ b/src/containers/Projects/containers/ProjectFormDialog/index.tsx
@@ -5,16 +5,16 @@ import withDialogRedux from 'components/DialogReduxConnect';
 import { compose } from 'utils';
 
 const ProjectDialogContent = React.lazy(
-  () => import('./containers/ProjectDialogContent'),
+  () => import('./containers/ProjectFormDialogContent'),
 );
 
 /**
- * Project dialog.
+ * Project form dialog.
  * @returns
  */
-function ProjectDialog({ dialogName, payload: { projectId = null }, isOpen }) {
+function ProjectFormDialog({ dialogName, payload: { projectId = null }, isOpen }) {
   return (
-    <ProjectDialogRoot
+    <ProjectFormDialogRoot
       name={dialogName}
       title={<T id={'projects.label.new_project'} />}
       isOpen={isOpen}
@@ -25,13 +25,13 @@ function ProjectDialog({ dialogName, payload: { projectId = null }, isOpen }) {
       <DialogSuspense>
         <ProjectDialogContent dialogName={dialogName} project={projectId} />
       </DialogSuspense>
-    </ProjectDialogRoot>
+    </ProjectFormDialogRoot>
   );
 }
 
-export default compose(withDialogRedux())(ProjectDialog);
+export default compose(withDialogRedux())(ProjectFormDialog);
 
-const ProjectDialogRoot = styled(Dialog)`
+const ProjectFormDialogRoot = styled(Dialog)`
   .bp3-dialog-body {
     .bp3-form-group {
       margin-bottom: 15px;
diff --git a/src/containers/Projects/containers/ProjectsActionsBar.tsx b/src/containers/Projects/containers/ProjectsLanding/ProjectsActionsBar.tsx
similarity index 95%
rename from src/containers/Projects/containers/ProjectsActionsBar.tsx
rename to src/containers/Projects/containers/ProjectsLanding/ProjectsActionsBar.tsx
index d227a0aba..c1a9d2c12 100644
--- a/src/containers/Projects/containers/ProjectsActionsBar.tsx
+++ b/src/containers/Projects/containers/ProjectsLanding/ProjectsActionsBar.tsx
@@ -6,7 +6,6 @@ import {
   NavbarDivider,
   Alignment,
 } from '@blueprintjs/core';
-
 import {
   Icon,
   AdvancedFilterPopover,
@@ -20,9 +19,8 @@ import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
 
 import withProjects from './withProjects';
 import withProjectsActions from './withProjectsActions';
-
-import withSettings from '../../Settings/withSettings';
-import withSettingsActions from '../../Settings/withSettingsActions';
+import withSettings from '../../../Settings/withSettings';
+import withSettingsActions from '../../../Settings/withSettingsActions';
 import withDialogActions from 'containers/Dialog/withDialogActions';
 
 import { compose } from 'utils';
diff --git a/src/containers/Projects/containers/ProjectsDataTable.tsx b/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx
similarity index 95%
rename from src/containers/Projects/containers/ProjectsDataTable.tsx
rename to src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx
index 4b42a947b..ea14c783e 100644
--- a/src/containers/Projects/containers/ProjectsDataTable.tsx
+++ b/src/containers/Projects/containers/ProjectsLanding/ProjectsDataTable.tsx
@@ -1,18 +1,14 @@
 import React from 'react';
-
 import { DataTable } from 'components';
 import { TABLES } from 'common/tables';
-
 import TableSkeletonRows from 'components/Datatable/TableSkeletonRows';
 import TableSkeletonHeader from 'components/Datatable/TableHeaderSkeleton';
-
 import { useProjectsListContext } from './ProjectsListProvider';
 import { useMemorizedColumnsWidths } from 'hooks';
-import { useProjectsListColumns, ActionsMenu } from '../components';
-
+import { useProjectsListColumns, ActionsMenu } from './components';
 import withDialogActions from 'containers/Dialog/withDialogActions';
 import withProjectsActions from './withProjectsActions';
-import withSettings from '../../Settings/withSettings';
+import withSettings from '../../../Settings/withSettings';
 
 import { compose } from 'utils';
 
diff --git a/src/containers/Projects/containers/ProjectsList.tsx b/src/containers/Projects/containers/ProjectsLanding/ProjectsList.tsx
similarity index 98%
rename from src/containers/Projects/containers/ProjectsList.tsx
rename to src/containers/Projects/containers/ProjectsLanding/ProjectsList.tsx
index 4f1716c8a..77ad204b0 100644
--- a/src/containers/Projects/containers/ProjectsList.tsx
+++ b/src/containers/Projects/containers/ProjectsLanding/ProjectsList.tsx
@@ -13,7 +13,7 @@ import { compose, transformTableStateToQuery } from 'utils';
 
 /**
  * Projects list.
- * @returns {React.TSX}
+ * @returns 
  */
 function ProjectsList({
   // #withProjects
diff --git a/src/containers/Projects/containers/ProjectsListProvider.tsx b/src/containers/Projects/containers/ProjectsLanding/ProjectsListProvider.tsx
similarity index 90%
rename from src/containers/Projects/containers/ProjectsListProvider.tsx
rename to src/containers/Projects/containers/ProjectsLanding/ProjectsListProvider.tsx
index 4b2cc5412..a87f2d1f4 100644
--- a/src/containers/Projects/containers/ProjectsListProvider.tsx
+++ b/src/containers/Projects/containers/ProjectsLanding/ProjectsListProvider.tsx
@@ -1,7 +1,7 @@
 //@ts-nocheck
 import React from 'react';
 import { useResourceViews, useResourceMeta } from 'hooks/query';
-import DashboardInsider from '../../../components/Dashboard/DashboardInsider';
+import DashboardInsider from '../../../../components/Dashboard/DashboardInsider';
 
 const ProjectsListContext = React.createContext();
 
diff --git a/src/containers/Projects/containers/ProjectsViewTabs.tsx b/src/containers/Projects/containers/ProjectsLanding/ProjectsViewTabs.tsx
similarity index 98%
rename from src/containers/Projects/containers/ProjectsViewTabs.tsx
rename to src/containers/Projects/containers/ProjectsLanding/ProjectsViewTabs.tsx
index 1a9f137bc..30b6e70dd 100644
--- a/src/containers/Projects/containers/ProjectsViewTabs.tsx
+++ b/src/containers/Projects/containers/ProjectsLanding/ProjectsViewTabs.tsx
@@ -12,7 +12,7 @@ import { compose, transfromViewsToTabs } from 'utils';
 
 /**
  * Projects views tabs.
- * @returns {React.TSX}
+ * @returns
  */
 function ProjectsViewTabs({
   // #withProjects
diff --git a/src/containers/Projects/components/index.tsx b/src/containers/Projects/containers/ProjectsLanding/components/index.tsx
similarity index 100%
rename from src/containers/Projects/components/index.tsx
rename to src/containers/Projects/containers/ProjectsLanding/components/index.tsx
diff --git a/src/containers/Projects/containers/withProjects.tsx b/src/containers/Projects/containers/ProjectsLanding/withProjects.tsx
similarity index 91%
rename from src/containers/Projects/containers/withProjects.tsx
rename to src/containers/Projects/containers/ProjectsLanding/withProjects.tsx
index cf230357a..35b73c42f 100644
--- a/src/containers/Projects/containers/withProjects.tsx
+++ b/src/containers/Projects/containers/ProjectsLanding/withProjects.tsx
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import {
   getProjectsTableStateFactory,
   isProjectsTableStateChangedFactory,
-} from '../../../store/Project/projects.selectors';
+} from '../../../../store/Project/projects.selectors';
 
 export default (mapState) => {
   const getProjectsTableState = getProjectsTableStateFactory();
diff --git a/src/containers/Projects/containers/withProjectsActions.tsx b/src/containers/Projects/containers/ProjectsLanding/withProjectsActions.tsx
similarity index 79%
rename from src/containers/Projects/containers/withProjectsActions.tsx
rename to src/containers/Projects/containers/ProjectsLanding/withProjectsActions.tsx
index de0a47f46..d74590f07 100644
--- a/src/containers/Projects/containers/withProjectsActions.tsx
+++ b/src/containers/Projects/containers/ProjectsLanding/withProjectsActions.tsx
@@ -1,10 +1,9 @@
 import { connect } from 'react-redux';
-// import type { Dispatch } from 'redux';
 
 import {
   setProjectsTableState,
   resetProjectsTableState,
-} from '../../../store/Project/projects.actions';
+} from '../../../../store/Project/projects.actions';
 
 const mapDispatchToProps = (dispatch) => ({
   setProjectsTableState: (state) => dispatch(setProjectsTableState(state)),
diff --git a/src/containers/Dialogs/TaskDialog/containers/TaskForm.schema.tsx b/src/containers/Projects/containers/TaskFormDialog/containers/TaskForm.schema.tsx
similarity index 100%
rename from src/containers/Dialogs/TaskDialog/containers/TaskForm.schema.tsx
rename to src/containers/Projects/containers/TaskFormDialog/containers/TaskForm.schema.tsx
diff --git a/src/containers/Dialogs/TaskDialog/containers/TaskForm.tsx b/src/containers/Projects/containers/TaskFormDialog/containers/TaskForm.tsx
similarity index 100%
rename from src/containers/Dialogs/TaskDialog/containers/TaskForm.tsx
rename to src/containers/Projects/containers/TaskFormDialog/containers/TaskForm.tsx
diff --git a/src/containers/Dialogs/TaskDialog/containers/TaskFormContent.tsx b/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormContent.tsx
similarity index 100%
rename from src/containers/Dialogs/TaskDialog/containers/TaskFormContent.tsx
rename to src/containers/Projects/containers/TaskFormDialog/containers/TaskFormContent.tsx
diff --git a/src/containers/Dialogs/TaskDialog/containers/TaskDialogContent.tsx b/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormDialogContent.tsx
similarity index 79%
rename from src/containers/Dialogs/TaskDialog/containers/TaskDialogContent.tsx
rename to src/containers/Projects/containers/TaskFormDialog/containers/TaskFormDialogContent.tsx
index 79b721e02..441356e65 100644
--- a/src/containers/Dialogs/TaskDialog/containers/TaskDialogContent.tsx
+++ b/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormDialogContent.tsx
@@ -3,9 +3,9 @@ import { TaskFormProvider } from './TaskFormProvider';
 import TaskForm from './TaskForm';
 
 /**
- * Task dialog content.
+ * Task form dialog content.
  */
-export default function TaskDialogContent({
+export default function TaskFormDialogContent({
   // #ownProps
   dialogName,
   task,
diff --git a/src/containers/Dialogs/TaskDialog/containers/TaskFormFields.tsx b/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormFields.tsx
similarity index 100%
rename from src/containers/Dialogs/TaskDialog/containers/TaskFormFields.tsx
rename to src/containers/Projects/containers/TaskFormDialog/containers/TaskFormFields.tsx
diff --git a/src/containers/Dialogs/TaskDialog/containers/TaskFormFloatingActions.tsx b/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormFloatingActions.tsx
similarity index 100%
rename from src/containers/Dialogs/TaskDialog/containers/TaskFormFloatingActions.tsx
rename to src/containers/Projects/containers/TaskFormDialog/containers/TaskFormFloatingActions.tsx
diff --git a/src/containers/Dialogs/TaskDialog/containers/TaskFormProvider.tsx b/src/containers/Projects/containers/TaskFormDialog/containers/TaskFormProvider.tsx
similarity index 100%
rename from src/containers/Dialogs/TaskDialog/containers/TaskFormProvider.tsx
rename to src/containers/Projects/containers/TaskFormDialog/containers/TaskFormProvider.tsx
diff --git a/src/containers/Dialogs/TaskDialog/index.tsx b/src/containers/Projects/containers/TaskFormDialog/index.tsx
similarity index 59%
rename from src/containers/Dialogs/TaskDialog/index.tsx
rename to src/containers/Projects/containers/TaskFormDialog/index.tsx
index 61dbbcbfd..c22bae264 100644
--- a/src/containers/Dialogs/TaskDialog/index.tsx
+++ b/src/containers/Projects/containers/TaskFormDialog/index.tsx
@@ -5,15 +5,15 @@ import { Dialog, DialogSuspense, FormattedMessage as T } from 'components';
 import withDialogRedux from 'components/DialogReduxConnect';
 import { compose } from 'utils';
 
-const TaskDialogContent = React.lazy(
-  () => import('./containers/TaskDialogContent'),
+const TaskFormDialogContent = React.lazy(
+  () => import('./containers/TaskFormDialogContent'),
 );
 
 /**
- * Task dialog.
- * @returns {ReactNode}
+ * Task form dialog.
+ * @returns
  */
-function TaskDialog({ dialogName, payload: { taskId = null }, isOpen }) {
+function TaskFormDialog({ dialogName, payload: { taskId = null }, isOpen }) {
   return (
     <Dialog
       name={dialogName}
@@ -24,11 +24,11 @@ function TaskDialog({ dialogName, payload: { taskId = null }, isOpen }) {
       style={{ width: '500px' }}
     >
       <DialogSuspense>
-        <TaskDialogContent dialogName={dialogName} task={taskId} />
+        <TaskFormDialogContent dialogName={dialogName} task={taskId} />
       </DialogSuspense>
     </Dialog>
   );
 }
-export default compose(withDialogRedux())(TaskDialog);
+export default compose(withDialogRedux())(TaskFormDialog);
 
-const TaskDialogRoot = styled(Dialog)``;
+const TaskFormDialogRoot = styled(Dialog)``;
diff --git a/src/lang/en/index.json b/src/lang/en/index.json
index f13743593..fea33284a 100644
--- a/src/lang/en/index.json
+++ b/src/lang/en/index.json
@@ -2069,5 +2069,5 @@
   "task.schema.label.task_name": "Task name",
   "task.schema.label.task_house": "Task house",
   "task.schema.label.charge": "Charge",
-  "task.schema.label.amount": "Amount",
+  "task.schema.label.amount": "Amount"
 }
\ No newline at end of file
diff --git a/src/routes/dashboard.js b/src/routes/dashboard.js
index a14713bc0..f5b5c2c12 100644
--- a/src/routes/dashboard.js
+++ b/src/routes/dashboard.js
@@ -972,7 +972,7 @@ export const getDashboardRoutes = () => [
   {
     path: '/projects',
     component: lazy(() =>
-      import('../containers/Projects/containers/ProjectsList'),
+      import('../containers/Projects/containers/ProjectsLanding/ProjectsList'),
     ),
     pageTitle: intl.get('sidebar.projects'),
   },