diff --git a/src/actinia_statistic_plugin/ephemeral_raster_area_stats.py b/src/actinia_statistic_plugin/ephemeral_raster_area_stats.py
index 710e12a..249af58 100644
--- a/src/actinia_statistic_plugin/ephemeral_raster_area_stats.py
+++ b/src/actinia_statistic_plugin/ephemeral_raster_area_stats.py
@@ -4,18 +4,18 @@
 """
 
 from flask import jsonify, make_response
-from actinia_core.resources.ephemeral_processing import EphemeralProcessing
-from actinia_core.resources.resource_base import ResourceBase
-from actinia_core.resources.common.redis_interface import enqueue_job
+from actinia_core.rest.ephemeral_processing import EphemeralProcessing
+from actinia_core.rest.resource_base import ResourceBase
+from actinia_core.core.common.redis_interface import enqueue_job
 from flask.json import dumps
 import pickle
 import tempfile
 from copy import deepcopy
 from flask_restful_swagger_2 import swagger
-from actinia_core.resources.common.app import auth
-from actinia_core.resources.common.api_logger import log_api_call
+from actinia_core.core.common.app import auth
+from actinia_core.core.common.api_logger import log_api_call
 from .response_models import CategoricalStatisticsResultModel, RasterAreaStatsResponseModel
-from actinia_core.resources.common.response_models import ProcessingErrorResponseModel
+from actinia_core.models.response_models import ProcessingErrorResponseModel
 
 __license__ = "GPLv3"
 __author__     = "Sören Gebbert"
diff --git a/src/actinia_statistic_plugin/ephemeral_raster_area_stats_univar.py b/src/actinia_statistic_plugin/ephemeral_raster_area_stats_univar.py
index dc25eca..754e8be 100644
--- a/src/actinia_statistic_plugin/ephemeral_raster_area_stats_univar.py
+++ b/src/actinia_statistic_plugin/ephemeral_raster_area_stats_univar.py
@@ -8,14 +8,14 @@
 import tempfile
 from copy import deepcopy
 from flask import jsonify, make_response
-from actinia_core.resources.ephemeral_processing import EphemeralProcessing
-from actinia_core.resources.resource_base import ResourceBase
-from actinia_core.resources.common.redis_interface import enqueue_job
+from actinia_core.rest.ephemeral_processing import EphemeralProcessing
+from actinia_core.rest.resource_base import ResourceBase
+from actinia_core.core.common.redis_interface import enqueue_job
 from flask_restful_swagger_2 import swagger
-from actinia_core.resources.common.app import auth
-from actinia_core.resources.common.api_logger import log_api_call
+from actinia_core.core.common.app import auth
+from actinia_core.core.common.api_logger import log_api_call
 from .response_models import AreaUnivarResultModel, RasterAreaUnivarStatsResponseModel
-from actinia_core.resources.common.response_models import ProcessingErrorResponseModel
+from actinia_core.models.response_models import ProcessingErrorResponseModel
 
 __license__ = "GPLv3"
 __author__     = "Sören Gebbert"
diff --git a/src/actinia_statistic_plugin/ephemeral_strds_area_stats.py b/src/actinia_statistic_plugin/ephemeral_strds_area_stats.py
index 085cc82..ffda13f 100644
--- a/src/actinia_statistic_plugin/ephemeral_strds_area_stats.py
+++ b/src/actinia_statistic_plugin/ephemeral_strds_area_stats.py
@@ -9,15 +9,15 @@
 from copy import deepcopy
 from flask import jsonify, make_response
 from flask.json import dumps
-from actinia_core.resources.ephemeral_processing import EphemeralProcessing
-from actinia_core.resources.resource_base import ResourceBase
-from actinia_core.resources.common.redis_interface import enqueue_job
-from actinia_core.resources.common.exceptions import AsyncProcessError
+from actinia_core.rest.ephemeral_processing import EphemeralProcessing
+from actinia_core.rest.resource_base import ResourceBase
+from actinia_core.core.common.redis_interface import enqueue_job
+from actinia_core.core.common.exceptions import AsyncProcessError
 from flask_restful_swagger_2 import swagger
-from actinia_core.resources.common.app import auth
-from actinia_core.resources.common.api_logger import log_api_call
+from actinia_core.core.common.app import auth
+from actinia_core.core.common.api_logger import log_api_call
 from .response_models import CategoricalStatisticsResultModel, RasterAreaStatsResponseModel
-from actinia_core.resources.common.response_models import ProcessingErrorResponseModel
+from actinia_core.models.response_models import ProcessingErrorResponseModel
 
 
 __license__ = "GPLv3"
diff --git a/src/actinia_statistic_plugin/ephemeral_strds_area_stats_univar.py b/src/actinia_statistic_plugin/ephemeral_strds_area_stats_univar.py
index 9283d2e..7ef619d 100644
--- a/src/actinia_statistic_plugin/ephemeral_strds_area_stats_univar.py
+++ b/src/actinia_statistic_plugin/ephemeral_strds_area_stats_univar.py
@@ -9,15 +9,15 @@
 from flask import jsonify, make_response
 from copy import deepcopy
 from flask.json import dumps
-from actinia_core.resources.ephemeral_processing import EphemeralProcessing
-from actinia_core.resources.resource_base import ResourceBase
-from actinia_core.resources.common.redis_interface import enqueue_job
-from actinia_core.resources.common.exceptions import AsyncProcessError
+from actinia_core.rest.ephemeral_processing import EphemeralProcessing
+from actinia_core.rest.resource_base import ResourceBase
+from actinia_core.core.common.redis_interface import enqueue_job
+from actinia_core.core.common.exceptions import AsyncProcessError
 from flask_restful_swagger_2 import swagger
-from actinia_core.resources.common.app import auth
-from actinia_core.resources.common.api_logger import log_api_call
+from actinia_core.core.common.app import auth
+from actinia_core.core.common.api_logger import log_api_call
 from .response_models import AreaUnivarResultModel, RasterAreaUnivarStatsResponseModel
-from actinia_core.resources.common.response_models import ProcessingErrorResponseModel
+from actinia_core.models.response_models import ProcessingErrorResponseModel
 
 
 __license__ = "GPLv3"
diff --git a/src/actinia_statistic_plugin/response_models.py b/src/actinia_statistic_plugin/response_models.py
index ee9040d..778233a 100644
--- a/src/actinia_statistic_plugin/response_models.py
+++ b/src/actinia_statistic_plugin/response_models.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from flask_restful_swagger_2 import Schema
 from copy import deepcopy
-from actinia_core.resources.common.response_models import ProcessingResponseModel
+from actinia_core.models.response_models import ProcessingResponseModel
 
 __license__ = "GPLv3"
 __author__ = "Sören Gebbert"
diff --git a/src/actinia_statistic_plugin/strds_sampling.py b/src/actinia_statistic_plugin/strds_sampling.py
index 129202c..e2757f3 100644
--- a/src/actinia_statistic_plugin/strds_sampling.py
+++ b/src/actinia_statistic_plugin/strds_sampling.py
@@ -8,11 +8,11 @@
 from flask import jsonify, make_response
 from copy import deepcopy
 from flask_restful_swagger_2 import swagger, Schema
-from actinia_core.resources.common.response_models import ProcessingResponseModel, ProcessingErrorResponseModel
-from actinia_core.resources.ephemeral_processing import EphemeralProcessing
-from actinia_core.resources.resource_base import ResourceBase
-from actinia_core.resources.common.redis_interface import enqueue_job
-from actinia_core.resources.common.exceptions import AsyncProcessError
+from actinia_core.models.response_models import ProcessingResponseModel, ProcessingErrorResponseModel
+from actinia_core.rest.ephemeral_processing import EphemeralProcessing
+from actinia_core.rest.resource_base import ResourceBase
+from actinia_core.core.common.redis_interface import enqueue_job
+from actinia_core.core.common.exceptions import AsyncProcessError
 
 __license__ = "GPLv3"
 __author__ = "Sören Gebbert"
diff --git a/src/actinia_statistic_plugin/strds_sampling_geojson.py b/src/actinia_statistic_plugin/strds_sampling_geojson.py
index 65369b7..bf047ad 100644
--- a/src/actinia_statistic_plugin/strds_sampling_geojson.py
+++ b/src/actinia_statistic_plugin/strds_sampling_geojson.py
@@ -9,10 +9,10 @@
 from flask.json import dumps as json_dumps
 from copy import deepcopy
 from flask_restful_swagger_2 import swagger
-from actinia_core.resources.common.response_models import ProcessingResponseModel, ProcessingErrorResponseModel
-from actinia_core.resources.ephemeral_processing import EphemeralProcessing
-from actinia_core.resources.resource_base import ResourceBase
-from actinia_core.resources.common.redis_interface import enqueue_job
+from actinia_core.models.response_models import ProcessingResponseModel, ProcessingErrorResponseModel
+from actinia_core.rest.ephemeral_processing import EphemeralProcessing
+from actinia_core.rest.resource_base import ResourceBase
+from actinia_core.core.common.redis_interface import enqueue_job
 
 __license__ = "GPLv3"
 __author__ = "Sören Gebbert"
diff --git a/tests/test_resource_base.py b/tests/test_resource_base.py
index 7cbe6c4..775402a 100644
--- a/tests/test_resource_base.py
+++ b/tests/test_resource_base.py
@@ -5,8 +5,8 @@
 import time
 from flask_restful import Api
 from actinia_core.testsuite import ActiniaTestCaseBase, URL_PREFIX
-from actinia_core.resources.common.config import global_config
-from actinia_core.resources.common.app import flask_app, flask_api
+from actinia_core.core.common.config import global_config
+from actinia_core.core.common.app import flask_app, flask_api
 from actinia_statistic_plugin.endpoints import create_endpoints
 from actinia_core.endpoints import create_endpoints as create_actinia_endpoints