diff --git a/landingPages/dataProvider/dataProvider-routing.module.ts b/landingPages/dataProvider/dataProvider-routing.module.ts
new file mode 100644
index 00000000..fb878479
--- /dev/null
+++ b/landingPages/dataProvider/dataProvider-routing.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { PreviousRouteRecorder } from "../../utils/piwik/previousRouteRecorder.guard";
+import { DataProviderComponent } from "./dataProvider.component";
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([{ path: '', component: DataProviderComponent, canDeactivate: [PreviousRouteRecorder] }])
+  ]
+})
+export class DataProviderRoutingModule { }
diff --git a/landingPages/dataProvider/dataProvider.module.ts b/landingPages/dataProvider/dataProvider.module.ts
index 6cbdf9b4..c6716f47 100644
--- a/landingPages/dataProvider/dataProvider.module.ts
+++ b/landingPages/dataProvider/dataProvider.module.ts
@@ -36,10 +36,12 @@ import {ResultLandingUtilsModule} from "../landing-utils/resultLandingUtils.modu
 import {FullScreenModalModule} from '../../utils/modal/full-screen-modal/full-screen-modal.module';
 import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
 import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
+import {DataProviderRoutingModule} from "./dataProvider-routing.module";
 
 @NgModule({
   imports:
     [CommonModule, FormsModule, RouterModule,
+      DataProviderRoutingModule,
       IFrameModule, ErrorMessagesModule, LandingModule,
       DataProvidersServiceModule, ProjectsServiceModule, SearchResearchResultsServiceModule,
       PagingModule, Schema2jsonldModule, SEOServiceModule, ShowPublisherModule, HelperModule,
diff --git a/landingPages/organization/organization-routing.module.ts b/landingPages/organization/organization-routing.module.ts
new file mode 100644
index 00000000..4e48b2b8
--- /dev/null
+++ b/landingPages/organization/organization-routing.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { PreviousRouteRecorder } from "../../utils/piwik/previousRouteRecorder.guard";
+import { OrganizationComponent } from "./organization.component";
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([{ path: '', component: OrganizationComponent, canDeactivate: [PreviousRouteRecorder] }])
+  ]
+})
+export class OrganizationRoutingModule { }
diff --git a/landingPages/organization/organization.module.ts b/landingPages/organization/organization.module.ts
index 9a4a2737..0c29500c 100644
--- a/landingPages/organization/organization.module.ts
+++ b/landingPages/organization/organization.module.ts
@@ -33,11 +33,13 @@ import {graph, versions} from "../../utils/icons/icons";
 import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-screen-modal.module";
 import {EGIDataTransferModule} from "../../utils/dataTransfer/transferData.module";
 import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
+import {OrganizationRoutingModule} from "./organization-routing.module";
 
 
 @NgModule({
   imports: [
     CommonModule, FormsModule, RouterModule,
+    OrganizationRoutingModule,
     LoadingModalModule, AlertModalModule, ErrorMessagesModule,
     LandingModule,
     DataProvidersServiceModule,
diff --git a/landingPages/project/project-routing.module.ts b/landingPages/project/project-routing.module.ts
new file mode 100644
index 00000000..3cec4ec2
--- /dev/null
+++ b/landingPages/project/project-routing.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { PreviousRouteRecorder } from "../../utils/piwik/previousRouteRecorder.guard";
+import { ProjectComponent } from "./project.component";
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([{ path: '', component: ProjectComponent, canDeactivate: [PreviousRouteRecorder] }])
+  ]
+})
+export class ProjectRoutingModule { }
diff --git a/landingPages/project/project.module.ts b/landingPages/project/project.module.ts
index 713c9f1f..30a3a8e9 100644
--- a/landingPages/project/project.module.ts
+++ b/landingPages/project/project.module.ts
@@ -32,10 +32,12 @@ import {FullScreenModalModule} from '../../utils/modal/full-screen-modal/full-sc
 import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
 import {EGIDataTransferModule} from "../../utils/dataTransfer/transferData.module";
 import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
+import {ProjectRoutingModule} from "./project-routing.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule, RouterModule, LandingModule,
+    ProjectRoutingModule,
     LoadingModalModule, AlertModalModule, ErrorMessagesModule,
     IFrameModule, ReportsServiceModule,
     SearchResearchResultsServiceModule, ProjectServiceModule,
diff --git a/landingPages/result/resultLanding-routing.module.ts b/landingPages/result/resultLanding-routing.module.ts
new file mode 100644
index 00000000..51aac48d
--- /dev/null
+++ b/landingPages/result/resultLanding-routing.module.ts
@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { PreviousRouteRecorder } from "../../utils/piwik/previousRouteRecorder.guard";
+import { ResultLandingComponent } from "./resultLanding.component";
+
+
+@NgModule({
+ imports: [
+   RouterModule.forChild([{ path: '', component: ResultLandingComponent, canDeactivate: [PreviousRouteRecorder] }])
+ ]
+})
+export class ResultLandingRoutingModule { }
diff --git a/landingPages/result/resultLanding.module.ts b/landingPages/result/resultLanding.module.ts
index 247c8a99..8554f354 100644
--- a/landingPages/result/resultLanding.module.ts
+++ b/landingPages/result/resultLanding.module.ts
@@ -37,10 +37,12 @@ import {SdgFosSuggestModule} from '../landing-utils/sdg-fos-suggest/sdg-fos-sugg
 import {FullScreenModalModule} from "../../utils/modal/full-screen-modal/full-screen-modal.module";
 import {SafeHtmlPipeModule} from '../../utils/pipes/safeHTMLPipe.module';
 import {EntityActionsModule} from "../../utils/entity-actions/entity-actions.module";
+import {ResultLandingRoutingModule} from "./resultLanding-routing.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule, LandingModule, SharedModule, RouterModule,
+    ResultLandingRoutingModule,
     CiteThisModule, PagingModule, IFrameModule,
     AltMetricsModule, Schema2jsonldModule, SEOServiceModule,
     DeletedByInferenceModule, ShowAuthorsModule, HelperModule, ResultLandingUtilsModule, AlertModalModule,
diff --git a/orcid/my-orcid-links/myOrcidLinks-routing.module.ts b/orcid/my-orcid-links/myOrcidLinks-routing.module.ts
new file mode 100644
index 00000000..58cc1201
--- /dev/null
+++ b/orcid/my-orcid-links/myOrcidLinks-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import {LoginGuard} from "../../login/loginGuard.guard";
+import {PreviousRouteRecorder} from "../../utils/piwik/previousRouteRecorder.guard";
+import {MyOrcidLinksComponent} from "./myOrcidLinks.component";
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: MyOrcidLinksComponent,
+        canActivate: [LoginGuard], canDeactivate: [PreviousRouteRecorder]
+      }
+
+    ])
+  ]
+})
+export class MyOrcidLinksRoutingModule { }
diff --git a/orcid/my-orcid-links/myOrcidLinks.module.ts b/orcid/my-orcid-links/myOrcidLinks.module.ts
index 82bfb099..fad5db04 100644
--- a/orcid/my-orcid-links/myOrcidLinks.module.ts
+++ b/orcid/my-orcid-links/myOrcidLinks.module.ts
@@ -10,10 +10,12 @@ import {SearchResearchResultsServiceModule} from "../../services/searchResearchR
 import {SearchMyOrcidResultsModule} from "./searchMyOrcidResults.module";
 import {AlertModalModule} from "../../utils/modal/alertModal.module";
 import {PiwikServiceModule} from "../../utils/piwik/piwikService.module";
+import {MyOrcidLinksRoutingModule} from "./myOrcidLinks-routing.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
+    MyOrcidLinksRoutingModule,
     RouterModule, ErrorMessagesModule,
     ResultPreviewModule, SearchResearchResultsServiceModule, SearchMyOrcidResultsModule,
     AlertModalModule, PiwikServiceModule
diff --git a/orcid/orcid-routing.module.ts b/orcid/orcid-routing.module.ts
new file mode 100644
index 00000000..1d786595
--- /dev/null
+++ b/orcid/orcid-routing.module.ts
@@ -0,0 +1,16 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import {LoginGuard} from "../login/loginGuard.guard";
+import {PreviousRouteRecorder} from "../utils/piwik/previousRouteRecorder.guard";
+import {OrcidComponent} from './orcid.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: OrcidComponent,
+        canActivate: [LoginGuard],
+        canDeactivate: [PreviousRouteRecorder] }
+    ])
+  ]
+})
+export class OrcidRoutingModule { }
diff --git a/orcid/orcid.module.ts b/orcid/orcid.module.ts
index 097be324..b323ea70 100644
--- a/orcid/orcid.module.ts
+++ b/orcid/orcid.module.ts
@@ -17,10 +17,11 @@ import {IconsService} from "../utils/icons/icons.service";
 import {orcid_add, orcid_bin} from "../utils/icons/icons";
 import {FullScreenModalModule} from "../utils/modal/full-screen-modal/full-screen-modal.module";
 import {LogServiceModule} from "../utils/log/LogService.module";
+import {OrcidRoutingModule} from "./orcid-routing.module";
 
 @NgModule({
   imports: [
-    CommonModule, RouterModule, AlertModalModule, LoadingModule, ResultLandingUtilsModule,
+    CommonModule, RouterModule, OrcidRoutingModule, AlertModalModule, LoadingModule, ResultLandingUtilsModule,
     IconsModule, FullScreenModalModule, LogServiceModule
   ],
   declarations: [
diff --git a/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts b/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts
new file mode 100644
index 00000000..970f5c9a
--- /dev/null
+++ b/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts
@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import {LoginGuard} from "../../login/loginGuard.guard";
+import {PreviousRouteRecorder} from "../../utils/piwik/previousRouteRecorder.guard";
+import {SearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component";
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: SearchRecommendedResultsForOrcidComponent,
+        canActivate: [LoginGuard],
+        canDeactivate: [PreviousRouteRecorder]
+      }
+
+    ])
+  ]
+})
+export class SearchRecommendedResultsForOrcidRoutingModule { }
diff --git a/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts b/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts
index d23ade61..82172b21 100644
--- a/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts
+++ b/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts
@@ -11,12 +11,14 @@ import {SearchFormModule} from  '../../searchPages/searchUtils/searchForm.module
 import {IsRouteEnabled} from '../../error/isRouteEnabled.guard';
 import {SearchResearchResultsModule} from "../../searchPages/searchResearchResults.module";
 import {OrcidService} from "../orcid.service";
+import {SearchRecommendedResultsForOrcidRoutingModule} from "./searchRecommendedResultsForOrcid-routing.module";
 // import {BreadcrumbsModule} from "../utils/breadcrumbs/breadcrumbs.module";
 
 @NgModule({
   imports: [
     CommonModule, FormsModule,
     RouterModule,
+    SearchRecommendedResultsForOrcidRoutingModule,
     SearchFormModule, SearchResearchResultsModule,
     // , BreadcrumbsModule
   ],