diff --git a/api/RoadmapAPIServer.py b/api/RoadmapAPIServer.py
index c27fabc44210c58a59cd0dd2b73f4fffff46fe43..8d3da52e8eaf98c24cc910fe1478eefe1b85f4e4 100644
--- a/api/RoadmapAPIServer.py
+++ b/api/RoadmapAPIServer.py
@@ -10,10 +10,10 @@ from flask_jwt_extended import (
     JWTManager, create_access_token
 )
 
-import Constants
-from Database import Database
-from RequestValidator import RequestValidator, ValidationError
-from UserService import UserService
+from logic import Constants
+from logic.Database import Database
+from logic.RequestValidator import RequestValidator, ValidationError
+from logic.UserService import UserService
 from blueprints import SubTaskAPI, MilestoneAPI, TaskAPI, RoadmapAPI
 
 LOGGER = DefaultLogger().create_logger_if_not_exists(Constants.APP_NAME)
diff --git a/api/blueprints/MilestoneAPI.py b/api/blueprints/MilestoneAPI.py
index 5cbf5c75d05a41193054fdfd5620be2f10f00980..e22ad8dad9fb236669e778fc4b43371bd7590b1b 100644
--- a/api/blueprints/MilestoneAPI.py
+++ b/api/blueprints/MilestoneAPI.py
@@ -3,8 +3,8 @@ from enum import Enum
 from flask import Blueprint, jsonify, request
 from flask_jwt_extended import jwt_required
 
-from DateFormatter import DateFormatter
-from RequestValidator import RequestValidator, ValidationError
+from logic.DateFormatter import DateFormatter
+from logic.RequestValidator import RequestValidator, ValidationError
 from blueprints.SubTaskAPI import SubTaskParameters
 from blueprints.TaskAPI import TaskParameters
 
diff --git a/api/blueprints/RoadmapAPI.py b/api/blueprints/RoadmapAPI.py
index 9700411fec007a2dfa5ba95f713f5077b8443c15..c803acc7e50fbd46abd2eeb6b2e13248d877f200 100644
--- a/api/blueprints/RoadmapAPI.py
+++ b/api/blueprints/RoadmapAPI.py
@@ -1,11 +1,10 @@
-from datetime import datetime, date
 from enum import Enum
 
 from flask import Blueprint, jsonify, request
 from flask_jwt_extended import jwt_required
 
-from DateFormatter import DateFormatter
-from RequestValidator import RequestValidator, ValidationError
+from logic.DateFormatter import DateFormatter
+from logic.RequestValidator import RequestValidator, ValidationError
 
 
 class RoadmapParameters(Enum):
diff --git a/api/blueprints/SubTaskAPI.py b/api/blueprints/SubTaskAPI.py
index 895170ef2a8820f9ee771478d85889e099341ee0..094f1c7eefa4b4e1497a6b5a4dc24820a7a1bb17 100644
--- a/api/blueprints/SubTaskAPI.py
+++ b/api/blueprints/SubTaskAPI.py
@@ -3,7 +3,7 @@ from enum import Enum
 from flask import Blueprint, jsonify, request
 from flask_jwt_extended import jwt_required
 
-from RequestValidator import RequestValidator, ValidationError
+from logic.RequestValidator import RequestValidator, ValidationError
 
 
 class SubTaskParameters(Enum):
diff --git a/api/blueprints/TaskAPI.py b/api/blueprints/TaskAPI.py
index 49cf0913e273599fdcfa4b0ee5cd72791ec8ad1e..3bd552f8a1ec3269b8f7ed446d0849d7f7f2ef53 100644
--- a/api/blueprints/TaskAPI.py
+++ b/api/blueprints/TaskAPI.py
@@ -3,7 +3,7 @@ from enum import Enum
 from flask import Blueprint, jsonify, request
 from flask_jwt_extended import jwt_required
 
-from RequestValidator import RequestValidator, ValidationError
+from logic.RequestValidator import RequestValidator, ValidationError
 
 
 class TaskParameters(Enum):
diff --git a/api/Constants.py b/api/logic/Constants.py
similarity index 100%
rename from api/Constants.py
rename to api/logic/Constants.py
diff --git a/api/Database.py b/api/logic/Database.py
similarity index 100%
rename from api/Database.py
rename to api/logic/Database.py
diff --git a/api/DateFormatter.py b/api/logic/DateFormatter.py
similarity index 100%
rename from api/DateFormatter.py
rename to api/logic/DateFormatter.py
diff --git a/api/RequestValidator.py b/api/logic/RequestValidator.py
similarity index 100%
rename from api/RequestValidator.py
rename to api/logic/RequestValidator.py
diff --git a/api/UserService.py b/api/logic/UserService.py
similarity index 100%
rename from api/UserService.py
rename to api/logic/UserService.py
diff --git a/api/logic/__init__.py b/api/logic/__init__.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/client/RoadmapClient.py b/client/RoadmapClient.py
index 71a3672b426d2c83a1309fcd70437707f56cbb1e..9c982ad00401be99df912ba6d965ea9fe913498a 100644
--- a/client/RoadmapClient.py
+++ b/client/RoadmapClient.py
@@ -7,7 +7,7 @@ from TheCodeLabs_BaseUtils import DefaultLogger
 from TheCodeLabs_FlaskUtils import FlaskBaseApp
 from flask import render_template, redirect
 
-import Constants
+from logic import Constants
 from Localization import LOCALIZATION
 from UrlBuilder import UrlBuilder
 from blueprints import Roadmaps, Authentication, Milestones, Tasks, SubTasks