diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/app.routes.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/app.routes.ts
index b0d17c8..b1d4759 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/app.routes.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/app.routes.ts
@@ -1,11 +1,11 @@
 import { Routes } from '@angular/router';
-import { HomeComponent } from './home/home.component';
+import { HomeComponent } from './pages/home/home.component';
 import { AuthGuard } from './auth/auth.guard';
-import { UserComponent } from './components/user/user.component';
-import { GroupComponent } from './components/group/group.component';
-import { ModuleComponent } from './components/module/module.component';
-import { UserAssignmentComponent } from './components/user-assignment/user-assignment.component';
-import { UserRepresentationComponent } from './components/user-representation/user-representation.component';
+import { UserComponent } from './pages/user/user.component';
+import { GroupComponent } from './pages/group/group.component';
+import { ModuleComponent } from './pages/module/module.component';
+import { UserAssignmentComponent } from './pages/user-assignment/user-assignment.component';
+import { UserRepresentationComponent } from './pages/user-representation/user-representation.component';
 
 export const routes: Routes = [
     { path: '', component: HomeComponent },
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group/group.component.css b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.css
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group/group.component.css
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.css
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group/group.component.html b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.html
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group/group.component.html
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.html
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group/group.component.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group/group.component.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group/group.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.ts
similarity index 94%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group/group.component.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.ts
index 3d1df7f..d96cfb3 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group/group.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/group/group.component.ts
@@ -5,7 +5,7 @@ import { RefreshService } from '../../services/refresh.service';
 import { MatTabsModule } from '@angular/material/tabs';
 import { GuiSelectedRow } from '@generic-ui/ngx-grid';
 import { CreationService } from '../../services/creation.service';
-import { GroupFormComponent } from '../forms/group-form/group-form.component';
+import { GroupFormComponent } from '../../components/forms/group-form/group-form.component';
 
 @Component({
   standalone: true,
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/home/home.component.html b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/home/home.component.html
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/home/home.component.html
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/home/home.component.html
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/home/home.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/home/home.component.ts
similarity index 77%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/home/home.component.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/home/home.component.ts
index 3d38781..e2358f5 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/home/home.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/home/home.component.ts
@@ -1,7 +1,7 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { AuthenticationService } from '../services/authentication.service';
-import { RefreshService } from '../services/refresh.service';
+import { AuthenticationService } from '../../services/authentication.service';
+import { RefreshService } from '../../services/refresh.service';
 
 @Component({
   standalone: true,
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/module/module.component.css b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.css
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/module/module.component.css
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.css
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/module/module.component.html b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.html
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/module/module.component.html
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.html
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/module/module.component.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/module/module.component.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/module/module.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.ts
similarity index 93%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/module/module.component.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.ts
index e807b21..63d93b5 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/module/module.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.ts
@@ -2,7 +2,7 @@ import { AfterViewInit, Component, ViewChild } from '@angular/core';
 import { ModuleTableComponent } from '../../components/tables/module-table/module-table.component';
 import { RefreshService } from '../../services/refresh.service';
 import { MatTabsModule } from '@angular/material/tabs';
-import { UserTableComponent } from '../tables/user-table/user-table.component';
+import { UserTableComponent } from '../../components/tables/user-table/user-table.component';
 import { GuiSelectedRow } from '@generic-ui/ngx-grid';
 
 @Component({
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.css b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.css
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.css
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.css
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.html b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.html
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.html
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.html
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.scss b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.scss
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.scss
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.scss
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts
similarity index 93%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts
index f64099d..6b37afb 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-assignment/user-assignment.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-assignment/user-assignment.component.ts
@@ -1,9 +1,9 @@
 import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core';
-import { TabItem } from '../common/tab-card/tab-card.component';
+import { TabItem } from '../../components/common/tab-card/tab-card.component';
 import { GuiRowSelection, GuiRowSelectionMode, GuiRowSelectionType, GuiSelectedRow } from '@generic-ui/ngx-grid';
-import { UserTableComponent } from '../tables/user-table/user-table.component';
-import { ModuleTableComponent } from '../tables/module-table/module-table.component';
-import { GroupTableComponent } from '../tables/group-table/group-table.component';
+import { UserTableComponent } from '../../components/tables/user-table/user-table.component';
+import { ModuleTableComponent } from '../../components/tables/module-table/module-table.component';
+import { GroupTableComponent } from '../../components/tables/group-table/group-table.component';
 import { User } from '../../models/user-management.api.models';
 import { MatTabsModule, MatTabGroup } from '@angular/material/tabs';
 import { RefreshService } from '../../services/refresh.service';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-representation/user-representation.component.css b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.css
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-representation/user-representation.component.css
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.css
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-representation/user-representation.component.html b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.html
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-representation/user-representation.component.html
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.html
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-representation/user-representation.component.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-representation/user-representation.component.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-representation/user-representation.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts
similarity index 95%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-representation/user-representation.component.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts
index 97a08fa..a7a899f 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-representation/user-representation.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts
@@ -1,8 +1,8 @@
 import { AfterViewInit, Component, Inject, ViewChild } from '@angular/core';
 import { GuiColumn, GuiSelectedRow } from '@generic-ui/ngx-grid/gui/grid/src/core/api/gui.grid.public-api';
-import { UserTableComponent } from '../tables/user-table/user-table.component';
-import { UserRepTableComponent } from '../tables/user-rep-table/user-rep-table.component';
-import { GroupTableComponent } from '../tables/group-table/group-table.component';
+import { UserTableComponent } from '../../components/tables/user-table/user-table.component';
+import { UserRepTableComponent } from '../../components/tables/user-rep-table/user-rep-table.component';
+import { GroupTableComponent } from '../../components/tables/group-table/group-table.component';
 import { UserRepService } from '../../services/user-representation.service';
 import Swal from 'sweetalert2';
 import { MatTabsModule, MatTabGroup } from '@angular/material/tabs';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user/user.component.css b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.css
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user/user.component.css
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.css
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user/user.component.html b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.html
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user/user.component.html
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.html
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user/user.component.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user/user.component.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user/user.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.ts
similarity index 95%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user/user.component.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.ts
index 56fdfe1..a567c32 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user/user.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user/user.component.ts
@@ -1,6 +1,6 @@
 import { AfterViewInit, Component, ViewChild } from '@angular/core';
 import { GuiCellEdit, GuiSelectedRow } from '@generic-ui/ngx-grid';
-import { UserTableComponent } from '../tables/user-table/user-table.component';
+import { UserTableComponent } from '../../components/tables/user-table/user-table.component';
 import { RefreshService } from '../../services/refresh.service';
 import { MatTabsModule } from '@angular/material/tabs';
 import { GroupTableComponent } from '../../components/tables/group-table/group-table.component';