diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/app.config.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/app.config.ts
index 9e84b88..7e477ce 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/app.config.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/app.config.ts
@@ -5,7 +5,7 @@ import { provideClientHydration } from '@angular/platform-browser';
 import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 import { provideHttpClient, withFetch } from '@angular/common/http';
 import { APP_BASE_HREF } from '@angular/common';
-import { UrlService } from './services/url.service';
+import { UrlService } from './services/api/url.service';
 import { API_URL } from './tokens';
 
 export const appConfig: ApplicationConfig = {
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/auth/auth.guard.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/auth/auth.guard.ts
index eb0dc65..e20f96d 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/auth/auth.guard.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/auth/auth.guard.ts
@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, Router } from '@angular/router';
-import { Observable, of } from 'rxjs';
-import { AuthenticationService } from '../services/authentication.service'; // Adjust the path as necessary
+import { AuthenticationService } from '../services/api/authentication.service'; // Adjust the path as necessary
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { LoginComponent } from '../components/login/login.component';
 
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/common/color-mode-bttn/color-mode-bttn.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/common/color-mode-bttn/color-mode-bttn.component.ts
index c29d618..19a2bb6 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/common/color-mode-bttn/color-mode-bttn.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/common/color-mode-bttn/color-mode-bttn.component.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ColorModeService, GetLocalTheme, Theme } from '../../../services/color-mode.service';
+import { ColorModeService, GetLocalTheme, Theme } from '../../../services/button/color-mode.service';
 import { CommonModule } from '@angular/common'
 
 @Component({
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/group-form/group-form.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/group-form/group-form.component.ts
index 49882b0..df3768a 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/group-form/group-form.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/group-form/group-form.component.ts
@@ -10,10 +10,10 @@ import { MatCheckboxModule } from '@angular/material/checkbox';
 import { CommonModule } from '@angular/common';
 import { MatTabsModule } from '@angular/material/tabs';
 import { UserGroupDirImportComponent } from "../../user-group-dir-import/user-group-dir-import.component";
-import { UserService } from '../../../services/user.service';
-import { RefreshService } from '../../../services/refresh.service';
+import { UserService } from '../../../services/api/user.service';
+import { RefreshService } from '../../../services/button/refresh.service';
 import { GroupDirImportComponent } from "../../group-dir-import/group-dir-import.component";
-import { GroupService } from '../../../services/group.service';
+import { GroupService } from '../../../services/api/group.service';
 import Swal from 'sweetalert2';
 
 @Component({
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/user-form/user-form.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/user-form/user-form.component.ts
index 9ee445d..54758f2 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/user-form/user-form.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/forms/user-form/user-form.component.ts
@@ -9,8 +9,8 @@ import { MatButtonModule } from '@angular/material/button';
 import { CommonModule } from '@angular/common';
 import { MatTabsModule } from '@angular/material/tabs';
 import { UserGroupDirImportComponent } from "../../user-group-dir-import/user-group-dir-import.component";
-import { UserService } from '../../../services/user.service';
-import { RefreshService } from '../../../services/refresh.service';
+import { UserService } from '../../../services/api/user.service';
+import { RefreshService } from '../../../services/button/refresh.service';
 import Swal from 'sweetalert2';
 
 @Component({
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group-dir-import/group-dir-import.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group-dir-import/group-dir-import.component.ts
index 0c01d27..d0678ee 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group-dir-import/group-dir-import.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/group-dir-import/group-dir-import.component.ts
@@ -1,7 +1,7 @@
-import { AfterViewInit, Component, Inject, OnInit, ViewChild } from '@angular/core';
+import { Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { GuiRowSelection, GuiRowSelectionMode, GuiRowSelectionType } from '@generic-ui/ngx-grid';
 import Swal from 'sweetalert2';
-import { GroupService } from '../../services/group.service';
+import { GroupService } from '../../services/api/group.service';
 import { Observable, forkJoin, of } from 'rxjs';
 import { catchError, finalize } from 'rxjs/operators';
 import { DirGroupTableComponent } from '../tables/dir-group-table/dir-group-table.component';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/login/login.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/login/login.component.ts
index 30d1eb6..379d917 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/login/login.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/login/login.component.ts
@@ -1,5 +1,5 @@
 import { Component, Inject, Input } from '@angular/core';
-import { AuthenticationService } from '../../services/authentication.service';
+import { AuthenticationService } from '../../services/api/authentication.service';
 import Swal from 'sweetalert2';
 import { MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { CommonModule } from '@angular/common';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.ts
index 60394de..bf1a07c 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/nav-menu/nav-menu.component.ts
@@ -1,15 +1,15 @@
 import { Component } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { AuthenticationService, IsLogedIn } from '../../services/authentication.service';
+import { AuthenticationService, IsLogedIn } from '../../services/api/authentication.service';
 import { LoginComponent } from '../login/login.component';
 import { RouterModule } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { ColorModeBttnComponent } from '../common/color-mode-bttn/color-mode-bttn.component';
 import { MatIconModule } from '@angular/material/icon';
-import { RefreshService } from '../../services/refresh.service';
-import { CreationService } from '../../services/creation.service';
-import { UpdateService, UpdateEvent } from '../../services/update.service';
-import { TransferService } from '../../services/transfer.service';
+import { RefreshService } from '../../services/button/refresh.service';
+import { CreationService } from '../../services/button/creation.service';
+import { UpdateService, UpdateEvent } from '../../services/button/update.service';
+import { TransferService } from '../../services/button/transfer.service';
 import { MatBadgeModule } from '@angular/material/badge';
 import {
   MatSlideToggleModule,
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.spec.ts
index 955fe8f..c3e8b57 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.spec.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.spec.ts
@@ -1,6 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { BaseTableComponent } from './base-table.component';
-import { ApiService } from '../../../services/user-management.api.service';
+import { ApiService } from '../../../services/api/user-management.api.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 describe('BaseTableComponent', () => {
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts
index 126c42c..328861b 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/base-table/base-table.component.ts
@@ -1,8 +1,8 @@
 import { Component, Inject, Input, OnDestroy, OnInit, ViewChild, input } from '@angular/core';
-import { ApiService } from '../../../services/user-management.api.service';
+import { ApiService } from '../../../services/api/user-management.api.service';
 import { GuiGridModule, GuiColumn, GuiColumnMenu, GuiSorting, GuiRowDetail, GuiPaging, GuiPagingDisplay, GuiSearching, GuiCellEdit, GuiInfoPanel, GuiTitlePanel, GuiRowSelection, GuiSelectedRow, GuiGridComponent, GuiGridApi, GuiTheme } from '@generic-ui/ngx-grid';
 import { Subscription } from 'rxjs/internal/Subscription';
-import { ColorModeService, Theme } from '../../../services/color-mode.service';
+import { ColorModeService, Theme } from '../../../services/button/color-mode.service';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-group-table/dir-group-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-group-table/dir-group-table.component.ts
index f284156..e322d25 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-group-table/dir-group-table.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-group-table/dir-group-table.component.ts
@@ -1,13 +1,13 @@
 import { Component, Inject } from '@angular/core';
 import { BaseTableComponent } from '../base-table/base-table.component';
-import { DirGroupService } from '../../../services/dir-group.service';
+import { DirGroupService } from '../../../services/api/dir-group.service';
 import { DirGroup } from '../../../models/user-management.api.models';
 import { GuiGridModule } from '@generic-ui/ngx-grid';
-import { ColorModeService } from '../../../services/color-mode.service';
+import { ColorModeService } from '../../../services/button/color-mode.service';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { env } from '../../../../environments/environment';
-import { GroupService } from '../../../services/group.service';
+import { GroupService } from '../../../services/api/group.service';
 import { firstValueFrom } from 'rxjs';
 
 @Component({
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-user-table/dir-user-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-user-table/dir-user-table.component.ts
index 5a204d1..72fb2eb 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-user-table/dir-user-table.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/dir-user-table/dir-user-table.component.ts
@@ -1,13 +1,13 @@
 import { Component, Inject } from '@angular/core';
 import { DirUser } from '../../../models/user-management.api.models';
-import { DirUserService } from '../../../services/dir-user.service';
+import { DirUserService } from '../../../services/api/dir-user.service';
 import { BaseTableComponent } from '../base-table/base-table.component';
 import { GuiGridModule, GuiColumn } from '@generic-ui/ngx-grid';
-import { ColorModeService } from '../../../services/color-mode.service';
+import { ColorModeService } from '../../../services/button/color-mode.service';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { env } from '../../../../environments/environment';
-import { UserService } from '../../../services/user.service';
+import { UserService } from '../../../services/api/user.service';
 import { firstValueFrom } from 'rxjs/internal/firstValueFrom';
 
 @Component({
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-table/group-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-table/group-table.component.ts
index 9e2da91..3c9cc11 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-table/group-table.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/group-table/group-table.component.ts
@@ -1,13 +1,13 @@
 import { Component, Inject } from '@angular/core';
-import { GroupService } from '../../../services/group.service';
+import { GroupService } from '../../../services/api/group.service';
 import { Group } from '../../../models/user-management.api.models';
 import { GuiGridModule, GuiColumn } from '@generic-ui/ngx-grid';
 import { BaseTableComponent } from '../base-table/base-table.component';
-import { ColorModeService } from '../../../services/color-mode.service';
+import { ColorModeService } from '../../../services/button/color-mode.service';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { env } from '../../../../environments/environment';
-import { GroupOfUserService } from '../../../services/group-of-user.service';
+import { GroupOfUserService } from '../../../services/api/group-of-user.service';
 
 @Component({
   standalone: true,
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/module-table/module-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/module-table/module-table.component.ts
index 6fe3bbc..85ae8cd 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/module-table/module-table.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/module-table/module-table.component.ts
@@ -2,12 +2,12 @@ import { Component } from '@angular/core';
 import { Module } from '../../../models/user-management.api.models';
 import { GuiGridModule } from '@generic-ui/ngx-grid';
 import { BaseTableComponent } from '../base-table/base-table.component';
-import { ModuleService } from '../../../services/module.service'
-import { ColorModeService } from '../../../services/color-mode.service';
+import { ModuleService } from '../../../services/api/module.service'
+import { ColorModeService } from '../../../services/button/color-mode.service';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { env } from '../../../../environments/environment';
-import { ModuleOfUserService } from '../../../services/module-of-user.service';
+import { ModuleOfUserService } from '../../../services/api/module-of-user.service';
 
 @Component({
   standalone: true,
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-rep-table/user-rep-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-rep-table/user-rep-table.component.ts
index 5bf9b4d..329f60d 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-rep-table/user-rep-table.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-rep-table/user-rep-table.component.ts
@@ -1,9 +1,9 @@
 import { Component, Inject } from '@angular/core';
 import { UserRep } from '../../../models/user-management.api.models';
-import { UserRepService } from '../../../services/user-representation.service';
+import { UserRepService } from '../../../services/api/user-representation.service';
 import { BaseTableComponent } from '../base-table/base-table.component';
 import { GuiGridModule, GuiColumn } from '@generic-ui/ngx-grid';
-import { ColorModeService } from '../../../services/color-mode.service';
+import { ColorModeService } from '../../../services/button/color-mode.service';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { env } from '../../../../environments/environment';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-table/user-table.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-table/user-table.component.ts
index 708d8e5..f798723 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-table/user-table.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/tables/user-table/user-table.component.ts
@@ -1,11 +1,11 @@
-import { Component, Inject, Input } from '@angular/core';
-import { UserService } from '../../../services/user.service';
-import { ModuleOfUserService } from '../../../services/module-of-user.service';
-import { GroupOfUserService } from '../../../services/group-of-user.service';
+import { Component } from '@angular/core';
+import { UserService } from '../../../services/api/user.service';
+import { ModuleOfUserService } from '../../../services/api/module-of-user.service';
+import { GroupOfUserService } from '../../../services/api/group-of-user.service';
 import { User } from '../../../models/user-management.api.models';
-import { GuiGridModule, GuiColumn } from '@generic-ui/ngx-grid';
+import { GuiGridModule } from '@generic-ui/ngx-grid';
 import { BaseTableComponent } from '../base-table/base-table.component';
-import { ColorModeService } from '../../../services/color-mode.service'
+import { ColorModeService } from '../../../services/button/color-mode.service'
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { env } from '../../../../environments/environment';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-group-dir-import/user-group-dir-import.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-group-dir-import/user-group-dir-import.component.ts
index ec578a1..da9f6fb 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-group-dir-import/user-group-dir-import.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/components/user-group-dir-import/user-group-dir-import.component.ts
@@ -1,14 +1,14 @@
 import { AfterViewInit, Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { GuiRowSelection, GuiRowSelectionMode, GuiRowSelectionType, GuiSelectedRow } from '@generic-ui/ngx-grid';
 import Swal from 'sweetalert2';
-import { GroupService } from '../../services/group.service';
+import { GroupService } from '../../services/api/group.service';
 import { Observable, forkJoin, of } from 'rxjs';
 import { catchError, finalize } from 'rxjs/operators';
 import { DirGroupTableComponent } from '../tables/dir-group-table/dir-group-table.component';
 import { DirUserTableComponent } from '../tables/dir-user-table/dir-user-table.component';
-import { UserService } from '../../services/user.service';
+import { UserService } from '../../services/api/user.service';
 import { User } from '../../models/user-management.api.models'
-import { RefreshService } from '../../services/refresh.service';
+import { RefreshService } from '../../services/button/refresh.service';
 
 @Component({
   standalone: true,
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/base-page/base-page.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/base-page/base-page.component.ts
index 4b6a662..458c606 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/base-page/base-page.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/base-page/base-page.component.ts
@@ -1,8 +1,8 @@
 import { Component, HostListener, inject } from '@angular/core';
-import { RefreshService } from '../../services/refresh.service';
-import { CreationService } from '../../services/creation.service';
-import { UpdateService } from '../../services/update.service';
-import { TransferService } from '../../services/transfer.service';
+import { RefreshService } from '../../services/button/refresh.service';
+import { CreationService } from '../../services/button/creation.service';
+import { UpdateService } from '../../services/button/update.service';
+import { TransferService } from '../../services/button/transfer.service';
 
 @Component({
   selector: 'app-base-page',
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.ts
index 6959b72..5b1bef3 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/module/module.component.ts
@@ -1,6 +1,5 @@
 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 '../../components/tables/user-table/user-table.component';
 import { GuiSelectedRow } from '@generic-ui/ngx-grid';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts
index 0e414ed..e447cbb 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/pages/user-representation/user-representation.component.ts
@@ -3,7 +3,7 @@ import { GuiColumn, GuiSelectedRow } from '@generic-ui/ngx-grid/gui/grid/src/cor
 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 { UserRepService } from '../../services/api/user-representation.service';
 import Swal from 'sweetalert2';
 import { MatTabsModule, MatTabGroup } from '@angular/material/tabs';
 import { env } from '../../../environments/environment';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/authentication.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/authentication.service.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/authentication.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/authentication.service.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/config.service.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/config.service.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/config.service.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/config.service.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/config.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/config.service.ts
similarity index 86%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/config.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/config.service.ts
index de94f27..ffa2606 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/config.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/config.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { firstValueFrom } from 'rxjs/internal/firstValueFrom';
-import { env } from '../../environments/environment';
+import { env } from '../../../environments/environment';
 
 @Injectable({
   providedIn: 'root'
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/dir-group.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-group.service.ts
similarity index 93%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/dir-group.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-group.service.ts
index 8dd8ff8..10053b1 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/dir-group.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-group.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { DirGroup, } from '../models/user-management.api.models';
+import { DirGroup, } from '../../models/user-management.api.models';
 import { ApiService } from './user-management.api.service';
 import { Observable } from 'rxjs/internal/Observable';
 import Swal from 'sweetalert2';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/dir-user.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-user.service.ts
similarity index 91%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/dir-user.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-user.service.ts
index b1e6a91..47f489b 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/dir-user.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir-user.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, Inject } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { DirUser } from '../models/user-management.api.models';
+import { DirUser } from '../../models/user-management.api.models';
 import { ApiService } from './user-management.api.service';
 import { Observable } from 'rxjs/internal/Observable';
 import { UrlService } from './url.service';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/dir.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir.service.ts
similarity index 90%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/dir.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir.service.ts
index fc8671e..2f9a0ed 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/dir.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/dir.service.ts
@@ -1,7 +1,7 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import { Inject, Injectable } from '@angular/core';
-import { DirUser } from '../models/user-management.api.models';
+import { DirUser } from '../../models/user-management.api.models';
 import { UrlService } from './url.service';
 
 @Injectable({
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/group-of-user.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group-of-user.service.ts
similarity index 91%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/group-of-user.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group-of-user.service.ts
index ade2161..309a2a6 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/group-of-user.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group-of-user.service.ts
@@ -1,6 +1,6 @@
-import { Injectable, Inject } from '@angular/core';
+import { Injectable } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { GroupOfUser } from '../models/user-management.api.models';
+import { GroupOfUser } from '../../models/user-management.api.models';
 import { ApiService } from './user-management.api.service';
 import { Observable, firstValueFrom } from 'rxjs';
 import { UrlService } from './url.service';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/group.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group.service.ts
similarity index 89%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/group.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group.service.ts
index 4991984..0573f1f 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/group.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/group.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { DirGroup, Group, } from '../models/user-management.api.models';
+import { DirGroup, Group, } from '../../models/user-management.api.models';
 import { ApiService } from './user-management.api.service';
 import { Observable } from 'rxjs/internal/Observable';
 import { UrlService } from './url.service';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/module-of-user.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module-of-user.service.ts
similarity index 92%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/module-of-user.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module-of-user.service.ts
index cbff4db..28b54ae 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/module-of-user.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module-of-user.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { ModuleOfUser } from '../models/user-management.api.models';
+import { ModuleOfUser } from '../../models/user-management.api.models';
 import { ApiService } from './user-management.api.service';
 import { Observable, firstValueFrom } from 'rxjs';
 import { UrlService } from './url.service';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/module.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module.service.ts
similarity index 85%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/module.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module.service.ts
index 86bc8af..66d50fa 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/module.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/module.service.ts
@@ -1,7 +1,7 @@
 import { Injectable, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { ApiService } from './user-management.api.service';
-import { Module } from '../models/user-management.api.models';
+import { Module } from '../../models/user-management.api.models';
 import { UrlService } from './url.service';
 
 @Injectable({
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/url.service.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/url.service.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/url.service.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/url.service.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/url.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/url.service.ts
similarity index 96%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/url.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/url.service.ts
index 9ed9444..bc6f5eb 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/url.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/url.service.ts
@@ -1,7 +1,7 @@
 import { Injectable, Inject, inject } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { Meta } from '@angular/platform-browser';
-import { env } from '../../environments/environment';
+import { env } from '../../../environments/environment';
 
 @Injectable({
   providedIn: 'root'
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/user-management.api.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-management.api.service.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/user-management.api.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-management.api.service.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/user-representation.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-representation.service.ts
similarity index 94%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/user-representation.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-representation.service.ts
index bdb3609..c40d44e 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/user-representation.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user-representation.service.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable } from "@angular/core";
-import { UserRep } from "../models/user-management.api.models";
+import { UserRep } from "../../models/user-management.api.models";
 import { ApiService } from "./user-management.api.service";
 import { HttpClient, HttpParams } from "@angular/common/http";
 import { Observable } from "rxjs";
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/user.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user.service.ts
similarity index 93%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/user.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user.service.ts
index 1970d0b..333a6b9 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/user.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/api/user.service.ts
@@ -1,6 +1,6 @@
 import { Injectable, Inject } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
-import { DirUser, User } from '../models/user-management.api.models';
+import { DirUser, User } from '../../models/user-management.api.models';
 import { ApiService } from './user-management.api.service';
 import { Observable } from 'rxjs';
 import { UrlService } from './url.service';
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/base-button.service.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/base-button.service.spec.ts
new file mode 100644
index 0000000..c2a0b02
--- /dev/null
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/base-button.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { BaseButtonService } from './base-button.service';
+
+describe('BaseButtonService', () => {
+  let service: BaseButtonService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(BaseButtonService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/base-button.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/base-button.service.ts
new file mode 100644
index 0000000..0b03434
--- /dev/null
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/base-button.service.ts
@@ -0,0 +1,4 @@
+export class BaseButtonService {
+
+  public isVisible = true;
+}
\ No newline at end of file
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/color-mode.service.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/color-mode.service.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/color-mode.service.ts
similarity index 93%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/color-mode.service.ts
index 618233e..7a28797 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/color-mode.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/color-mode.service.ts
@@ -1,11 +1,12 @@
 import { Injectable, Inject, Renderer2, RendererFactory2, PLATFORM_ID } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { BaseButtonService } from './base-button.service';
 
 @Injectable({
   providedIn: 'root'
 })
-export class ColorModeService {
+export class ColorModeService extends BaseButtonService {
 
   private readonly renderer: Renderer2;
 
@@ -13,6 +14,7 @@ export class ColorModeService {
   public themeChanges$ = this.themeSubject.asObservable();
 
   constructor(@Inject(PLATFORM_ID) private platformId: object, private rendererFactory: RendererFactory2, @Inject(DOCUMENT) public document: Document) {
+    super()
     this.renderer = rendererFactory.createRenderer(null, null);
   }
 
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/creation.service.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/creation.service.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/creation.service.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/creation.service.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/creation.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/creation.service.ts
similarity index 82%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/creation.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/creation.service.ts
index 24fe45a..6137676 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/creation.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/creation.service.ts
@@ -1,16 +1,18 @@
 import { Injectable } from '@angular/core';
 import { MatDialog, MatDialogRef } from '@angular/material/dialog';
 import { ComponentType } from '@angular/cdk/portal';
+import { BaseButtonService } from './base-button.service';
 
 @Injectable({
   providedIn: 'root'
 })
-export class CreationService {
+export class CreationService extends BaseButtonService {
 
   public component: ComponentType<unknown> | undefined
   public width: string = "50vw";
 
   constructor(private readonly dialog: MatDialog) {
+    super()
   }
 
   openDialog(): MatDialogRef<unknown, any> | undefined {
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/refresh.service.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/refresh.service.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/refresh.service.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/refresh.service.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/refresh.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/refresh.service.ts
similarity index 68%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/refresh.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/refresh.service.ts
index 52ee4c9..aa34adc 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/refresh.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/refresh.service.ts
@@ -1,12 +1,15 @@
 import { Injectable } from '@angular/core';
 import { UpdateService } from './update.service';
+import { BaseButtonService } from './base-button.service';
 
 @Injectable({
   providedIn: 'root'
 })
-export class RefreshService {
+export class RefreshService extends BaseButtonService {
 
-  constructor(private updateService: UpdateService) { }
+  constructor(private updateService: UpdateService) { 
+    super()
+  }
 
   private actions: Array<() => void> = [];
 
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/transfer.service.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/transfer.service.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/transfer.service.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/transfer.service.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/transfer.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/transfer.service.ts
similarity index 79%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/transfer.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/transfer.service.ts
index 1c6af7a..73bb64a 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/transfer.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/transfer.service.ts
@@ -1,11 +1,10 @@
 import { Injectable } from '@angular/core';
+import { BaseButtonService } from './base-button.service';
 
 @Injectable({
   providedIn: 'root'
 })
-export class TransferService {
-
-  constructor() { }
+export class TransferService extends BaseButtonService {
 
   private actions: Array<() => void> = [];
 
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/update.service.spec.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/update.service.spec.ts
similarity index 100%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/update.service.spec.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/update.service.spec.ts
diff --git a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/update.service.ts b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/update.service.ts
similarity index 95%
rename from DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/update.service.ts
rename to DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/update.service.ts
index f6a29b0..c629669 100644
--- a/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/update.service.ts
+++ b/DigitalData.UserManager.API/ClientApp/user_manager_ui/src/app/services/button/update.service.ts
@@ -1,11 +1,10 @@
 import { Injectable } from '@angular/core';
+import { BaseButtonService } from './base-button.service';
 
 @Injectable({
   providedIn: 'root'
 })
-export class UpdateService {
-
-  constructor() { }
+export class UpdateService extends BaseButtonService {
 
   private async_actions: { [key: string]: () => Promise<void> } = {};
   private actions: { [key: string]: () => void } = {};