diff --git a/apps/dafa-web/src/app/data/constants/navigation.ts b/apps/dafa-web/src/app/shared/constants/navigation.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/constants/navigation.ts
rename to apps/dafa-web/src/app/shared/constants/navigation.ts
diff --git a/apps/dafa-web/src/app/directives/unsubscribe.directive.ts b/apps/dafa-web/src/app/shared/directives/unsubscribe.directive.ts
similarity index 100%
rename from apps/dafa-web/src/app/directives/unsubscribe.directive.ts
rename to apps/dafa-web/src/app/shared/directives/unsubscribe.directive.ts
diff --git a/apps/dafa-web/src/app/data/enums/authorization.enum.ts b/apps/dafa-web/src/app/shared/enums/authorization.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/authorization.enum.ts
rename to apps/dafa-web/src/app/shared/enums/authorization.enum.ts
diff --git a/apps/dafa-web/src/app/data/enums/error-severity.enum.ts b/apps/dafa-web/src/app/shared/enums/error-severity.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/error-severity.enum.ts
rename to apps/dafa-web/src/app/shared/enums/error-severity.enum.ts
diff --git a/apps/dafa-web/src/app/data/enums/error-type.enum.ts b/apps/dafa-web/src/app/shared/enums/error-type.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/error-type.enum.ts
rename to apps/dafa-web/src/app/shared/enums/error-type.enum.ts
diff --git a/apps/dafa-web/src/app/data/enums/icon-size.enum.ts b/apps/dafa-web/src/app/shared/enums/icon-size.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/icon-size.enum.ts
rename to apps/dafa-web/src/app/shared/enums/icon-size.enum.ts
diff --git a/apps/dafa-web/src/app/data/enums/icon-type.enum.ts b/apps/dafa-web/src/app/shared/enums/icon-type.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/icon-type.enum.ts
rename to apps/dafa-web/src/app/shared/enums/icon-type.enum.ts
diff --git a/apps/dafa-web/src/app/data/enums/keyboard-codes.enum.ts b/apps/dafa-web/src/app/shared/enums/keyboard-codes.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/keyboard-codes.enum.ts
rename to apps/dafa-web/src/app/shared/enums/keyboard-codes.enum.ts
diff --git a/apps/dafa-web/src/app/data/enums/participant-status.enum.ts b/apps/dafa-web/src/app/shared/enums/participant-status.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/participant-status.enum.ts
rename to apps/dafa-web/src/app/shared/enums/participant-status.enum.ts
diff --git a/apps/dafa-web/src/app/data/enums/service.enum.ts b/apps/dafa-web/src/app/shared/enums/service.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/service.enum.ts
rename to apps/dafa-web/src/app/shared/enums/service.enum.ts
diff --git a/apps/dafa-web/src/app/data/enums/sort-order.enum.ts b/apps/dafa-web/src/app/shared/enums/sort-order.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/sort-order.enum.ts
rename to apps/dafa-web/src/app/shared/enums/sort-order.enum.ts
diff --git a/apps/dafa-web/src/app/data/enums/toast-position.enum.ts b/apps/dafa-web/src/app/shared/enums/toast-position.enum.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/enums/toast-position.enum.ts
rename to apps/dafa-web/src/app/shared/enums/toast-position.enum.ts
diff --git a/apps/dafa-web/src/app/guards/auth.guard.ts b/apps/dafa-web/src/app/shared/guards/auth.guard.ts
similarity index 100%
rename from apps/dafa-web/src/app/guards/auth.guard.ts
rename to apps/dafa-web/src/app/shared/guards/auth.guard.ts
diff --git a/apps/dafa-web/src/app/interceptors/custom-error-handler.module.ts b/apps/dafa-web/src/app/shared/interceptors/custom-error-handler.module.ts
similarity index 100%
rename from apps/dafa-web/src/app/interceptors/custom-error-handler.module.ts
rename to apps/dafa-web/src/app/shared/interceptors/custom-error-handler.module.ts
diff --git a/apps/dafa-web/src/app/data/models/authentication.model.ts b/apps/dafa-web/src/app/shared/models/authentication.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/authentication.model.ts
rename to apps/dafa-web/src/app/shared/models/authentication.model.ts
diff --git a/apps/dafa-web/src/app/data/models/authorization.model.ts b/apps/dafa-web/src/app/shared/models/authorization.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/authorization.model.ts
rename to apps/dafa-web/src/app/shared/models/authorization.model.ts
diff --git a/apps/dafa-web/src/app/data/models/date-format-options.model.ts b/apps/dafa-web/src/app/shared/models/date-format-options.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/date-format-options.model.ts
rename to apps/dafa-web/src/app/shared/models/date-format-options.model.ts
diff --git a/apps/dafa-web/src/app/data/models/employee.model.ts b/apps/dafa-web/src/app/shared/models/employee.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/employee.model.ts
rename to apps/dafa-web/src/app/shared/models/employee.model.ts
diff --git a/apps/dafa-web/src/app/data/models/error/custom-error.ts b/apps/dafa-web/src/app/shared/models/error/custom-error.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/error/custom-error.ts
rename to apps/dafa-web/src/app/shared/models/error/custom-error.ts
diff --git a/apps/dafa-web/src/app/data/models/organization.model.ts b/apps/dafa-web/src/app/shared/models/organization.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/organization.model.ts
rename to apps/dafa-web/src/app/shared/models/organization.model.ts
diff --git a/apps/dafa-web/src/app/data/models/out-of-office-date.model.ts b/apps/dafa-web/src/app/shared/models/out-of-office-date.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/out-of-office-date.model.ts
rename to apps/dafa-web/src/app/shared/models/out-of-office-date.model.ts
diff --git a/apps/dafa-web/src/app/data/models/pagination-meta.model.ts b/apps/dafa-web/src/app/shared/models/pagination-meta.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/pagination-meta.model.ts
rename to apps/dafa-web/src/app/shared/models/pagination-meta.model.ts
diff --git a/apps/dafa-web/src/app/data/models/participant.model.ts b/apps/dafa-web/src/app/shared/models/participant.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/participant.model.ts
rename to apps/dafa-web/src/app/shared/models/participant.model.ts
diff --git a/apps/dafa-web/src/app/data/models/service.model.ts b/apps/dafa-web/src/app/shared/models/service.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/service.model.ts
rename to apps/dafa-web/src/app/shared/models/service.model.ts
diff --git a/apps/dafa-web/src/app/data/models/sort.model.ts b/apps/dafa-web/src/app/shared/models/sort.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/sort.model.ts
rename to apps/dafa-web/src/app/shared/models/sort.model.ts
diff --git a/apps/dafa-web/src/app/data/models/user.model.ts b/apps/dafa-web/src/app/shared/models/user.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/user.model.ts
rename to apps/dafa-web/src/app/shared/models/user.model.ts
diff --git a/apps/dafa-web/src/app/data/models/validation-error.model.ts b/apps/dafa-web/src/app/shared/models/validation-error.model.ts
similarity index 100%
rename from apps/dafa-web/src/app/data/models/validation-error.model.ts
rename to apps/dafa-web/src/app/shared/models/validation-error.model.ts
diff --git a/apps/dafa-web/src/app/services/.gitkeep b/apps/dafa-web/src/app/shared/services/.gitkeep
similarity index 100%
rename from apps/dafa-web/src/app/services/.gitkeep
rename to apps/dafa-web/src/app/shared/services/.gitkeep
diff --git a/apps/dafa-web/src/app/services/api/auth.interceptor.ts b/apps/dafa-web/src/app/shared/services/api/auth.interceptor.ts
similarity index 100%
rename from apps/dafa-web/src/app/services/api/auth.interceptor.ts
rename to apps/dafa-web/src/app/shared/services/api/auth.interceptor.ts
diff --git a/apps/dafa-web/src/app/services/api/authentication.service.ts b/apps/dafa-web/src/app/shared/services/api/authentication.service.ts
similarity index 100%
rename from apps/dafa-web/src/app/services/api/authentication.service.ts
rename to apps/dafa-web/src/app/shared/services/api/authentication.service.ts
diff --git a/apps/dafa-web/src/app/services/api/authorizations.service.ts b/apps/dafa-web/src/app/shared/services/api/authorizations.service.ts
similarity index 100%
rename from apps/dafa-web/src/app/services/api/authorizations.service.ts
rename to apps/dafa-web/src/app/shared/services/api/authorizations.service.ts
diff --git a/apps/dafa-web/src/app/services/api/avrop-api.service.ts b/apps/dafa-web/src/app/shared/services/api/avrop-api.service.ts
similarity index 93%
rename from apps/dafa-web/src/app/services/api/avrop-api.service.ts
rename to apps/dafa-web/src/app/shared/services/api/avrop-api.service.ts
index ade0564..bf945fe 100644
--- a/apps/dafa-web/src/app/services/api/avrop-api.service.ts
+++ b/apps/dafa-web/src/app/shared/services/api/avrop-api.service.ts
@@ -1,9 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Deltagare } from '../../pages/avrop/models/Deltagare';
-import { Handledare } from '../../pages/avrop/models/Handledare';
 import { Observable, of } from 'rxjs';
 import { delay } from 'rxjs/operators';
-import { MultiselectFilterOption } from '../../pages/avrop/models/AvropFilterOptions';
+import { MultiselectFilterOption } from '../../../pages/avrop/models/AvropFilterOptions';
+import { Deltagare } from '../../../pages/avrop/models/Deltagare';
+import { Handledare } from '../../../pages/avrop/models/Handledare';
 
 const tempHandledareMock: Handledare[] = [
   { id: '1', fullName: 'Göran Persson' },
diff --git a/apps/dafa-web/src/app/services/api/employee.service.ts b/apps/dafa-web/src/app/shared/services/api/employee.service.ts
similarity index 100%
rename from apps/dafa-web/src/app/services/api/employee.service.ts
rename to apps/dafa-web/src/app/shared/services/api/employee.service.ts
diff --git a/apps/dafa-web/src/app/services/api/participants.service.ts b/apps/dafa-web/src/app/shared/services/api/participants.service.ts
similarity index 100%
rename from apps/dafa-web/src/app/services/api/participants.service.ts
rename to apps/dafa-web/src/app/shared/services/api/participants.service.ts
diff --git a/apps/dafa-web/src/app/services/api/service.service.ts b/apps/dafa-web/src/app/shared/services/api/service.service.ts
similarity index 100%
rename from apps/dafa-web/src/app/services/api/service.service.ts
rename to apps/dafa-web/src/app/shared/services/api/service.service.ts
diff --git a/apps/dafa-web/src/app/services/api/user.service.ts b/apps/dafa-web/src/app/shared/services/api/user.service.ts
similarity index 100%
rename from apps/dafa-web/src/app/services/api/user.service.ts
rename to apps/dafa-web/src/app/shared/services/api/user.service.ts
diff --git a/apps/dafa-web/src/app/services/error.service.ts b/apps/dafa-web/src/app/shared/services/error.service.ts
similarity index 100%
rename from apps/dafa-web/src/app/services/error.service.ts
rename to apps/dafa-web/src/app/shared/services/error.service.ts
diff --git a/apps/dafa-web/src/app/utils/map-path-to-page-name.util.ts b/apps/dafa-web/src/app/shared/utils/map-path-to-page-name.util.ts
similarity index 100%
rename from apps/dafa-web/src/app/utils/map-path-to-page-name.util.ts
rename to apps/dafa-web/src/app/shared/utils/map-path-to-page-name.util.ts
diff --git a/apps/dafa-web/src/app/utils/map-paths-to-breadcrumbs.util.ts b/apps/dafa-web/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts
similarity index 100%
rename from apps/dafa-web/src/app/utils/map-paths-to-breadcrumbs.util.ts
rename to apps/dafa-web/src/app/shared/utils/map-paths-to-breadcrumbs.util.ts
diff --git a/apps/dafa-web/src/app/utils/sort.util.ts b/apps/dafa-web/src/app/shared/utils/sort.util.ts
similarity index 100%
rename from apps/dafa-web/src/app/utils/sort.util.ts
rename to apps/dafa-web/src/app/shared/utils/sort.util.ts
diff --git a/apps/dafa-web/src/app/utils/validators/required.validator.ts b/apps/dafa-web/src/app/shared/utils/validators/required.validator.ts
similarity index 100%
rename from apps/dafa-web/src/app/utils/validators/required.validator.ts
rename to apps/dafa-web/src/app/shared/utils/validators/required.validator.ts
diff --git a/apps/dafa-web/src/app/utils/validators/social-security-number.validator.ts b/apps/dafa-web/src/app/shared/utils/validators/social-security-number.validator.ts
similarity index 100%
rename from apps/dafa-web/src/app/utils/validators/social-security-number.validator.ts
rename to apps/dafa-web/src/app/shared/utils/validators/social-security-number.validator.ts
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 2d765b8..e78bee9 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -17,15 +17,15 @@
     "paths": {
       "@dafa-assets/*": ["apps/dafa-web/src/assets/*"],
       "@dafa-shared/*": ["apps/dafa-web/src/app/shared/*"],
-      "@dafa-models/*": ["apps/dafa-web/src/app/data/models/*"],
-      "@dafa-guards/*": ["apps/dafa-web/src/app/guards/*"],
-      "@dafa-constants/*": ["apps/dafa-web/src/app/data/constants/*"],
-      "@dafa-directives/*": ["apps/dafa-web/src/app/directives/*"],
-      "@dafa-enums/*": ["apps/dafa-web/src/app/data/enums/*"],
-      "@dafa-services/*": ["apps/dafa-web/src/app/services/*"],
-      "@dafa-interceptors/*": ["apps/dafa-web/src/app/interceptors/*"],
-      "@dafa-utils/*": ["apps/dafa-web/src/app/utils/*"],
-      "@dafa-validators/*": ["apps/dafa-web/src/app/utils/validators/*"],
+      "@dafa-models/*": ["apps/dafa-web/src/app/shared/models/*"],
+      "@dafa-guards/*": ["apps/dafa-web/src/app/shared/guards/*"],
+      "@dafa-constants/*": ["apps/dafa-web/src/app/shared/constants/*"],
+      "@dafa-directives/*": ["apps/dafa-web/src/app/shared/directives/*"],
+      "@dafa-enums/*": ["apps/dafa-web/src/app/shared/enums/*"],
+      "@dafa-services/*": ["apps/dafa-web/src/app/shared/services/*"],
+      "@dafa-interceptors/*": ["apps/dafa-web/src/app/shared/interceptors/*"],
+      "@dafa-utils/*": ["apps/dafa-web/src/app/shared/utils/*"],
+      "@dafa-validators/*": ["apps/dafa-web/src/app/shared/utils/validators/*"],
       "@dafa-environment": ["apps/dafa-web/src/environments/environment"]
     }
   },