diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index fe1f718..5588a1c 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -11,27 +11,16 @@ import { NotFoundComponent } from './not-found/not-found.component'
 
 import { SasStoreService } from './services/sas-store.service'
 import { SharedModule } from './shared/shared.module'
-// import { EditorComponent } from './editor/editor.component'
+
 import { AppSharedModule } from './app-shared.module'
-import { DeployComponent } from './deploy/deploy.component'
-import { AutomaticComponent } from './deploy/sections/automatic/automatic.component'
-import { ManualComponent } from './deploy/sections/manual/manual.component'
-import { SasjsConfiguratorComponent } from './deploy/sections/sasjs-configurator/sasjs-configurator.component'
-import { GroupComponent } from './group/group.component'
-import { LicensingComponent } from './licensing/licensing.component'
-import { LineageComponent } from './lineage/lineage.component'
-import { MetadataComponent } from './metadata/metadata.component'
 import { PipesModule } from './pipes/pipes.module'
-import { RoleComponent } from './role/role.component'
 import { ReviewRouteComponent } from './routes/review-route/review-route.component'
 import { LicensingGuard } from './routes/licensing.guard'
 import { UsernavRouteComponent } from './routes/usernav-route/usernav-route.component'
 import { AppService } from './services/app.service'
 import { InfoModalComponent } from './shared/abort-modal/info-modal.component'
 import { RequestsModalComponent } from './shared/requests-modal/requests-modal.component'
-import { UserComponent } from './user/user.component'
 import { HomeModule } from './home/home.module'
-import { SystemComponent } from './system/system.component'
 import { DirectivesModule } from './directives/directives.module'
 import { ViyaApiExplorerComponent } from './viya-api-explorer/viya-api-explorer.component'
 import { NgxJsonViewerModule } from 'ngx-json-viewer'
@@ -40,22 +29,11 @@ import { NgxJsonViewerModule } from 'ngx-json-viewer'
   declarations: [
     AppComponent,
     NotFoundComponent,
-    LineageComponent,
     ReviewRouteComponent,
     ReviewRouteComponent,
-    MetadataComponent,
     UsernavRouteComponent,
-    UserComponent,
-    GroupComponent,
-    RoleComponent,
     RequestsModalComponent,
-    DeployComponent,
     InfoModalComponent,
-    LicensingComponent,
-    ManualComponent,
-    AutomaticComponent,
-    SasjsConfiguratorComponent,
-    SystemComponent,
     ViyaApiExplorerComponent
   ],
   imports: [
diff --git a/client/src/app/app.routing.ts b/client/src/app/app.routing.ts
index 03b6a20..01b2ca8 100644
--- a/client/src/app/app.routing.ts
+++ b/client/src/app/app.routing.ts
@@ -10,14 +10,13 @@ import { HomeComponent } from './home/home.component'
 import { NotFoundComponent } from './not-found/not-found.component'
 
 import { ReviewRouteComponent } from './routes/review-route/review-route.component'
-import { DeployComponent } from './deploy/deploy.component'
-import { LicensingComponent } from './licensing/licensing.component'
-import { LicensingGuard } from './routes/licensing.guard'
 import { StageModule } from './stage/stage.module'
 import { EditorModule } from './editor/editor.module'
 import { ViewerModule } from './viewer/viewer.module'
-import { SystemComponent } from './system/system.component'
 import { ReviewModule } from './review/review.module'
+import { DeployModule } from './deploy/deploy.module'
+import { LicensingModule } from './licensing/licensing.module'
+import { SystemModule } from './system/system.module'
 
 export const ROUTES: Routes = [
   { path: '', redirectTo: 'home', pathMatch: 'full' },
@@ -37,10 +36,8 @@ export const ROUTES: Routes = [
     ]
   },
   {
-    path: 'licensing/:action',
-    component: LicensingComponent,
-    canActivate: [LicensingGuard],
-    canDeactivate: [LicensingGuard]
+    path: 'licensing',
+    loadChildren: () => LicensingModule
   },
   { path: 'home', component: HomeComponent },
   {
@@ -51,9 +48,14 @@ export const ROUTES: Routes = [
     path: 'stage',
     loadChildren: () => StageModule
   },
-  { path: 'system', component: SystemComponent },
-  { path: 'deploy', component: DeployComponent },
-  { path: 'deploy/manualdeploy', component: DeployComponent },
+  {
+    path: 'system',
+    loadChildren: () => SystemModule
+  },
+  {
+    path: 'deploy',
+    loadChildren: () => DeployModule
+  },
   { path: '**', component: NotFoundComponent }
 ]
 
diff --git a/client/src/app/deploy/deploy-routing.module.ts b/client/src/app/deploy/deploy-routing.module.ts
new file mode 100644
index 0000000..a121af5
--- /dev/null
+++ b/client/src/app/deploy/deploy-routing.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { DeployComponent } from './deploy.component';
+
+const routes: Routes = [
+  { path: '', component: DeployComponent },
+  { path: 'manualdeploy', component: DeployComponent },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class DeployRoutingModule { }
diff --git a/client/src/app/deploy/deploy.module.ts b/client/src/app/deploy/deploy.module.ts
new file mode 100644
index 0000000..660104b
--- /dev/null
+++ b/client/src/app/deploy/deploy.module.ts
@@ -0,0 +1,25 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { DeployComponent } from './deploy.component';
+import { AutomaticComponent } from './sections/automatic/automatic.component';
+import { ManualComponent } from './sections/manual/manual.component';
+import { SasjsConfiguratorComponent } from './sections/sasjs-configurator/sasjs-configurator.component';
+import { ClarityModule } from '@clr/angular';
+import { FormsModule } from '@angular/forms';
+import { DeployRoutingModule } from './deploy-routing.module';
+
+@NgModule({
+  declarations: [
+    DeployComponent,
+    AutomaticComponent,
+    ManualComponent,
+    SasjsConfiguratorComponent
+  ],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ClarityModule,
+    DeployRoutingModule
+  ]
+})
+export class DeployModule { }
diff --git a/client/src/app/licensing/licensing-routing.module.ts b/client/src/app/licensing/licensing-routing.module.ts
new file mode 100644
index 0000000..74ad352
--- /dev/null
+++ b/client/src/app/licensing/licensing-routing.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { LicensingGuard } from '../routes/licensing.guard';
+import { LicensingComponent } from './licensing.component';
+
+const routes: Routes = [
+  {
+    path: ':action',
+    component: LicensingComponent,
+    canActivate: [LicensingGuard],
+    canDeactivate: [LicensingGuard]
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class LicensingRoutingModule { }
diff --git a/client/src/app/licensing/licensing.module.ts b/client/src/app/licensing/licensing.module.ts
new file mode 100644
index 0000000..869d165
--- /dev/null
+++ b/client/src/app/licensing/licensing.module.ts
@@ -0,0 +1,22 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { LicensingRoutingModule } from './licensing-routing.module';
+import { ClarityModule } from '@clr/angular';
+import { SharedModule } from '../shared/shared.module';
+import { LicensingComponent } from './licensing.component';
+import { FormsModule } from '@angular/forms';
+
+@NgModule({
+  declarations: [
+    LicensingComponent
+  ],
+  imports: [
+    CommonModule,
+    FormsModule,
+    ClarityModule,
+    LicensingRoutingModule,
+    SharedModule
+  ]
+})
+export class LicensingModule { }
diff --git a/client/src/app/system/system-routing.module.ts b/client/src/app/system/system-routing.module.ts
new file mode 100644
index 0000000..ec2b924
--- /dev/null
+++ b/client/src/app/system/system-routing.module.ts
@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { SystemComponent } from './system.component';
+
+const routes: Routes = [
+  { path: '', component: SystemComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class SystemRoutingModule { }
diff --git a/client/src/app/system/system.module.ts b/client/src/app/system/system.module.ts
new file mode 100644
index 0000000..93893d8
--- /dev/null
+++ b/client/src/app/system/system.module.ts
@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { SystemRoutingModule } from './system-routing.module';
+import { SystemComponent } from './system.component';
+import { ClarityModule } from '@clr/angular';
+
+
+@NgModule({
+  declarations: [
+    SystemComponent
+  ],
+  imports: [
+    CommonModule,
+    SystemRoutingModule,
+    ClarityModule
+  ]
+})
+export class SystemModule { }
diff --git a/client/src/app/viewer/viewer.module.ts b/client/src/app/viewer/viewer.module.ts
index 5a578c9..ecc8f0d 100644
--- a/client/src/app/viewer/viewer.module.ts
+++ b/client/src/app/viewer/viewer.module.ts
@@ -13,9 +13,22 @@ import { SharedModule } from '../shared/shared.module'
 import { ViewboxesModule } from '../shared/viewboxes/viewboxes.module'
 import { QueryModule } from '../query/query.module'
 import { DirectivesModule } from '../directives/directives.module'
+import { UserComponent } from '../user/user.component'
+import { RoleComponent } from '../role/role.component'
+import { GroupComponent } from '../group/group.component'
+import { LineageComponent } from '../lineage/lineage.component'
+import { MetadataComponent } from '../metadata/metadata.component'
 
 @NgModule({
-  declarations: [ViewerComponent, ViewRouteComponent],
+  declarations: [
+    ViewerComponent,
+    ViewRouteComponent,
+    UserComponent,
+    RoleComponent,
+    GroupComponent,
+    LineageComponent,
+    MetadataComponent
+  ],
   imports: [
     ViewboxesModule,
     CommonModule,
diff --git a/sas/sasjs/sasjsconfig.json b/sas/sasjs/sasjsconfig.json
index b5ca395..244babb 100644
--- a/sas/sasjs/sasjsconfig.json
+++ b/sas/sasjs/sasjsconfig.json
@@ -283,7 +283,7 @@
         "rejectUnauthorized": false,
         "allowInsecureRequests": true
       },
-      "appLoc": "/Public/app/mihajlo",
+      "appLoc": "/Public/app/dc2",
       "deployConfig": {
         "deployServicePack": true,
         "deployScripts": []