diff --git a/apiserver/dora/__init__.py b/backend/__init__.py
similarity index 100%
rename from apiserver/dora/__init__.py
rename to backend/__init__.py
diff --git a/apiserver/app.py b/backend/analytics_server/app.py
similarity index 100%
rename from apiserver/app.py
rename to backend/analytics_server/app.py
diff --git a/apiserver/dora/api/__init__.py b/backend/analytics_server/dora/__init__.py
similarity index 100%
rename from apiserver/dora/api/__init__.py
rename to backend/analytics_server/dora/__init__.py
diff --git a/apiserver/dora/api/resources/__init__.py b/backend/analytics_server/dora/api/__init__.py
similarity index 100%
rename from apiserver/dora/api/resources/__init__.py
rename to backend/analytics_server/dora/api/__init__.py
diff --git a/apiserver/dora/api/deployment_analytics.py b/backend/analytics_server/dora/api/deployment_analytics.py
similarity index 100%
rename from apiserver/dora/api/deployment_analytics.py
rename to backend/analytics_server/dora/api/deployment_analytics.py
diff --git a/apiserver/dora/api/hello.py b/backend/analytics_server/dora/api/hello.py
similarity index 100%
rename from apiserver/dora/api/hello.py
rename to backend/analytics_server/dora/api/hello.py
diff --git a/apiserver/dora/api/incidents.py b/backend/analytics_server/dora/api/incidents.py
similarity index 100%
rename from apiserver/dora/api/incidents.py
rename to backend/analytics_server/dora/api/incidents.py
diff --git a/apiserver/dora/api/integrations.py b/backend/analytics_server/dora/api/integrations.py
similarity index 100%
rename from apiserver/dora/api/integrations.py
rename to backend/analytics_server/dora/api/integrations.py
diff --git a/apiserver/dora/api/pull_requests.py b/backend/analytics_server/dora/api/pull_requests.py
similarity index 100%
rename from apiserver/dora/api/pull_requests.py
rename to backend/analytics_server/dora/api/pull_requests.py
diff --git a/apiserver/dora/api/request_utils.py b/backend/analytics_server/dora/api/request_utils.py
similarity index 100%
rename from apiserver/dora/api/request_utils.py
rename to backend/analytics_server/dora/api/request_utils.py
diff --git a/apiserver/dora/exapi/__init__.py b/backend/analytics_server/dora/api/resources/__init__.py
similarity index 100%
rename from apiserver/dora/exapi/__init__.py
rename to backend/analytics_server/dora/api/resources/__init__.py
diff --git a/apiserver/dora/api/resources/code_resouces.py b/backend/analytics_server/dora/api/resources/code_resouces.py
similarity index 100%
rename from apiserver/dora/api/resources/code_resouces.py
rename to backend/analytics_server/dora/api/resources/code_resouces.py
diff --git a/apiserver/dora/api/resources/core_resources.py b/backend/analytics_server/dora/api/resources/core_resources.py
similarity index 100%
rename from apiserver/dora/api/resources/core_resources.py
rename to backend/analytics_server/dora/api/resources/core_resources.py
diff --git a/apiserver/dora/api/resources/deployment_resources.py b/backend/analytics_server/dora/api/resources/deployment_resources.py
similarity index 100%
rename from apiserver/dora/api/resources/deployment_resources.py
rename to backend/analytics_server/dora/api/resources/deployment_resources.py
diff --git a/apiserver/dora/api/resources/incident_resources.py b/backend/analytics_server/dora/api/resources/incident_resources.py
similarity index 100%
rename from apiserver/dora/api/resources/incident_resources.py
rename to backend/analytics_server/dora/api/resources/incident_resources.py
diff --git a/apiserver/dora/api/resources/settings_resource.py b/backend/analytics_server/dora/api/resources/settings_resource.py
similarity index 100%
rename from apiserver/dora/api/resources/settings_resource.py
rename to backend/analytics_server/dora/api/resources/settings_resource.py
diff --git a/apiserver/dora/api/settings.py b/backend/analytics_server/dora/api/settings.py
similarity index 100%
rename from apiserver/dora/api/settings.py
rename to backend/analytics_server/dora/api/settings.py
diff --git a/apiserver/dora/api/sync.py b/backend/analytics_server/dora/api/sync.py
similarity index 100%
rename from apiserver/dora/api/sync.py
rename to backend/analytics_server/dora/api/sync.py
diff --git a/apiserver/dora/api/teams.py b/backend/analytics_server/dora/api/teams.py
similarity index 100%
rename from apiserver/dora/api/teams.py
rename to backend/analytics_server/dora/api/teams.py
diff --git a/apiserver/dora/config/config.ini b/backend/analytics_server/dora/config/config.ini
similarity index 100%
rename from apiserver/dora/config/config.ini
rename to backend/analytics_server/dora/config/config.ini
diff --git a/apiserver/dora/exapi/models/__init__.py b/backend/analytics_server/dora/exapi/__init__.py
similarity index 100%
rename from apiserver/dora/exapi/models/__init__.py
rename to backend/analytics_server/dora/exapi/__init__.py
diff --git a/apiserver/dora/exapi/git_incidents.py b/backend/analytics_server/dora/exapi/git_incidents.py
similarity index 100%
rename from apiserver/dora/exapi/git_incidents.py
rename to backend/analytics_server/dora/exapi/git_incidents.py
diff --git a/apiserver/dora/exapi/github.py b/backend/analytics_server/dora/exapi/github.py
similarity index 100%
rename from apiserver/dora/exapi/github.py
rename to backend/analytics_server/dora/exapi/github.py
diff --git a/apiserver/dora/service/__init__.py b/backend/analytics_server/dora/exapi/models/__init__.py
similarity index 100%
rename from apiserver/dora/service/__init__.py
rename to backend/analytics_server/dora/exapi/models/__init__.py
diff --git a/apiserver/dora/exapi/models/git_incidents.py b/backend/analytics_server/dora/exapi/models/git_incidents.py
similarity index 100%
rename from apiserver/dora/exapi/models/git_incidents.py
rename to backend/analytics_server/dora/exapi/models/git_incidents.py
diff --git a/apiserver/dora/exapi/models/github.py b/backend/analytics_server/dora/exapi/models/github.py
similarity index 100%
rename from apiserver/dora/exapi/models/github.py
rename to backend/analytics_server/dora/exapi/models/github.py
diff --git a/apiserver/dora/service/deployments/models/__init__.py b/backend/analytics_server/dora/service/__init__.py
similarity index 100%
rename from apiserver/dora/service/deployments/models/__init__.py
rename to backend/analytics_server/dora/service/__init__.py
diff --git a/apiserver/dora/service/code/__init__.py b/backend/analytics_server/dora/service/code/__init__.py
similarity index 100%
rename from apiserver/dora/service/code/__init__.py
rename to backend/analytics_server/dora/service/code/__init__.py
diff --git a/apiserver/dora/service/code/integration.py b/backend/analytics_server/dora/service/code/integration.py
similarity index 100%
rename from apiserver/dora/service/code/integration.py
rename to backend/analytics_server/dora/service/code/integration.py
diff --git a/apiserver/dora/service/code/lead_time.py b/backend/analytics_server/dora/service/code/lead_time.py
similarity index 100%
rename from apiserver/dora/service/code/lead_time.py
rename to backend/analytics_server/dora/service/code/lead_time.py
diff --git a/apiserver/dora/service/code/models/lead_time.py b/backend/analytics_server/dora/service/code/models/lead_time.py
similarity index 100%
rename from apiserver/dora/service/code/models/lead_time.py
rename to backend/analytics_server/dora/service/code/models/lead_time.py
diff --git a/apiserver/dora/service/code/pr_filter.py b/backend/analytics_server/dora/service/code/pr_filter.py
similarity index 100%
rename from apiserver/dora/service/code/pr_filter.py
rename to backend/analytics_server/dora/service/code/pr_filter.py
diff --git a/apiserver/dora/service/code/sync/__init__.py b/backend/analytics_server/dora/service/code/sync/__init__.py
similarity index 100%
rename from apiserver/dora/service/code/sync/__init__.py
rename to backend/analytics_server/dora/service/code/sync/__init__.py
diff --git a/apiserver/dora/service/code/sync/etl_code_analytics.py b/backend/analytics_server/dora/service/code/sync/etl_code_analytics.py
similarity index 100%
rename from apiserver/dora/service/code/sync/etl_code_analytics.py
rename to backend/analytics_server/dora/service/code/sync/etl_code_analytics.py
diff --git a/apiserver/dora/service/code/sync/etl_code_factory.py b/backend/analytics_server/dora/service/code/sync/etl_code_factory.py
similarity index 100%
rename from apiserver/dora/service/code/sync/etl_code_factory.py
rename to backend/analytics_server/dora/service/code/sync/etl_code_factory.py
diff --git a/apiserver/dora/service/code/sync/etl_github_handler.py b/backend/analytics_server/dora/service/code/sync/etl_github_handler.py
similarity index 100%
rename from apiserver/dora/service/code/sync/etl_github_handler.py
rename to backend/analytics_server/dora/service/code/sync/etl_github_handler.py
diff --git a/apiserver/dora/service/code/sync/etl_handler.py b/backend/analytics_server/dora/service/code/sync/etl_handler.py
similarity index 100%
rename from apiserver/dora/service/code/sync/etl_handler.py
rename to backend/analytics_server/dora/service/code/sync/etl_handler.py
diff --git a/apiserver/dora/service/code/sync/etl_provider_handler.py b/backend/analytics_server/dora/service/code/sync/etl_provider_handler.py
similarity index 100%
rename from apiserver/dora/service/code/sync/etl_provider_handler.py
rename to backend/analytics_server/dora/service/code/sync/etl_provider_handler.py
diff --git a/apiserver/dora/service/code/sync/models.py b/backend/analytics_server/dora/service/code/sync/models.py
similarity index 100%
rename from apiserver/dora/service/code/sync/models.py
rename to backend/analytics_server/dora/service/code/sync/models.py
diff --git a/apiserver/dora/service/code/sync/revert_prs_github_sync.py b/backend/analytics_server/dora/service/code/sync/revert_prs_github_sync.py
similarity index 100%
rename from apiserver/dora/service/code/sync/revert_prs_github_sync.py
rename to backend/analytics_server/dora/service/code/sync/revert_prs_github_sync.py
diff --git a/apiserver/dora/service/core/teams.py b/backend/analytics_server/dora/service/core/teams.py
similarity index 100%
rename from apiserver/dora/service/core/teams.py
rename to backend/analytics_server/dora/service/core/teams.py
diff --git a/apiserver/dora/service/deployments/__init__.py b/backend/analytics_server/dora/service/deployments/__init__.py
similarity index 100%
rename from apiserver/dora/service/deployments/__init__.py
rename to backend/analytics_server/dora/service/deployments/__init__.py
diff --git a/apiserver/dora/service/deployments/analytics.py b/backend/analytics_server/dora/service/deployments/analytics.py
similarity index 100%
rename from apiserver/dora/service/deployments/analytics.py
rename to backend/analytics_server/dora/service/deployments/analytics.py
diff --git a/apiserver/dora/service/deployments/deployment_pr_mapper.py b/backend/analytics_server/dora/service/deployments/deployment_pr_mapper.py
similarity index 100%
rename from apiserver/dora/service/deployments/deployment_pr_mapper.py
rename to backend/analytics_server/dora/service/deployments/deployment_pr_mapper.py
diff --git a/apiserver/dora/service/deployments/deployment_service.py b/backend/analytics_server/dora/service/deployments/deployment_service.py
similarity index 100%
rename from apiserver/dora/service/deployments/deployment_service.py
rename to backend/analytics_server/dora/service/deployments/deployment_service.py
diff --git a/apiserver/dora/service/deployments/deployments_factory_service.py b/backend/analytics_server/dora/service/deployments/deployments_factory_service.py
similarity index 100%
rename from apiserver/dora/service/deployments/deployments_factory_service.py
rename to backend/analytics_server/dora/service/deployments/deployments_factory_service.py
diff --git a/apiserver/dora/service/deployments/factory.py b/backend/analytics_server/dora/service/deployments/factory.py
similarity index 100%
rename from apiserver/dora/service/deployments/factory.py
rename to backend/analytics_server/dora/service/deployments/factory.py
diff --git a/apiserver/dora/store/repos/__init__.py b/backend/analytics_server/dora/service/deployments/models/__init__.py
similarity index 100%
rename from apiserver/dora/store/repos/__init__.py
rename to backend/analytics_server/dora/service/deployments/models/__init__.py
diff --git a/apiserver/dora/service/deployments/models/adapter.py b/backend/analytics_server/dora/service/deployments/models/adapter.py
similarity index 100%
rename from apiserver/dora/service/deployments/models/adapter.py
rename to backend/analytics_server/dora/service/deployments/models/adapter.py
diff --git a/apiserver/dora/service/deployments/models/models.py b/backend/analytics_server/dora/service/deployments/models/models.py
similarity index 100%
rename from apiserver/dora/service/deployments/models/models.py
rename to backend/analytics_server/dora/service/deployments/models/models.py
diff --git a/apiserver/dora/service/deployments/pr_deployments_service.py b/backend/analytics_server/dora/service/deployments/pr_deployments_service.py
similarity index 100%
rename from apiserver/dora/service/deployments/pr_deployments_service.py
rename to backend/analytics_server/dora/service/deployments/pr_deployments_service.py
diff --git a/apiserver/dora/service/deployments/workflow_deployments_service.py b/backend/analytics_server/dora/service/deployments/workflow_deployments_service.py
similarity index 100%
rename from apiserver/dora/service/deployments/workflow_deployments_service.py
rename to backend/analytics_server/dora/service/deployments/workflow_deployments_service.py
diff --git a/apiserver/dora/service/external_integrations_service.py b/backend/analytics_server/dora/service/external_integrations_service.py
similarity index 100%
rename from apiserver/dora/service/external_integrations_service.py
rename to backend/analytics_server/dora/service/external_integrations_service.py
diff --git a/apiserver/dora/service/incidents/__init__.py b/backend/analytics_server/dora/service/incidents/__init__.py
similarity index 100%
rename from apiserver/dora/service/incidents/__init__.py
rename to backend/analytics_server/dora/service/incidents/__init__.py
diff --git a/apiserver/dora/service/incidents/incident_filter.py b/backend/analytics_server/dora/service/incidents/incident_filter.py
similarity index 100%
rename from apiserver/dora/service/incidents/incident_filter.py
rename to backend/analytics_server/dora/service/incidents/incident_filter.py
diff --git a/apiserver/dora/service/incidents/incidents.py b/backend/analytics_server/dora/service/incidents/incidents.py
similarity index 100%
rename from apiserver/dora/service/incidents/incidents.py
rename to backend/analytics_server/dora/service/incidents/incidents.py
diff --git a/apiserver/dora/service/incidents/integration.py b/backend/analytics_server/dora/service/incidents/integration.py
similarity index 100%
rename from apiserver/dora/service/incidents/integration.py
rename to backend/analytics_server/dora/service/incidents/integration.py
diff --git a/apiserver/dora/service/incidents/models/mean_time_to_recovery.py b/backend/analytics_server/dora/service/incidents/models/mean_time_to_recovery.py
similarity index 100%
rename from apiserver/dora/service/incidents/models/mean_time_to_recovery.py
rename to backend/analytics_server/dora/service/incidents/models/mean_time_to_recovery.py
diff --git a/apiserver/dora/service/incidents/sync/__init__.py b/backend/analytics_server/dora/service/incidents/sync/__init__.py
similarity index 100%
rename from apiserver/dora/service/incidents/sync/__init__.py
rename to backend/analytics_server/dora/service/incidents/sync/__init__.py
diff --git a/apiserver/dora/service/incidents/sync/etl_git_incidents_handler.py b/backend/analytics_server/dora/service/incidents/sync/etl_git_incidents_handler.py
similarity index 100%
rename from apiserver/dora/service/incidents/sync/etl_git_incidents_handler.py
rename to backend/analytics_server/dora/service/incidents/sync/etl_git_incidents_handler.py
diff --git a/apiserver/dora/service/incidents/sync/etl_handler.py b/backend/analytics_server/dora/service/incidents/sync/etl_handler.py
similarity index 100%
rename from apiserver/dora/service/incidents/sync/etl_handler.py
rename to backend/analytics_server/dora/service/incidents/sync/etl_handler.py
diff --git a/apiserver/dora/service/incidents/sync/etl_incidents_factory.py b/backend/analytics_server/dora/service/incidents/sync/etl_incidents_factory.py
similarity index 100%
rename from apiserver/dora/service/incidents/sync/etl_incidents_factory.py
rename to backend/analytics_server/dora/service/incidents/sync/etl_incidents_factory.py
diff --git a/apiserver/dora/service/incidents/sync/etl_provider_handler.py b/backend/analytics_server/dora/service/incidents/sync/etl_provider_handler.py
similarity index 100%
rename from apiserver/dora/service/incidents/sync/etl_provider_handler.py
rename to backend/analytics_server/dora/service/incidents/sync/etl_provider_handler.py
diff --git a/apiserver/dora/service/merge_to_deploy_broker/__init__.py b/backend/analytics_server/dora/service/merge_to_deploy_broker/__init__.py
similarity index 100%
rename from apiserver/dora/service/merge_to_deploy_broker/__init__.py
rename to backend/analytics_server/dora/service/merge_to_deploy_broker/__init__.py
diff --git a/apiserver/dora/service/merge_to_deploy_broker/mtd_handler.py b/backend/analytics_server/dora/service/merge_to_deploy_broker/mtd_handler.py
similarity index 100%
rename from apiserver/dora/service/merge_to_deploy_broker/mtd_handler.py
rename to backend/analytics_server/dora/service/merge_to_deploy_broker/mtd_handler.py
diff --git a/apiserver/dora/service/merge_to_deploy_broker/utils.py b/backend/analytics_server/dora/service/merge_to_deploy_broker/utils.py
similarity index 100%
rename from apiserver/dora/service/merge_to_deploy_broker/utils.py
rename to backend/analytics_server/dora/service/merge_to_deploy_broker/utils.py
diff --git a/apiserver/dora/service/pr_analytics.py b/backend/analytics_server/dora/service/pr_analytics.py
similarity index 100%
rename from apiserver/dora/service/pr_analytics.py
rename to backend/analytics_server/dora/service/pr_analytics.py
diff --git a/apiserver/dora/service/query_validator.py b/backend/analytics_server/dora/service/query_validator.py
similarity index 100%
rename from apiserver/dora/service/query_validator.py
rename to backend/analytics_server/dora/service/query_validator.py
diff --git a/apiserver/dora/service/settings/__init__.py b/backend/analytics_server/dora/service/settings/__init__.py
similarity index 100%
rename from apiserver/dora/service/settings/__init__.py
rename to backend/analytics_server/dora/service/settings/__init__.py
diff --git a/apiserver/dora/service/settings/configuration_settings.py b/backend/analytics_server/dora/service/settings/configuration_settings.py
similarity index 100%
rename from apiserver/dora/service/settings/configuration_settings.py
rename to backend/analytics_server/dora/service/settings/configuration_settings.py
diff --git a/apiserver/dora/service/settings/default_settings_data.py b/backend/analytics_server/dora/service/settings/default_settings_data.py
similarity index 100%
rename from apiserver/dora/service/settings/default_settings_data.py
rename to backend/analytics_server/dora/service/settings/default_settings_data.py
diff --git a/apiserver/dora/service/settings/models.py b/backend/analytics_server/dora/service/settings/models.py
similarity index 100%
rename from apiserver/dora/service/settings/models.py
rename to backend/analytics_server/dora/service/settings/models.py
diff --git a/apiserver/dora/service/settings/setting_type_validator.py b/backend/analytics_server/dora/service/settings/setting_type_validator.py
similarity index 100%
rename from apiserver/dora/service/settings/setting_type_validator.py
rename to backend/analytics_server/dora/service/settings/setting_type_validator.py
diff --git a/apiserver/dora/service/sync_data.py b/backend/analytics_server/dora/service/sync_data.py
similarity index 100%
rename from apiserver/dora/service/sync_data.py
rename to backend/analytics_server/dora/service/sync_data.py
diff --git a/apiserver/dora/service/workflows/__init__.py b/backend/analytics_server/dora/service/workflows/__init__.py
similarity index 100%
rename from apiserver/dora/service/workflows/__init__.py
rename to backend/analytics_server/dora/service/workflows/__init__.py
diff --git a/apiserver/dora/service/workflows/integration.py b/backend/analytics_server/dora/service/workflows/integration.py
similarity index 100%
rename from apiserver/dora/service/workflows/integration.py
rename to backend/analytics_server/dora/service/workflows/integration.py
diff --git a/apiserver/dora/service/workflows/sync/__init__.py b/backend/analytics_server/dora/service/workflows/sync/__init__.py
similarity index 100%
rename from apiserver/dora/service/workflows/sync/__init__.py
rename to backend/analytics_server/dora/service/workflows/sync/__init__.py
diff --git a/apiserver/dora/service/workflows/sync/etl_github_actions_handler.py b/backend/analytics_server/dora/service/workflows/sync/etl_github_actions_handler.py
similarity index 100%
rename from apiserver/dora/service/workflows/sync/etl_github_actions_handler.py
rename to backend/analytics_server/dora/service/workflows/sync/etl_github_actions_handler.py
diff --git a/apiserver/dora/service/workflows/sync/etl_handler.py b/backend/analytics_server/dora/service/workflows/sync/etl_handler.py
similarity index 100%
rename from apiserver/dora/service/workflows/sync/etl_handler.py
rename to backend/analytics_server/dora/service/workflows/sync/etl_handler.py
diff --git a/apiserver/dora/service/workflows/sync/etl_provider_handler.py b/backend/analytics_server/dora/service/workflows/sync/etl_provider_handler.py
similarity index 100%
rename from apiserver/dora/service/workflows/sync/etl_provider_handler.py
rename to backend/analytics_server/dora/service/workflows/sync/etl_provider_handler.py
diff --git a/apiserver/dora/service/workflows/sync/etl_workflows_factory.py b/backend/analytics_server/dora/service/workflows/sync/etl_workflows_factory.py
similarity index 100%
rename from apiserver/dora/service/workflows/sync/etl_workflows_factory.py
rename to backend/analytics_server/dora/service/workflows/sync/etl_workflows_factory.py
diff --git a/apiserver/dora/service/workflows/workflow_filter.py b/backend/analytics_server/dora/service/workflows/workflow_filter.py
similarity index 100%
rename from apiserver/dora/service/workflows/workflow_filter.py
rename to backend/analytics_server/dora/service/workflows/workflow_filter.py
diff --git a/apiserver/dora/store/__init__.py b/backend/analytics_server/dora/store/__init__.py
similarity index 100%
rename from apiserver/dora/store/__init__.py
rename to backend/analytics_server/dora/store/__init__.py
diff --git a/apiserver/dora/store/initialise_db.py b/backend/analytics_server/dora/store/initialise_db.py
similarity index 100%
rename from apiserver/dora/store/initialise_db.py
rename to backend/analytics_server/dora/store/initialise_db.py
diff --git a/apiserver/dora/store/models/__init__.py b/backend/analytics_server/dora/store/models/__init__.py
similarity index 100%
rename from apiserver/dora/store/models/__init__.py
rename to backend/analytics_server/dora/store/models/__init__.py
diff --git a/apiserver/dora/store/models/code/__init__.py b/backend/analytics_server/dora/store/models/code/__init__.py
similarity index 100%
rename from apiserver/dora/store/models/code/__init__.py
rename to backend/analytics_server/dora/store/models/code/__init__.py
diff --git a/apiserver/dora/store/models/code/enums.py b/backend/analytics_server/dora/store/models/code/enums.py
similarity index 100%
rename from apiserver/dora/store/models/code/enums.py
rename to backend/analytics_server/dora/store/models/code/enums.py
diff --git a/apiserver/dora/store/models/code/filter.py b/backend/analytics_server/dora/store/models/code/filter.py
similarity index 100%
rename from apiserver/dora/store/models/code/filter.py
rename to backend/analytics_server/dora/store/models/code/filter.py
diff --git a/apiserver/dora/store/models/code/pull_requests.py b/backend/analytics_server/dora/store/models/code/pull_requests.py
similarity index 100%
rename from apiserver/dora/store/models/code/pull_requests.py
rename to backend/analytics_server/dora/store/models/code/pull_requests.py
diff --git a/apiserver/dora/store/models/code/repository.py b/backend/analytics_server/dora/store/models/code/repository.py
similarity index 100%
rename from apiserver/dora/store/models/code/repository.py
rename to backend/analytics_server/dora/store/models/code/repository.py
diff --git a/apiserver/dora/store/models/code/workflows/__init__.py b/backend/analytics_server/dora/store/models/code/workflows/__init__.py
similarity index 100%
rename from apiserver/dora/store/models/code/workflows/__init__.py
rename to backend/analytics_server/dora/store/models/code/workflows/__init__.py
diff --git a/apiserver/dora/store/models/code/workflows/enums.py b/backend/analytics_server/dora/store/models/code/workflows/enums.py
similarity index 100%
rename from apiserver/dora/store/models/code/workflows/enums.py
rename to backend/analytics_server/dora/store/models/code/workflows/enums.py
diff --git a/apiserver/dora/store/models/code/workflows/filter.py b/backend/analytics_server/dora/store/models/code/workflows/filter.py
similarity index 100%
rename from apiserver/dora/store/models/code/workflows/filter.py
rename to backend/analytics_server/dora/store/models/code/workflows/filter.py
diff --git a/apiserver/dora/store/models/code/workflows/workflows.py b/backend/analytics_server/dora/store/models/code/workflows/workflows.py
similarity index 100%
rename from apiserver/dora/store/models/code/workflows/workflows.py
rename to backend/analytics_server/dora/store/models/code/workflows/workflows.py
diff --git a/apiserver/dora/store/models/core/__init__.py b/backend/analytics_server/dora/store/models/core/__init__.py
similarity index 100%
rename from apiserver/dora/store/models/core/__init__.py
rename to backend/analytics_server/dora/store/models/core/__init__.py
diff --git a/apiserver/dora/store/models/core/organization.py b/backend/analytics_server/dora/store/models/core/organization.py
similarity index 100%
rename from apiserver/dora/store/models/core/organization.py
rename to backend/analytics_server/dora/store/models/core/organization.py
diff --git a/apiserver/dora/store/models/core/teams.py b/backend/analytics_server/dora/store/models/core/teams.py
similarity index 100%
rename from apiserver/dora/store/models/core/teams.py
rename to backend/analytics_server/dora/store/models/core/teams.py
diff --git a/apiserver/dora/store/models/core/users.py b/backend/analytics_server/dora/store/models/core/users.py
similarity index 100%
rename from apiserver/dora/store/models/core/users.py
rename to backend/analytics_server/dora/store/models/core/users.py
diff --git a/apiserver/dora/store/models/incidents/__init__.py b/backend/analytics_server/dora/store/models/incidents/__init__.py
similarity index 100%
rename from apiserver/dora/store/models/incidents/__init__.py
rename to backend/analytics_server/dora/store/models/incidents/__init__.py
diff --git a/apiserver/dora/store/models/incidents/enums.py b/backend/analytics_server/dora/store/models/incidents/enums.py
similarity index 100%
rename from apiserver/dora/store/models/incidents/enums.py
rename to backend/analytics_server/dora/store/models/incidents/enums.py
diff --git a/apiserver/dora/store/models/incidents/filter.py b/backend/analytics_server/dora/store/models/incidents/filter.py
similarity index 100%
rename from apiserver/dora/store/models/incidents/filter.py
rename to backend/analytics_server/dora/store/models/incidents/filter.py
diff --git a/apiserver/dora/store/models/incidents/incidents.py b/backend/analytics_server/dora/store/models/incidents/incidents.py
similarity index 100%
rename from apiserver/dora/store/models/incidents/incidents.py
rename to backend/analytics_server/dora/store/models/incidents/incidents.py
diff --git a/apiserver/dora/store/models/incidents/services.py b/backend/analytics_server/dora/store/models/incidents/services.py
similarity index 100%
rename from apiserver/dora/store/models/incidents/services.py
rename to backend/analytics_server/dora/store/models/incidents/services.py
diff --git a/apiserver/dora/store/models/integrations/__init__.py b/backend/analytics_server/dora/store/models/integrations/__init__.py
similarity index 100%
rename from apiserver/dora/store/models/integrations/__init__.py
rename to backend/analytics_server/dora/store/models/integrations/__init__.py
diff --git a/apiserver/dora/store/models/integrations/enums.py b/backend/analytics_server/dora/store/models/integrations/enums.py
similarity index 100%
rename from apiserver/dora/store/models/integrations/enums.py
rename to backend/analytics_server/dora/store/models/integrations/enums.py
diff --git a/apiserver/dora/store/models/integrations/integrations.py b/backend/analytics_server/dora/store/models/integrations/integrations.py
similarity index 100%
rename from apiserver/dora/store/models/integrations/integrations.py
rename to backend/analytics_server/dora/store/models/integrations/integrations.py
diff --git a/apiserver/dora/store/models/settings/__init__.py b/backend/analytics_server/dora/store/models/settings/__init__.py
similarity index 100%
rename from apiserver/dora/store/models/settings/__init__.py
rename to backend/analytics_server/dora/store/models/settings/__init__.py
diff --git a/apiserver/dora/store/models/settings/configuration_settings.py b/backend/analytics_server/dora/store/models/settings/configuration_settings.py
similarity index 100%
rename from apiserver/dora/store/models/settings/configuration_settings.py
rename to backend/analytics_server/dora/store/models/settings/configuration_settings.py
diff --git a/apiserver/dora/store/models/settings/enums.py b/backend/analytics_server/dora/store/models/settings/enums.py
similarity index 100%
rename from apiserver/dora/store/models/settings/enums.py
rename to backend/analytics_server/dora/store/models/settings/enums.py
diff --git a/apiserver/dora/utils/__init__.py b/backend/analytics_server/dora/store/repos/__init__.py
similarity index 100%
rename from apiserver/dora/utils/__init__.py
rename to backend/analytics_server/dora/store/repos/__init__.py
diff --git a/apiserver/dora/store/repos/code.py b/backend/analytics_server/dora/store/repos/code.py
similarity index 100%
rename from apiserver/dora/store/repos/code.py
rename to backend/analytics_server/dora/store/repos/code.py
diff --git a/apiserver/dora/store/repos/core.py b/backend/analytics_server/dora/store/repos/core.py
similarity index 100%
rename from apiserver/dora/store/repos/core.py
rename to backend/analytics_server/dora/store/repos/core.py
diff --git a/apiserver/dora/store/repos/incidents.py b/backend/analytics_server/dora/store/repos/incidents.py
similarity index 100%
rename from apiserver/dora/store/repos/incidents.py
rename to backend/analytics_server/dora/store/repos/incidents.py
diff --git a/apiserver/dora/store/repos/integrations.py b/backend/analytics_server/dora/store/repos/integrations.py
similarity index 100%
rename from apiserver/dora/store/repos/integrations.py
rename to backend/analytics_server/dora/store/repos/integrations.py
diff --git a/apiserver/dora/store/repos/settings.py b/backend/analytics_server/dora/store/repos/settings.py
similarity index 100%
rename from apiserver/dora/store/repos/settings.py
rename to backend/analytics_server/dora/store/repos/settings.py
diff --git a/apiserver/dora/store/repos/workflows.py b/backend/analytics_server/dora/store/repos/workflows.py
similarity index 100%
rename from apiserver/dora/store/repos/workflows.py
rename to backend/analytics_server/dora/store/repos/workflows.py
diff --git a/apiserver/tests/__init__.py b/backend/analytics_server/dora/utils/__init__.py
similarity index 100%
rename from apiserver/tests/__init__.py
rename to backend/analytics_server/dora/utils/__init__.py
diff --git a/apiserver/dora/utils/cryptography.py b/backend/analytics_server/dora/utils/cryptography.py
similarity index 100%
rename from apiserver/dora/utils/cryptography.py
rename to backend/analytics_server/dora/utils/cryptography.py
diff --git a/apiserver/dora/utils/dict.py b/backend/analytics_server/dora/utils/dict.py
similarity index 100%
rename from apiserver/dora/utils/dict.py
rename to backend/analytics_server/dora/utils/dict.py
diff --git a/apiserver/dora/utils/github.py b/backend/analytics_server/dora/utils/github.py
similarity index 100%
rename from apiserver/dora/utils/github.py
rename to backend/analytics_server/dora/utils/github.py
diff --git a/apiserver/dora/utils/lock.py b/backend/analytics_server/dora/utils/lock.py
similarity index 100%
rename from apiserver/dora/utils/lock.py
rename to backend/analytics_server/dora/utils/lock.py
diff --git a/apiserver/dora/utils/log.py b/backend/analytics_server/dora/utils/log.py
similarity index 100%
rename from apiserver/dora/utils/log.py
rename to backend/analytics_server/dora/utils/log.py
diff --git a/apiserver/dora/utils/regex.py b/backend/analytics_server/dora/utils/regex.py
similarity index 100%
rename from apiserver/dora/utils/regex.py
rename to backend/analytics_server/dora/utils/regex.py
diff --git a/apiserver/dora/utils/string.py b/backend/analytics_server/dora/utils/string.py
similarity index 100%
rename from apiserver/dora/utils/string.py
rename to backend/analytics_server/dora/utils/string.py
diff --git a/apiserver/dora/utils/time.py b/backend/analytics_server/dora/utils/time.py
similarity index 100%
rename from apiserver/dora/utils/time.py
rename to backend/analytics_server/dora/utils/time.py
diff --git a/apiserver/env.py b/backend/analytics_server/env.py
similarity index 64%
rename from apiserver/env.py
rename to backend/analytics_server/env.py
index 815f0284b..f07f2a857 100644
--- a/apiserver/env.py
+++ b/backend/analytics_server/env.py
@@ -5,6 +5,6 @@
 
 def load_app_env():
     if getenv("FLASK_ENV") == "production":
-        load_dotenv(".env.prod")
+        load_dotenv("../.env.prod")
     else:
-        load_dotenv(".env.local")
+        load_dotenv("../.env.local")
diff --git a/apiserver/tests/factories/__init__.py b/backend/analytics_server/tests/__init__.py
similarity index 100%
rename from apiserver/tests/factories/__init__.py
rename to backend/analytics_server/tests/__init__.py
diff --git a/apiserver/tests/factories/models/exapi/__init__.py b/backend/analytics_server/tests/factories/__init__.py
similarity index 100%
rename from apiserver/tests/factories/models/exapi/__init__.py
rename to backend/analytics_server/tests/factories/__init__.py
diff --git a/apiserver/tests/factories/models/__init__.py b/backend/analytics_server/tests/factories/models/__init__.py
similarity index 100%
rename from apiserver/tests/factories/models/__init__.py
rename to backend/analytics_server/tests/factories/models/__init__.py
diff --git a/apiserver/tests/factories/models/code.py b/backend/analytics_server/tests/factories/models/code.py
similarity index 100%
rename from apiserver/tests/factories/models/code.py
rename to backend/analytics_server/tests/factories/models/code.py
diff --git a/apiserver/tests/service/Incidents/sync/__init__.py b/backend/analytics_server/tests/factories/models/exapi/__init__.py
similarity index 100%
rename from apiserver/tests/service/Incidents/sync/__init__.py
rename to backend/analytics_server/tests/factories/models/exapi/__init__.py
diff --git a/apiserver/tests/factories/models/exapi/github.py b/backend/analytics_server/tests/factories/models/exapi/github.py
similarity index 100%
rename from apiserver/tests/factories/models/exapi/github.py
rename to backend/analytics_server/tests/factories/models/exapi/github.py
diff --git a/apiserver/tests/factories/models/incidents.py b/backend/analytics_server/tests/factories/models/incidents.py
similarity index 100%
rename from apiserver/tests/factories/models/incidents.py
rename to backend/analytics_server/tests/factories/models/incidents.py
diff --git a/apiserver/tests/service/__init__.py b/backend/analytics_server/tests/service/Incidents/sync/__init__.py
similarity index 100%
rename from apiserver/tests/service/__init__.py
rename to backend/analytics_server/tests/service/Incidents/sync/__init__.py
diff --git a/apiserver/tests/service/Incidents/sync/test_etl_git_incidents_handler.py b/backend/analytics_server/tests/service/Incidents/sync/test_etl_git_incidents_handler.py
similarity index 100%
rename from apiserver/tests/service/Incidents/sync/test_etl_git_incidents_handler.py
rename to backend/analytics_server/tests/service/Incidents/sync/test_etl_git_incidents_handler.py
diff --git a/apiserver/tests/service/Incidents/test_change_failure_rate.py b/backend/analytics_server/tests/service/Incidents/test_change_failure_rate.py
similarity index 100%
rename from apiserver/tests/service/Incidents/test_change_failure_rate.py
rename to backend/analytics_server/tests/service/Incidents/test_change_failure_rate.py
diff --git a/apiserver/tests/service/Incidents/test_deployment_incident_mapper.py b/backend/analytics_server/tests/service/Incidents/test_deployment_incident_mapper.py
similarity index 100%
rename from apiserver/tests/service/Incidents/test_deployment_incident_mapper.py
rename to backend/analytics_server/tests/service/Incidents/test_deployment_incident_mapper.py
diff --git a/apiserver/tests/service/code/__init__.py b/backend/analytics_server/tests/service/__init__.py
similarity index 100%
rename from apiserver/tests/service/code/__init__.py
rename to backend/analytics_server/tests/service/__init__.py
diff --git a/apiserver/tests/service/code/sync/__init__.py b/backend/analytics_server/tests/service/code/__init__.py
similarity index 100%
rename from apiserver/tests/service/code/sync/__init__.py
rename to backend/analytics_server/tests/service/code/__init__.py
diff --git a/apiserver/tests/service/deployments/__init__.py b/backend/analytics_server/tests/service/code/sync/__init__.py
similarity index 100%
rename from apiserver/tests/service/deployments/__init__.py
rename to backend/analytics_server/tests/service/code/sync/__init__.py
diff --git a/apiserver/tests/service/code/sync/test_etl_code_analytics.py b/backend/analytics_server/tests/service/code/sync/test_etl_code_analytics.py
similarity index 100%
rename from apiserver/tests/service/code/sync/test_etl_code_analytics.py
rename to backend/analytics_server/tests/service/code/sync/test_etl_code_analytics.py
diff --git a/apiserver/tests/service/code/sync/test_etl_github_handler.py b/backend/analytics_server/tests/service/code/sync/test_etl_github_handler.py
similarity index 100%
rename from apiserver/tests/service/code/sync/test_etl_github_handler.py
rename to backend/analytics_server/tests/service/code/sync/test_etl_github_handler.py
diff --git a/apiserver/tests/service/code/test_lead_time_service.py b/backend/analytics_server/tests/service/code/test_lead_time_service.py
similarity index 100%
rename from apiserver/tests/service/code/test_lead_time_service.py
rename to backend/analytics_server/tests/service/code/test_lead_time_service.py
diff --git a/apiserver/tests/service/workflows/__init__.py b/backend/analytics_server/tests/service/deployments/__init__.py
similarity index 100%
rename from apiserver/tests/service/workflows/__init__.py
rename to backend/analytics_server/tests/service/deployments/__init__.py
diff --git a/apiserver/tests/service/deployments/test_deployment_frequency.py b/backend/analytics_server/tests/service/deployments/test_deployment_frequency.py
similarity index 100%
rename from apiserver/tests/service/deployments/test_deployment_frequency.py
rename to backend/analytics_server/tests/service/deployments/test_deployment_frequency.py
diff --git a/apiserver/tests/service/deployments/test_deployment_pr_mapper.py b/backend/analytics_server/tests/service/deployments/test_deployment_pr_mapper.py
similarity index 100%
rename from apiserver/tests/service/deployments/test_deployment_pr_mapper.py
rename to backend/analytics_server/tests/service/deployments/test_deployment_pr_mapper.py
diff --git a/apiserver/tests/service/workflows/sync/__init__.py b/backend/analytics_server/tests/service/workflows/__init__.py
similarity index 100%
rename from apiserver/tests/service/workflows/sync/__init__.py
rename to backend/analytics_server/tests/service/workflows/__init__.py
diff --git a/backend/analytics_server/tests/service/workflows/sync/__init__.py b/backend/analytics_server/tests/service/workflows/sync/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/apiserver/tests/service/workflows/sync/test_etl_github_actions_handler.py b/backend/analytics_server/tests/service/workflows/sync/test_etl_github_actions_handler.py
similarity index 100%
rename from apiserver/tests/service/workflows/sync/test_etl_github_actions_handler.py
rename to backend/analytics_server/tests/service/workflows/sync/test_etl_github_actions_handler.py
diff --git a/apiserver/tests/utilities.py b/backend/analytics_server/tests/utilities.py
similarity index 100%
rename from apiserver/tests/utilities.py
rename to backend/analytics_server/tests/utilities.py
diff --git a/apiserver/tests/utils/dict/test_get_average_of_dict_values.py b/backend/analytics_server/tests/utils/dict/test_get_average_of_dict_values.py
similarity index 100%
rename from apiserver/tests/utils/dict/test_get_average_of_dict_values.py
rename to backend/analytics_server/tests/utils/dict/test_get_average_of_dict_values.py
diff --git a/apiserver/tests/utils/dict/test_get_key_to_count_map.py b/backend/analytics_server/tests/utils/dict/test_get_key_to_count_map.py
similarity index 100%
rename from apiserver/tests/utils/dict/test_get_key_to_count_map.py
rename to backend/analytics_server/tests/utils/dict/test_get_key_to_count_map.py
diff --git a/apiserver/tests/utils/time/test_fill_missing_week_buckets.py b/backend/analytics_server/tests/utils/time/test_fill_missing_week_buckets.py
similarity index 100%
rename from apiserver/tests/utils/time/test_fill_missing_week_buckets.py
rename to backend/analytics_server/tests/utils/time/test_fill_missing_week_buckets.py
diff --git a/apiserver/tests/utils/time/test_generate_expanded_buckets.py b/backend/analytics_server/tests/utils/time/test_generate_expanded_buckets.py
similarity index 100%
rename from apiserver/tests/utils/time/test_generate_expanded_buckets.py
rename to backend/analytics_server/tests/utils/time/test_generate_expanded_buckets.py
diff --git a/apiserver/dev-requirements.txt b/backend/dev-requirements.txt
similarity index 100%
rename from apiserver/dev-requirements.txt
rename to backend/dev-requirements.txt
diff --git a/apiserver/env.example b/backend/env.example
similarity index 100%
rename from apiserver/env.example
rename to backend/env.example
diff --git a/apiserver/requirements.txt b/backend/requirements.txt
similarity index 100%
rename from apiserver/requirements.txt
rename to backend/requirements.txt