diff --git a/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts b/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts
index b66b680a..f84f197d 100644
--- a/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts
+++ b/monitor-admin/general/edit-stakeholder/edit-stakeholder.component.ts
@@ -1,21 +1,21 @@
 import {Component, Input, OnDestroy, ViewChild} from "@angular/core";
-import {Stakeholder} from "../../openaireLibrary/monitor/entities/stakeholder";
+import {Stakeholder} from "../../../monitor/entities/stakeholder";
 import {UntypedFormBuilder, UntypedFormGroup, Validators} from "@angular/forms";
-import {StakeholderUtils} from "../../openaireLibrary/monitor-admin/utils/indicator-utils";
-import {Option} from "../../openaireLibrary/sharedComponents/input/input.component";
+import {StakeholderUtils} from "../../utils/indicator-utils";
+import {Option} from "../../../sharedComponents/input/input.component";
 import {Subscription} from "rxjs";
-import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properties";
-import {properties} from "../../../environments/environment";
-import {StakeholderService} from "../../openaireLibrary/monitor/services/stakeholder.service";
-import {UtilitiesService} from "../../openaireLibrary/services/utilities.service";
-import {Role, Session, User} from "../../openaireLibrary/login/utils/helper.class";
-import {UserManagementService} from "../../openaireLibrary/services/user-management.service";
-import {StringUtils} from "../../openaireLibrary/utils/string-utils.class";
-import {NotifyFormComponent} from "../../openaireLibrary/notifications/notify-form/notify-form.component";
-import {NotificationUtils} from "../../openaireLibrary/notifications/notification-utils";
-import {Notification} from "../../openaireLibrary/notifications/notifications";
-import {NotificationHandler} from "../../openaireLibrary/utils/notification-handler";
-import {StatsProfilesService} from "../../openaireLibrary/monitor-admin/utils/services/stats-profiles.service";
+import {EnvProperties} from "../../../utils/properties/env-properties";
+import {properties} from "src/environments/environment";
+import {StakeholderService} from "../../../monitor/services/stakeholder.service";
+import {UtilitiesService} from "../../../services/utilities.service";
+import {Role, Session, User} from "../../../login/utils/helper.class";
+import {UserManagementService} from "../../../services/user-management.service";
+import {StringUtils} from "../../../utils/string-utils.class";
+import {NotifyFormComponent} from "../../../notifications/notify-form/notify-form.component";
+import {NotificationUtils} from "../../../notifications/notification-utils";
+import {Notification} from "../../../notifications/notifications";
+import {NotificationHandler} from "../../../utils/notification-handler";
+import {StatsProfilesService} from "../../utils/services/stats-profiles.service";
 
 @Component({
   selector: 'edit-stakeholder',
diff --git a/monitor-admin/general/edit-stakeholder/edit-stakeholder.module.ts b/monitor-admin/general/edit-stakeholder/edit-stakeholder.module.ts
index 6f08416b..0ebec4d3 100644
--- a/monitor-admin/general/edit-stakeholder/edit-stakeholder.module.ts
+++ b/monitor-admin/general/edit-stakeholder/edit-stakeholder.module.ts
@@ -1,10 +1,10 @@
 import {NgModule} from "@angular/core";
 import {EditStakeholderComponent} from "./edit-stakeholder.component";
 import {CommonModule} from "@angular/common";
-import {InputModule} from "../../openaireLibrary/sharedComponents/input/input.module";
+import {InputModule} from "../../../sharedComponents/input/input.module";
 import {ReactiveFormsModule} from "@angular/forms";
-import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module";
-import {NotifyFormModule} from "../../openaireLibrary/notifications/notify-form/notify-form.module";
+import {IconsModule} from "../../../utils/icons/icons.module";
+import {NotifyFormModule} from "../../../notifications/notify-form/notify-form.module";
 
 @NgModule({
   imports: [CommonModule, InputModule, ReactiveFormsModule, IconsModule, NotifyFormModule],
diff --git a/monitor-admin/general/general-routing.module.ts b/monitor-admin/general/general-routing.module.ts
index 0dec7485..e0486667 100644
--- a/monitor-admin/general/general-routing.module.ts
+++ b/monitor-admin/general/general-routing.module.ts
@@ -1,6 +1,6 @@
 import {NgModule} from '@angular/core';
 import {RouterModule} from '@angular/router';
-import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
+import {PreviousRouteRecorder} from '../../utils/piwik/previousRouteRecorder.guard';
 import {GeneralComponent} from "./general.component";
 
 @NgModule({
diff --git a/monitor-admin/general/general.component.ts b/monitor-admin/general/general.component.ts
index 03045f06..611032b4 100644
--- a/monitor-admin/general/general.component.ts
+++ b/monitor-admin/general/general.component.ts
@@ -1,10 +1,10 @@
 import {ChangeDetectorRef, Component, OnDestroy, OnInit, ViewChild} from "@angular/core";
-import {StakeholderService} from "../openaireLibrary/monitor/services/stakeholder.service";
-import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
-import {Stakeholder} from "../openaireLibrary/monitor/entities/stakeholder";
+import {StakeholderService} from "../../monitor/services/stakeholder.service";
+import {EnvProperties} from "../../utils/properties/env-properties";
+import {Stakeholder} from "../../monitor/entities/stakeholder";
 import { Subscription, zip} from "rxjs";
 import {EditStakeholderComponent} from "./edit-stakeholder/edit-stakeholder.component";
-import {properties} from "../../environments/environment";
+import {properties} from "src/environments/environment";
 import {Title} from "@angular/platform-browser";
 
 @Component({
diff --git a/monitor-admin/general/general.module.ts b/monitor-admin/general/general.module.ts
index 054c309f..7f4e7064 100644
--- a/monitor-admin/general/general.module.ts
+++ b/monitor-admin/general/general.module.ts
@@ -1,19 +1,19 @@
 import {NgModule} from "@angular/core";
 import {GeneralComponent} from "./general.component";
 import {GeneralRoutingModule} from "./general-routing.module";
-import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
+import {PreviousRouteRecorder} from "../../utils/piwik/previousRouteRecorder.guard";
 import {CommonModule} from "@angular/common";
 import {RouterModule} from "@angular/router";
-import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module";
-import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
-import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
+import {InputModule} from "../../sharedComponents/input/input.module";
+import {LoadingModule} from "../../utils/loading/loading.module";
+import {AlertModalModule} from "../../utils/modal/alertModal.module";
 import {ReactiveFormsModule} from "@angular/forms";
 import {EditStakeholderModule} from "./edit-stakeholder/edit-stakeholder.module";
-import {PageContentModule} from "../openaireLibrary/dashboard/sharedComponents/page-content/page-content.module";
-import {LogoUrlPipeModule} from "../openaireLibrary/utils/pipes/logoUrlPipe.module";
+import {PageContentModule} from "../../dashboard/sharedComponents/page-content/page-content.module";
+import {LogoUrlPipeModule} from "../../utils/pipes/logoUrlPipe.module";
 import {
   SidebarMobileToggleModule
-} from "../openaireLibrary/dashboard/sharedComponents/sidebar/sidebar-mobile-toggle/sidebar-mobile-toggle.module";
+} from "../../dashboard/sharedComponents/sidebar/sidebar-mobile-toggle/sidebar-mobile-toggle.module";
 
 @NgModule({
   declarations: [GeneralComponent],