diff --git a/src/cpl_cli/cli_settings.py b/src/cpl_cli/cli_settings.py
index 9a1f3c45..2adb1228 100644
--- a/src/cpl_cli/cli_settings.py
+++ b/src/cpl_cli/cli_settings.py
@@ -2,7 +2,7 @@ import traceback
 from typing import Optional
 
 from cpl.configuration.configuration_model_abc import ConfigurationModelABC
-from cpl.console import Console
+from cpl.console.console import Console
 from cpl_cli.cli_settings_name_enum import CLISettingsNameEnum
 
 
diff --git a/src/cpl_cli/command/install_service.py b/src/cpl_cli/command/install_service.py
index de041024..0799b5bc 100644
--- a/src/cpl_cli/command/install_service.py
+++ b/src/cpl_cli/command/install_service.py
@@ -4,7 +4,7 @@ import subprocess
 
 from packaging import version
 
-from cpl.application import ApplicationRuntimeABC
+from cpl.application.application_runtime_abc import ApplicationRuntimeABC
 from cpl.configuration import ConfigurationABC
 from cpl.console.console import Console
 from cpl.console.foreground_color_enum import ForegroundColorEnum
diff --git a/src/cpl_cli/command/uninstall_service.py b/src/cpl_cli/command/uninstall_service.py
index 865bf87b..875a1fb3 100644
--- a/src/cpl_cli/command/uninstall_service.py
+++ b/src/cpl_cli/command/uninstall_service.py
@@ -2,7 +2,7 @@ import json
 import os
 import subprocess
 
-from cpl.application import ApplicationRuntimeABC
+from cpl.application.application_runtime_abc import ApplicationRuntimeABC
 from cpl.console.console import Console
 from cpl.console.foreground_color_enum import ForegroundColorEnum
 from cpl.utils.pip import Pip
diff --git a/src/cpl_cli/command/update_service.py b/src/cpl_cli/command/update_service.py
index 8a804864..799eac0f 100644
--- a/src/cpl_cli/command/update_service.py
+++ b/src/cpl_cli/command/update_service.py
@@ -2,9 +2,9 @@ import json
 import os
 import subprocess
 
-from cpl.application import ApplicationRuntimeABC
-from cpl.console import ForegroundColorEnum
+from cpl.application.application_runtime_abc import ApplicationRuntimeABC
 from cpl.console.console import Console
+from cpl.console.foreground_color_enum import ForegroundColorEnum
 from cpl.utils.pip import Pip
 from cpl_cli.cli_settings import CLISettings
 from cpl_cli.command_abc import CommandABC
diff --git a/src/cpl_cli/error.py b/src/cpl_cli/error.py
index a6c74060..e4bd7225 100644
--- a/src/cpl_cli/error.py
+++ b/src/cpl_cli/error.py
@@ -1,4 +1,4 @@
-from cpl.console import ForegroundColorEnum
+from cpl.console.foreground_color_enum import ForegroundColorEnum
 from cpl.console.console import Console
 
 
diff --git a/src/cpl_cli/live_server/live_server_service.py b/src/cpl_cli/live_server/live_server_service.py
index 336ae5e2..fc0ddcce 100644
--- a/src/cpl_cli/live_server/live_server_service.py
+++ b/src/cpl_cli/live_server/live_server_service.py
@@ -6,10 +6,10 @@ import psutil as psutil
 from watchdog.events import FileSystemEventHandler
 from watchdog.observers import Observer
 
-from cpl.application import ApplicationRuntimeABC
+from cpl.application.application_runtime_abc import ApplicationRuntimeABC
 from cpl.console.console import Console
-from cpl.dependency_injection import ServiceABC
-from cpl_cli.configuration import BuildSettings
+from cpl.dependency_injection.service_abc import ServiceABC
+from cpl_cli.configuration.build_settings import BuildSettings
 from cpl_cli.live_server.live_server_thread import LiveServerThread