diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 4b11f330e..697c6d70a 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -5,7 +5,8 @@ import { NavigationEnd, Router } from '@angular/router';
 
 import { AuthOptions } from '@igo2/auth';
 import { AuthFormComponent } from '@igo2/auth/form';
-import { SpinnerComponent, StopPropagationDirective } from '@igo2/common';
+import { SpinnerComponent } from '@igo2/common/spinner';
+import { StopPropagationDirective } from '@igo2/common/stop-propagation';
 import { ConfigService } from '@igo2/core/config';
 import { LanguageService } from '@igo2/core/language';
 import { MessageService } from '@igo2/core/message';
diff --git a/src/app/pages/portal/expansion-panel/expansion-panel.component.ts b/src/app/pages/portal/expansion-panel/expansion-panel.component.ts
index 502879d1b..d9eeb1fbd 100644
--- a/src/app/pages/portal/expansion-panel/expansion-panel.component.ts
+++ b/src/app/pages/portal/expansion-panel/expansion-panel.component.ts
@@ -7,7 +7,7 @@ import {
   Output
 } from '@angular/core';
 
-import { BackdropComponent } from '@igo2/common';
+import { BackdropComponent } from '@igo2/common/backdrop';
 
 import { ExpansionPanelHeaderComponent } from './expansion-panel-header.component';
 import { showContent } from './expansion-panel.animations';
diff --git a/src/app/pages/portal/portal.component.ts b/src/app/pages/portal/portal.component.ts
index 172e50cd7..cc9b45c79 100644
--- a/src/app/pages/portal/portal.component.ts
+++ b/src/app/pages/portal/portal.component.ts
@@ -25,24 +25,31 @@ import { AuthService } from '@igo2/auth';
 import {
   ActionStore,
   ActionbarComponent,
-  ActionbarMode,
-  BackdropComponent,
+  ActionbarMode
+} from '@igo2/common/action';
+import { BackdropComponent } from '@igo2/common/backdrop';
+import {
   ContextMenuDirective,
+  LongPressDirective
+} from '@igo2/common/context-menu';
+import {
   ENTITY_DIRECTIVES,
   EntityRecord,
   EntityStore,
-  EntityTablePaginatorOptions,
+  EntityTablePaginatorOptions
+} from '@igo2/common/entity';
+import {
   IconSvg,
   IgoIconComponent,
-  LongPressDirective,
-  MAGNIFY_SCAN_ICON,
-  Tool,
-  Toolbox,
+  MAGNIFY_SCAN_ICON
+} from '@igo2/common/icon';
+import { Tool, Toolbox } from '@igo2/common/tool';
+import { Widget } from '@igo2/common/widget';
+import {
   WORKSPACE_DIRECTIVES,
-  Widget,
   Workspace,
   WorkspaceStore
-} from '@igo2/common';
+} from '@igo2/common/workspace';
 import {
   DetailedContext,
   LayerContextDirective,
diff --git a/src/app/pages/portal/sidenav/sidenav.component.ts b/src/app/pages/portal/sidenav/sidenav.component.ts
index f74ee9be7..582bde995 100644
--- a/src/app/pages/portal/sidenav/sidenav.component.ts
+++ b/src/app/pages/portal/sidenav/sidenav.component.ts
@@ -13,14 +13,10 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatSidenavModule } from '@angular/material/sidenav';
 import { MatTooltipModule } from '@angular/material/tooltip';
 
-import {
-  HomeButtonComponent,
-  IgoInteractiveTourModule,
-  PanelComponent,
-  Tool,
-  Toolbox,
-  ToolboxComponent
-} from '@igo2/common';
+import { HomeButtonComponent } from '@igo2/common/home-button';
+import { IgoInteractiveTourModule } from '@igo2/common/interactive-tour';
+import { PanelComponent } from '@igo2/common/panel';
+import { Tool, Toolbox, ToolboxComponent } from '@igo2/common/tool';
 import { ConfigService } from '@igo2/core/config';
 import { IgoMap } from '@igo2/geo';
 import { CatalogState, ToolState } from '@igo2/integration';
diff --git a/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts b/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts
index ffac7ff56..30a91425f 100644
--- a/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts
+++ b/src/app/pages/portal/toast-panel-for-expansion/toast-panel-for-expansion.component.ts
@@ -7,7 +7,7 @@ import {
   Output
 } from '@angular/core';
 
-import { PanelComponent } from '@igo2/common';
+import { PanelComponent } from '@igo2/common/panel';
 
 import { showContent } from './toast-panel-for-expansion.animations';
 
diff --git a/src/app/pages/portal/toast-panel/toast-panel.component.ts b/src/app/pages/portal/toast-panel/toast-panel.component.ts
index 8ad2d7e87..50ac77b33 100644
--- a/src/app/pages/portal/toast-panel/toast-panel.component.ts
+++ b/src/app/pages/portal/toast-panel/toast-panel.component.ts
@@ -19,12 +19,11 @@ import {
   Action,
   ActionStore,
   ActionbarComponent,
-  ActionbarMode,
-  EntityStore,
-  PanelComponent,
-  StopPropagationDirective,
-  getEntityTitle
-} from '@igo2/common';
+  ActionbarMode
+} from '@igo2/common/action';
+import { EntityStore, getEntityTitle } from '@igo2/common/entity';
+import { PanelComponent } from '@igo2/common/panel';
+import { StopPropagationDirective } from '@igo2/common/stop-propagation';
 import { ConfigService } from '@igo2/core/config';
 import { LanguageService } from '@igo2/core/language';
 import { Media, MediaService } from '@igo2/core/media';
diff --git a/src/app/pages/portal/welcome-window/welcome-window.component.ts b/src/app/pages/portal/welcome-window/welcome-window.component.ts
index c4680105f..71257d3b2 100644
--- a/src/app/pages/portal/welcome-window/welcome-window.component.ts
+++ b/src/app/pages/portal/welcome-window/welcome-window.component.ts
@@ -9,7 +9,8 @@ import {
 } from '@angular/material/dialog';
 import { MatToolbarModule } from '@angular/material/toolbar';
 
-import { CustomHtmlComponent, IgoInteractiveTourModule } from '@igo2/common';
+import { CustomHtmlComponent } from '@igo2/common/custom-html';
+import { IgoInteractiveTourModule } from '@igo2/common/interactive-tour';
 import { ConfigService } from '@igo2/core/config';
 import { LanguageService } from '@igo2/core/language';
 
diff --git a/src/app/services/pwa.service.ts b/src/app/services/pwa.service.ts
index 3a3814149..b43052191 100644
--- a/src/app/services/pwa.service.ts
+++ b/src/app/services/pwa.service.ts
@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { SwUpdate } from '@angular/service-worker';
 
-import { ConfirmDialogService } from '@igo2/common';
+import { ConfirmDialogService } from '@igo2/common/confirm-dialog';
 import { LanguageService } from '@igo2/core/language';
 
 import { interval } from 'rxjs';
diff --git a/src/main.ts b/src/main.ts
index f44a752f2..8e53d67ad 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -18,7 +18,7 @@ import { ServiceWorkerModule } from '@angular/service-worker';
 
 import { provideAuthentification } from '@igo2/auth';
 import { withMicrosoftSupport } from '@igo2/auth/microsoft';
-import { provideIcon } from '@igo2/common';
+import { provideIcon } from '@igo2/common/icon';
 import { IgoCoreModule } from '@igo2/core';
 import { ConfigService, provideConfig } from '@igo2/core/config';
 import { provideTranslation } from '@igo2/core/language';