diff --git a/scripts/actinia-server b/scripts/actinia-server
index 75751a73b..1320a1775 100755
--- a/scripts/actinia-server
+++ b/scripts/actinia-server
@@ -33,10 +33,10 @@ import os
 from actinia_core.endpoints import create_endpoints
 from actinia_core.health_check import health_check
 from actinia_core.version import version
-from actinia_core.core.app import flask_app
-from actinia_core.core.config import global_config, DEFAULT_CONFIG_PATH
-from actinia_core.core.redis_interface import connect
-from actinia_core.core.process_queue import create_process_queue
+from actinia_core.core.common.app import flask_app
+from actinia_core.core.common.config import global_config, DEFAULT_CONFIG_PATH
+from actinia_core.core.common.redis_interface import connect
+from actinia_core.core.common.process_queue import create_process_queue
 
 __license__    = "GPLv3"
 __author__     = "Sören Gebbert"
diff --git a/scripts/actinia-user b/scripts/actinia-user
index fa7571ff5..ae37e5e86 100755
--- a/scripts/actinia-user
+++ b/scripts/actinia-user
@@ -27,9 +27,9 @@ Purpose: Command line program to manage actinia user
          entries in the Redis database
 """
 
-from actinia_core.core.user import ActiniaUser
+from actinia_core.core.common.user import ActiniaUser
 from actinia_core.core.redis_user import redis_user_interface
-from actinia_core.core.config import Configuration
+from actinia_core.core.common.config import Configuration
 import argparse
 import pprint
 import sys
diff --git a/scripts/rq_custom_worker b/scripts/rq_custom_worker
index 68cad5214..d7c1a5ca9 100755
--- a/scripts/rq_custom_worker
+++ b/scripts/rq_custom_worker
@@ -40,7 +40,7 @@ from os.path import dirname
 # https://github.com/fluent/fluent-logger-python
 import logging
 import logging.handlers
-from actinia_core.core.config import Configuration
+from actinia_core.core.common.config import Configuration
 import os
 import argparse
 import platform
diff --git a/scripts/rq_starter b/scripts/rq_starter
index 26551fd05..b5352ea04 100755
--- a/scripts/rq_starter
+++ b/scripts/rq_starter
@@ -32,7 +32,7 @@ import subprocess
 import atexit
 import time
 import argparse
-from actinia_core.core.config import Configuration
+from actinia_core.core.common.config import Configuration
 
 __license__    = "GPLv3"
 __author__     = "Sören Gebbert"