diff --git a/client/ayon_core/modules/clockify/__init__.py b/server_addon/clockify/client/ayon_clockify/__init__.py
similarity index 100%
rename from client/ayon_core/modules/clockify/__init__.py
rename to server_addon/clockify/client/ayon_clockify/__init__.py
diff --git a/client/ayon_core/modules/clockify/clockify_api.py b/server_addon/clockify/client/ayon_clockify/clockify_api.py
similarity index 100%
rename from client/ayon_core/modules/clockify/clockify_api.py
rename to server_addon/clockify/client/ayon_clockify/clockify_api.py
diff --git a/client/ayon_core/modules/clockify/clockify_module.py b/server_addon/clockify/client/ayon_clockify/clockify_module.py
similarity index 100%
rename from client/ayon_core/modules/clockify/clockify_module.py
rename to server_addon/clockify/client/ayon_clockify/clockify_module.py
diff --git a/client/ayon_core/modules/clockify/constants.py b/server_addon/clockify/client/ayon_clockify/constants.py
similarity index 100%
rename from client/ayon_core/modules/clockify/constants.py
rename to server_addon/clockify/client/ayon_clockify/constants.py
diff --git a/client/ayon_core/modules/clockify/ftrack/server/action_clockify_sync_server.py b/server_addon/clockify/client/ayon_clockify/ftrack/server/action_clockify_sync_server.py
similarity index 100%
rename from client/ayon_core/modules/clockify/ftrack/server/action_clockify_sync_server.py
rename to server_addon/clockify/client/ayon_clockify/ftrack/server/action_clockify_sync_server.py
diff --git a/client/ayon_core/modules/clockify/ftrack/user/action_clockify_sync_local.py b/server_addon/clockify/client/ayon_clockify/ftrack/user/action_clockify_sync_local.py
similarity index 100%
rename from client/ayon_core/modules/clockify/ftrack/user/action_clockify_sync_local.py
rename to server_addon/clockify/client/ayon_clockify/ftrack/user/action_clockify_sync_local.py
diff --git a/client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py b/server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifyStart.py
similarity index 100%
rename from client/ayon_core/modules/clockify/launcher_actions/ClockifyStart.py
rename to server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifyStart.py
diff --git a/client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py b/server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifySync.py
similarity index 100%
rename from client/ayon_core/modules/clockify/launcher_actions/ClockifySync.py
rename to server_addon/clockify/client/ayon_clockify/launcher_actions/ClockifySync.py
diff --git a/client/ayon_core/modules/clockify/widgets.py b/server_addon/clockify/client/ayon_clockify/widgets.py
similarity index 100%
rename from client/ayon_core/modules/clockify/widgets.py
rename to server_addon/clockify/client/ayon_clockify/widgets.py