diff --git a/V2/serverless.yml b/V2/serverless.yml
index 0d085c36..0eb3f42f 100644
--- a/V2/serverless.yml
+++ b/V2/serverless.yml
@@ -38,7 +38,7 @@ package:
 
 functions:
   get_activities:
-    handler: time_entries/interface.get_activities
+    handler: time_tracker/activities/interface.get_activities
     events:
       - http: true
         x-azure-settings:
@@ -48,7 +48,7 @@ functions:
           authLevel: anonymous
 
   delete_activity:
-    handler: time_entries/interface.delete_activity
+    handler: time_tracker/activities/interface.delete_activity
     events:
       - http: true
         x-azure-settings:
@@ -58,7 +58,7 @@ functions:
           authLevel: anonymous
 
   update_activity:
-    handler: time_entries/interface.update_activity
+    handler: time_tracker/activities/interface.update_activity
     events:
       - http: true
         x-azure-settings:
@@ -68,7 +68,7 @@ functions:
           authLevel: anonymous    
 
   create_activity:
-    handler: time_entries/interface.create_activity
+    handler: time_tracker/activities/interface.create_activity
     events:
       - http: true
         x-azure-settings:
diff --git a/V2/tests/api/azure/activity_azure_endpoints_test.py b/V2/tests/api/azure/activity_azure_endpoints_test.py
index de52712e..e3bf4ffe 100644
--- a/V2/tests/api/azure/activity_azure_endpoints_test.py
+++ b/V2/tests/api/azure/activity_azure_endpoints_test.py
@@ -1,4 +1,4 @@
-from time_entries._application import _activities as activities
+from time_tracker.activities._application import _activities as activities
 from faker import Faker
 
 import azure.functions as func
diff --git a/V2/tests/integration/daos/activities_json_dao_test.py b/V2/tests/integration/daos/activities_json_dao_test.py
index d5d3a180..8eff9609 100644
--- a/V2/tests/integration/daos/activities_json_dao_test.py
+++ b/V2/tests/integration/daos/activities_json_dao_test.py
@@ -1,5 +1,5 @@
-from time_entries._infrastructure import ActivitiesJsonDao
-from time_entries._domain import Activity
+from time_tracker.activities._infrastructure import ActivitiesJsonDao
+from time_tracker.activities._domain import Activity
 from faker import Faker
 import json
 import pytest
diff --git a/V2/tests/unit/services/activity_service_test.py b/V2/tests/unit/services/activity_service_test.py
index 9fbed763..befdb1fb 100644
--- a/V2/tests/unit/services/activity_service_test.py
+++ b/V2/tests/unit/services/activity_service_test.py
@@ -1,4 +1,4 @@
-from time_entries._domain import ActivityService
+from time_tracker.activities._domain import ActivityService
 from faker import Faker
 
 
diff --git a/V2/tests/unit/use_cases/activities_use_case_test.py b/V2/tests/unit/use_cases/activities_use_case_test.py
index 3a8d1301..334c7489 100644
--- a/V2/tests/unit/use_cases/activities_use_case_test.py
+++ b/V2/tests/unit/use_cases/activities_use_case_test.py
@@ -1,4 +1,4 @@
-from time_entries._domain import _use_cases
+from time_tracker.activities._domain import _use_cases
 from pytest_mock import MockFixture
 from faker import Faker
 
diff --git a/V2/time_entries/_application/__init__.py b/V2/time_tracker/activities/_application/__init__.py
similarity index 100%
rename from V2/time_entries/_application/__init__.py
rename to V2/time_tracker/activities/_application/__init__.py
diff --git a/V2/time_entries/_application/_activities/__init__.py b/V2/time_tracker/activities/_application/_activities/__init__.py
similarity index 100%
rename from V2/time_entries/_application/_activities/__init__.py
rename to V2/time_tracker/activities/_application/_activities/__init__.py
diff --git a/V2/time_entries/_application/_activities/_create_activity.py b/V2/time_tracker/activities/_application/_activities/_create_activity.py
similarity index 95%
rename from V2/time_entries/_application/_activities/_create_activity.py
rename to V2/time_tracker/activities/_application/_activities/_create_activity.py
index 2a2a622c..be53815a 100644
--- a/V2/time_entries/_application/_activities/_create_activity.py
+++ b/V2/time_tracker/activities/_application/_activities/_create_activity.py
@@ -8,7 +8,7 @@
 from ... import _infrastructure
 
 _JSON_PATH = (
-    'time_entries/_infrastructure/_data_persistence/activities_data.json'
+    'activities/_infrastructure/_data_persistence/activities_data.json'
 )
 
 
diff --git a/V2/time_entries/_application/_activities/_delete_activity.py b/V2/time_tracker/activities/_application/_activities/_delete_activity.py
similarity index 80%
rename from V2/time_entries/_application/_activities/_delete_activity.py
rename to V2/time_tracker/activities/_application/_activities/_delete_activity.py
index 896c8a92..80d55446 100644
--- a/V2/time_entries/_application/_activities/_delete_activity.py
+++ b/V2/time_tracker/activities/_application/_activities/_delete_activity.py
@@ -1,12 +1,12 @@
-from time_entries._infrastructure import ActivitiesJsonDao
-from time_entries._domain import ActivityService, _use_cases
+from time_tracker.activities._infrastructure import ActivitiesJsonDao
+from time_tracker.activities._domain import ActivityService, _use_cases
 
 import azure.functions as func
 import json
 import logging
 
 JSON_PATH = (
-    'time_entries/_infrastructure/_data_persistence/activities_data.json'
+    'activities/_infrastructure/_data_persistence/activities_data.json'
 )
 
 
diff --git a/V2/time_entries/_application/_activities/_get_activities.py b/V2/time_tracker/activities/_application/_activities/_get_activities.py
similarity index 83%
rename from V2/time_entries/_application/_activities/_get_activities.py
rename to V2/time_tracker/activities/_application/_activities/_get_activities.py
index fc929e77..9f52069d 100644
--- a/V2/time_entries/_application/_activities/_get_activities.py
+++ b/V2/time_tracker/activities/_application/_activities/_get_activities.py
@@ -1,55 +1,55 @@
-from time_entries._infrastructure import ActivitiesJsonDao
-from time_entries._domain import ActivityService, _use_cases
-
-import azure.functions as func
-import json
-import logging
-
-JSON_PATH = (
-    'time_entries/_infrastructure/_data_persistence/activities_data.json'
-)
-
-
-def get_activities(req: func.HttpRequest) -> func.HttpResponse:
-    logging.info(
-        'Python HTTP trigger function processed a request to get an activity.'
-    )
-    activity_id = req.route_params.get('id')
-    status_code = 200
-
-    if activity_id:
-        response = _get_by_id(activity_id)
-        if response == b'Not Found':
-            status_code = 404
-    else:
-        response = _get_all()
-
-    return func.HttpResponse(
-        body=response, status_code=status_code, mimetype="application/json"
-    )
-
-
-def _get_by_id(activity_id: str) -> str:
-    activity_use_case = _use_cases.GetActivityUseCase(
-        _create_activity_service(JSON_PATH)
-    )
-    activity = activity_use_case.get_activity_by_id(activity_id)
-
-    return json.dumps(activity.__dict__) if activity else b'Not Found'
-
-
-def _get_all() -> str:
-    activities_use_case = _use_cases.GetActivitiesUseCase(
-        _create_activity_service(JSON_PATH)
-    )
-    return json.dumps(
-        [
-            activity.__dict__
-            for activity in activities_use_case.get_activities()
-        ]
-    )
-
-
-def _create_activity_service(path: str):
-    activity_json = ActivitiesJsonDao(path)
-    return ActivityService(activity_json)
+from time_tracker.activities._infrastructure import ActivitiesJsonDao
+from time_tracker.activities._domain import ActivityService, _use_cases
+
+import azure.functions as func
+import json
+import logging
+
+JSON_PATH = (
+    'activities/_infrastructure/_data_persistence/activities_data.json'
+)
+
+
+def get_activities(req: func.HttpRequest) -> func.HttpResponse:
+    logging.info(
+        'Python HTTP trigger function processed a request to get an activity.'
+    )
+    activity_id = req.route_params.get('id')
+    status_code = 200
+
+    if activity_id:
+        response = _get_by_id(activity_id)
+        if response == b'Not Found':
+            status_code = 404
+    else:
+        response = _get_all()
+
+    return func.HttpResponse(
+        body=response, status_code=status_code, mimetype="application/json"
+    )
+
+
+def _get_by_id(activity_id: str) -> str:
+    activity_use_case = _use_cases.GetActivityUseCase(
+        _create_activity_service(JSON_PATH)
+    )
+    activity = activity_use_case.get_activity_by_id(activity_id)
+
+    return json.dumps(activity.__dict__) if activity else b'Not Found'
+
+
+def _get_all() -> str:
+    activities_use_case = _use_cases.GetActivitiesUseCase(
+        _create_activity_service(JSON_PATH)
+    )
+    return json.dumps(
+        [
+            activity.__dict__
+            for activity in activities_use_case.get_activities()
+        ]
+    )
+
+
+def _create_activity_service(path: str):
+    activity_json = ActivitiesJsonDao(path)
+    return ActivityService(activity_json)
diff --git a/V2/time_entries/_application/_activities/_update_activity.py b/V2/time_tracker/activities/_application/_activities/_update_activity.py
similarity index 84%
rename from V2/time_entries/_application/_activities/_update_activity.py
rename to V2/time_tracker/activities/_application/_activities/_update_activity.py
index 2aff2881..1709f77a 100644
--- a/V2/time_entries/_application/_activities/_update_activity.py
+++ b/V2/time_tracker/activities/_application/_activities/_update_activity.py
@@ -1,5 +1,5 @@
-from time_entries._infrastructure import ActivitiesJsonDao
-from time_entries._domain import ActivityService, Activity, _use_cases
+from time_tracker.activities._infrastructure import ActivitiesJsonDao
+from time_tracker.activities._domain import ActivityService, Activity, _use_cases
 
 import azure.functions as func
 import dataclasses
@@ -7,7 +7,7 @@
 import logging
 
 JSON_PATH = (
-    'time_entries/_infrastructure/_data_persistence/activities_data.json'
+    'activities/_infrastructure/_data_persistence/activities_data.json'
 )
 
 
diff --git a/V2/time_entries/_domain/__init__.py b/V2/time_tracker/activities/_domain/__init__.py
similarity index 100%
rename from V2/time_entries/_domain/__init__.py
rename to V2/time_tracker/activities/_domain/__init__.py
diff --git a/V2/time_entries/_domain/_entities/__init__.py b/V2/time_tracker/activities/_domain/_entities/__init__.py
similarity index 100%
rename from V2/time_entries/_domain/_entities/__init__.py
rename to V2/time_tracker/activities/_domain/_entities/__init__.py
diff --git a/V2/time_entries/_domain/_entities/_activity.py b/V2/time_tracker/activities/_domain/_entities/_activity.py
similarity index 100%
rename from V2/time_entries/_domain/_entities/_activity.py
rename to V2/time_tracker/activities/_domain/_entities/_activity.py
diff --git a/V2/time_entries/_domain/_persistence_contracts/__init__.py b/V2/time_tracker/activities/_domain/_persistence_contracts/__init__.py
similarity index 100%
rename from V2/time_entries/_domain/_persistence_contracts/__init__.py
rename to V2/time_tracker/activities/_domain/_persistence_contracts/__init__.py
diff --git a/V2/time_entries/_domain/_persistence_contracts/_activities_dao.py b/V2/time_tracker/activities/_domain/_persistence_contracts/_activities_dao.py
similarity index 90%
rename from V2/time_entries/_domain/_persistence_contracts/_activities_dao.py
rename to V2/time_tracker/activities/_domain/_persistence_contracts/_activities_dao.py
index f7e7bac3..80b8c711 100644
--- a/V2/time_entries/_domain/_persistence_contracts/_activities_dao.py
+++ b/V2/time_tracker/activities/_domain/_persistence_contracts/_activities_dao.py
@@ -1,4 +1,4 @@
-from time_entries._domain import Activity
+from time_tracker.activities._domain import Activity
 import abc
 import typing
 
diff --git a/V2/time_entries/_domain/_services/__init__.py b/V2/time_tracker/activities/_domain/_services/__init__.py
similarity index 100%
rename from V2/time_entries/_domain/_services/__init__.py
rename to V2/time_tracker/activities/_domain/_services/__init__.py
diff --git a/V2/time_entries/_domain/_services/_activity.py b/V2/time_tracker/activities/_domain/_services/_activity.py
similarity index 91%
rename from V2/time_entries/_domain/_services/_activity.py
rename to V2/time_tracker/activities/_domain/_services/_activity.py
index 8d29a7ab..a564577a 100644
--- a/V2/time_entries/_domain/_services/_activity.py
+++ b/V2/time_tracker/activities/_domain/_services/_activity.py
@@ -1,4 +1,4 @@
-from time_entries._domain import ActivitiesDao, Activity
+from time_tracker.activities._domain import ActivitiesDao, Activity
 import typing
 
 
diff --git a/V2/time_entries/_domain/_use_cases/__init__.py b/V2/time_tracker/activities/_domain/_use_cases/__init__.py
similarity index 100%
rename from V2/time_entries/_domain/_use_cases/__init__.py
rename to V2/time_tracker/activities/_domain/_use_cases/__init__.py
diff --git a/V2/time_entries/_domain/_use_cases/_create_activity_use_case.py b/V2/time_tracker/activities/_domain/_use_cases/_create_activity_use_case.py
similarity index 79%
rename from V2/time_entries/_domain/_use_cases/_create_activity_use_case.py
rename to V2/time_tracker/activities/_domain/_use_cases/_create_activity_use_case.py
index fbd13aac..241718db 100644
--- a/V2/time_entries/_domain/_use_cases/_create_activity_use_case.py
+++ b/V2/time_tracker/activities/_domain/_use_cases/_create_activity_use_case.py
@@ -1,4 +1,4 @@
-from time_entries._domain import ActivityService, Activity
+from time_tracker.activities._domain import ActivityService, Activity
 
 
 class CreateActivityUseCase:
diff --git a/V2/time_entries/_domain/_use_cases/_delete_activity_use_case.py b/V2/time_tracker/activities/_domain/_use_cases/_delete_activity_use_case.py
similarity index 77%
rename from V2/time_entries/_domain/_use_cases/_delete_activity_use_case.py
rename to V2/time_tracker/activities/_domain/_use_cases/_delete_activity_use_case.py
index e13acaa5..5af54ee8 100644
--- a/V2/time_entries/_domain/_use_cases/_delete_activity_use_case.py
+++ b/V2/time_tracker/activities/_domain/_use_cases/_delete_activity_use_case.py
@@ -1,4 +1,4 @@
-from time_entries._domain import ActivityService, Activity
+from time_tracker.activities._domain import ActivityService, Activity
 
 
 class DeleteActivityUseCase:
diff --git a/V2/time_entries/_domain/_use_cases/_get_activities_use_case.py b/V2/time_tracker/activities/_domain/_use_cases/_get_activities_use_case.py
similarity index 78%
rename from V2/time_entries/_domain/_use_cases/_get_activities_use_case.py
rename to V2/time_tracker/activities/_domain/_use_cases/_get_activities_use_case.py
index 1262ff14..0e42dd32 100644
--- a/V2/time_entries/_domain/_use_cases/_get_activities_use_case.py
+++ b/V2/time_tracker/activities/_domain/_use_cases/_get_activities_use_case.py
@@ -1,4 +1,4 @@
-from time_entries._domain import ActivityService, Activity
+from time_tracker.activities._domain import ActivityService, Activity
 import typing
 
 
diff --git a/V2/time_entries/_domain/_use_cases/_get_activity_by_id_use_case.py b/V2/time_tracker/activities/_domain/_use_cases/_get_activity_by_id_use_case.py
similarity index 77%
rename from V2/time_entries/_domain/_use_cases/_get_activity_by_id_use_case.py
rename to V2/time_tracker/activities/_domain/_use_cases/_get_activity_by_id_use_case.py
index 65ce104f..04ca442e 100644
--- a/V2/time_entries/_domain/_use_cases/_get_activity_by_id_use_case.py
+++ b/V2/time_tracker/activities/_domain/_use_cases/_get_activity_by_id_use_case.py
@@ -1,4 +1,4 @@
-from time_entries._domain import ActivityService, Activity
+from time_tracker.activities._domain import ActivityService, Activity
 
 
 class GetActivityUseCase:
diff --git a/V2/time_entries/_domain/_use_cases/_update_activity_use_case.py b/V2/time_tracker/activities/_domain/_use_cases/_update_activity_use_case.py
similarity index 81%
rename from V2/time_entries/_domain/_use_cases/_update_activity_use_case.py
rename to V2/time_tracker/activities/_domain/_use_cases/_update_activity_use_case.py
index ea0bc3c5..a890d85f 100644
--- a/V2/time_entries/_domain/_use_cases/_update_activity_use_case.py
+++ b/V2/time_tracker/activities/_domain/_use_cases/_update_activity_use_case.py
@@ -1,4 +1,4 @@
-from time_entries._domain import ActivityService, Activity
+from time_tracker.activities._domain import ActivityService, Activity
 
 
 class UpdateActivityUseCase:
diff --git a/V2/time_entries/_infrastructure/__init__.py b/V2/time_tracker/activities/_infrastructure/__init__.py
similarity index 100%
rename from V2/time_entries/_infrastructure/__init__.py
rename to V2/time_tracker/activities/_infrastructure/__init__.py
diff --git a/V2/time_entries/_infrastructure/_data_persistence/__init__.py b/V2/time_tracker/activities/_infrastructure/_data_persistence/__init__.py
similarity index 100%
rename from V2/time_entries/_infrastructure/_data_persistence/__init__.py
rename to V2/time_tracker/activities/_infrastructure/_data_persistence/__init__.py
diff --git a/V2/time_entries/_infrastructure/_data_persistence/_activities_json_dao.py b/V2/time_tracker/activities/_infrastructure/_data_persistence/_activities_json_dao.py
similarity index 97%
rename from V2/time_entries/_infrastructure/_data_persistence/_activities_json_dao.py
rename to V2/time_tracker/activities/_infrastructure/_data_persistence/_activities_json_dao.py
index 54418c45..60859a15 100644
--- a/V2/time_entries/_infrastructure/_data_persistence/_activities_json_dao.py
+++ b/V2/time_tracker/activities/_infrastructure/_data_persistence/_activities_json_dao.py
@@ -1,4 +1,4 @@
-from time_entries._domain import ActivitiesDao, Activity
+from time_tracker.activities._domain import ActivitiesDao, Activity
 import dataclasses
 import json
 import typing
diff --git a/V2/time_entries/_infrastructure/_data_persistence/activities_data.json b/V2/time_tracker/activities/_infrastructure/_data_persistence/activities_data.json
similarity index 100%
rename from V2/time_entries/_infrastructure/_data_persistence/activities_data.json
rename to V2/time_tracker/activities/_infrastructure/_data_persistence/activities_data.json
diff --git a/V2/time_entries/interface.py b/V2/time_tracker/activities/interface.py
similarity index 100%
rename from V2/time_entries/interface.py
rename to V2/time_tracker/activities/interface.py