diff --git a/server/enrichment.py b/server/analysis/enrichment.py
similarity index 100%
rename from server/enrichment.py
rename to server/analysis/enrichment.py
diff --git a/server/stat_gen.py b/server/analysis/stat_gen.py
similarity index 100%
rename from server/stat_gen.py
rename to server/analysis/stat_gen.py
diff --git a/server/app.py b/server/core/app.py
similarity index 98%
rename from server/app.py
rename to server/core/app.py
index a5aab98..be48607 100644
--- a/server/app.py
+++ b/server/core/app.py
@@ -14,12 +14,12 @@ from flask_jwt_extended import (
     get_jwt_identity,
 )
 
-from server.stat_gen import StatGen
-from server.enrichment import DatasetEnrichment
+from server.analysis.stat_gen import StatGen
+from server.analysis.enrichment import DatasetEnrichment
 from server.exceptions import NotAuthorisedException, NotExistentDatasetException
 from server.db.database import PostgresConnector
-from server.auth import AuthManager
-from server.datasets import DatasetManager
+from server.core.auth import AuthManager
+from server.core.datasets import DatasetManager
 from server.utils import get_request_filters
 
 app = Flask(__name__)
diff --git a/server/auth.py b/server/core/auth.py
similarity index 100%
rename from server/auth.py
rename to server/core/auth.py
diff --git a/server/datasets.py b/server/core/datasets.py
similarity index 100%
rename from server/datasets.py
rename to server/core/datasets.py