diff --git a/server/LICENSE b/apiserver/LICENSE
similarity index 100%
rename from server/LICENSE
rename to apiserver/LICENSE
diff --git a/server/api_version.py b/apiserver/api_version.py
similarity index 100%
rename from server/api_version.py
rename to apiserver/api_version.py
diff --git a/server/apierrors/__init__.py b/apiserver/apierrors/__init__.py
similarity index 100%
rename from server/apierrors/__init__.py
rename to apiserver/apierrors/__init__.py
diff --git a/server/apierrors/apierror.py b/apiserver/apierrors/apierror.py
similarity index 100%
rename from server/apierrors/apierror.py
rename to apiserver/apierrors/apierror.py
diff --git a/server/apierrors/autogen/__init__.py b/apiserver/apierrors/autogen/__init__.py
similarity index 100%
rename from server/apierrors/autogen/__init__.py
rename to apiserver/apierrors/autogen/__init__.py
diff --git a/server/apierrors/autogen/__main__.py b/apiserver/apierrors/autogen/__main__.py
similarity index 100%
rename from server/apierrors/autogen/__main__.py
rename to apiserver/apierrors/autogen/__main__.py
diff --git a/server/apierrors/autogen/generator.py b/apiserver/apierrors/autogen/generator.py
similarity index 100%
rename from server/apierrors/autogen/generator.py
rename to apiserver/apierrors/autogen/generator.py
diff --git a/server/apierrors/autogen/templates/error.jinja2 b/apiserver/apierrors/autogen/templates/error.jinja2
similarity index 100%
rename from server/apierrors/autogen/templates/error.jinja2
rename to apiserver/apierrors/autogen/templates/error.jinja2
diff --git a/server/apierrors/autogen/templates/init.jinja2 b/apiserver/apierrors/autogen/templates/init.jinja2
similarity index 100%
rename from server/apierrors/autogen/templates/init.jinja2
rename to apiserver/apierrors/autogen/templates/init.jinja2
diff --git a/server/apierrors/autogen/templates/section.jinja2 b/apiserver/apierrors/autogen/templates/section.jinja2
similarity index 100%
rename from server/apierrors/autogen/templates/section.jinja2
rename to apiserver/apierrors/autogen/templates/section.jinja2
diff --git a/server/apierrors/base.py b/apiserver/apierrors/base.py
similarity index 100%
rename from server/apierrors/base.py
rename to apiserver/apierrors/base.py
diff --git a/server/apimodels/__init__.py b/apiserver/apimodels/__init__.py
similarity index 100%
rename from server/apimodels/__init__.py
rename to apiserver/apimodels/__init__.py
diff --git a/server/apimodels/auth.py b/apiserver/apimodels/auth.py
similarity index 100%
rename from server/apimodels/auth.py
rename to apiserver/apimodels/auth.py
diff --git a/server/apimodels/base.py b/apiserver/apimodels/base.py
similarity index 100%
rename from server/apimodels/base.py
rename to apiserver/apimodels/base.py
diff --git a/server/apimodels/events.py b/apiserver/apimodels/events.py
similarity index 100%
rename from server/apimodels/events.py
rename to apiserver/apimodels/events.py
diff --git a/server/apimodels/models.py b/apiserver/apimodels/models.py
similarity index 100%
rename from server/apimodels/models.py
rename to apiserver/apimodels/models.py
diff --git a/server/apimodels/organization.py b/apiserver/apimodels/organization.py
similarity index 100%
rename from server/apimodels/organization.py
rename to apiserver/apimodels/organization.py
diff --git a/server/apimodels/projects.py b/apiserver/apimodels/projects.py
similarity index 100%
rename from server/apimodels/projects.py
rename to apiserver/apimodels/projects.py
diff --git a/server/apimodels/queues.py b/apiserver/apimodels/queues.py
similarity index 100%
rename from server/apimodels/queues.py
rename to apiserver/apimodels/queues.py
diff --git a/server/apimodels/server.py b/apiserver/apimodels/server.py
similarity index 100%
rename from server/apimodels/server.py
rename to apiserver/apimodels/server.py
diff --git a/server/apimodels/tasks.py b/apiserver/apimodels/tasks.py
similarity index 100%
rename from server/apimodels/tasks.py
rename to apiserver/apimodels/tasks.py
diff --git a/server/apimodels/users.py b/apiserver/apimodels/users.py
similarity index 100%
rename from server/apimodels/users.py
rename to apiserver/apimodels/users.py
diff --git a/server/apimodels/workers.py b/apiserver/apimodels/workers.py
similarity index 100%
rename from server/apimodels/workers.py
rename to apiserver/apimodels/workers.py
diff --git a/server/bll/__init__.py b/apiserver/bll/__init__.py
similarity index 100%
rename from server/bll/__init__.py
rename to apiserver/bll/__init__.py
diff --git a/server/bll/auth/__init__.py b/apiserver/bll/auth/__init__.py
similarity index 100%
rename from server/bll/auth/__init__.py
rename to apiserver/bll/auth/__init__.py
diff --git a/server/bll/event/__init__.py b/apiserver/bll/event/__init__.py
similarity index 100%
rename from server/bll/event/__init__.py
rename to apiserver/bll/event/__init__.py
diff --git a/server/bll/event/debug_images_iterator.py b/apiserver/bll/event/debug_images_iterator.py
similarity index 100%
rename from server/bll/event/debug_images_iterator.py
rename to apiserver/bll/event/debug_images_iterator.py
diff --git a/server/bll/event/event_bll.py b/apiserver/bll/event/event_bll.py
similarity index 100%
rename from server/bll/event/event_bll.py
rename to apiserver/bll/event/event_bll.py
diff --git a/server/bll/event/event_metrics.py b/apiserver/bll/event/event_metrics.py
similarity index 100%
rename from server/bll/event/event_metrics.py
rename to apiserver/bll/event/event_metrics.py
diff --git a/server/bll/event/log_events_iterator.py b/apiserver/bll/event/log_events_iterator.py
similarity index 100%
rename from server/bll/event/log_events_iterator.py
rename to apiserver/bll/event/log_events_iterator.py
diff --git a/server/bll/event/scalar_key.py b/apiserver/bll/event/scalar_key.py
similarity index 100%
rename from server/bll/event/scalar_key.py
rename to apiserver/bll/event/scalar_key.py
diff --git a/server/bll/model/__init__.py b/apiserver/bll/model/__init__.py
similarity index 100%
rename from server/bll/model/__init__.py
rename to apiserver/bll/model/__init__.py
diff --git a/server/bll/organization/__init__.py b/apiserver/bll/organization/__init__.py
similarity index 100%
rename from server/bll/organization/__init__.py
rename to apiserver/bll/organization/__init__.py
diff --git a/server/bll/project/__init__.py b/apiserver/bll/project/__init__.py
similarity index 100%
rename from server/bll/project/__init__.py
rename to apiserver/bll/project/__init__.py
diff --git a/server/bll/project/project_bll.py b/apiserver/bll/project/project_bll.py
similarity index 100%
rename from server/bll/project/project_bll.py
rename to apiserver/bll/project/project_bll.py
diff --git a/server/bll/query/__init__.py b/apiserver/bll/query/__init__.py
similarity index 100%
rename from server/bll/query/__init__.py
rename to apiserver/bll/query/__init__.py
diff --git a/server/bll/query/builder.py b/apiserver/bll/query/builder.py
similarity index 100%
rename from server/bll/query/builder.py
rename to apiserver/bll/query/builder.py
diff --git a/server/bll/queue/__init__.py b/apiserver/bll/queue/__init__.py
similarity index 100%
rename from server/bll/queue/__init__.py
rename to apiserver/bll/queue/__init__.py
diff --git a/server/bll/queue/queue_bll.py b/apiserver/bll/queue/queue_bll.py
similarity index 100%
rename from server/bll/queue/queue_bll.py
rename to apiserver/bll/queue/queue_bll.py
diff --git a/server/bll/queue/queue_metrics.py b/apiserver/bll/queue/queue_metrics.py
similarity index 100%
rename from server/bll/queue/queue_metrics.py
rename to apiserver/bll/queue/queue_metrics.py
diff --git a/server/bll/redis_cache_manager.py b/apiserver/bll/redis_cache_manager.py
similarity index 100%
rename from server/bll/redis_cache_manager.py
rename to apiserver/bll/redis_cache_manager.py
diff --git a/server/bll/statistics/resource_monitor.py b/apiserver/bll/statistics/resource_monitor.py
similarity index 100%
rename from server/bll/statistics/resource_monitor.py
rename to apiserver/bll/statistics/resource_monitor.py
diff --git a/server/bll/statistics/stats_reporter.py b/apiserver/bll/statistics/stats_reporter.py
similarity index 100%
rename from server/bll/statistics/stats_reporter.py
rename to apiserver/bll/statistics/stats_reporter.py
diff --git a/server/bll/task/__init__.py b/apiserver/bll/task/__init__.py
similarity index 100%
rename from server/bll/task/__init__.py
rename to apiserver/bll/task/__init__.py
diff --git a/server/bll/task/hyperparams.py b/apiserver/bll/task/hyperparams.py
similarity index 100%
rename from server/bll/task/hyperparams.py
rename to apiserver/bll/task/hyperparams.py
diff --git a/server/bll/task/non_responsive_tasks_watchdog.py b/apiserver/bll/task/non_responsive_tasks_watchdog.py
similarity index 100%
rename from server/bll/task/non_responsive_tasks_watchdog.py
rename to apiserver/bll/task/non_responsive_tasks_watchdog.py
diff --git a/server/bll/task/param_utils.py b/apiserver/bll/task/param_utils.py
similarity index 100%
rename from server/bll/task/param_utils.py
rename to apiserver/bll/task/param_utils.py
diff --git a/server/bll/task/task_bll.py b/apiserver/bll/task/task_bll.py
similarity index 100%
rename from server/bll/task/task_bll.py
rename to apiserver/bll/task/task_bll.py
diff --git a/server/bll/task/utils.py b/apiserver/bll/task/utils.py
similarity index 100%
rename from server/bll/task/utils.py
rename to apiserver/bll/task/utils.py
diff --git a/server/bll/user/__init__.py b/apiserver/bll/user/__init__.py
similarity index 100%
rename from server/bll/user/__init__.py
rename to apiserver/bll/user/__init__.py
diff --git a/server/bll/util.py b/apiserver/bll/util.py
similarity index 100%
rename from server/bll/util.py
rename to apiserver/bll/util.py
diff --git a/server/bll/workers/__init__.py b/apiserver/bll/workers/__init__.py
similarity index 100%
rename from server/bll/workers/__init__.py
rename to apiserver/bll/workers/__init__.py
diff --git a/server/bll/workers/stats.py b/apiserver/bll/workers/stats.py
similarity index 100%
rename from server/bll/workers/stats.py
rename to apiserver/bll/workers/stats.py
diff --git a/server/config/__init__.py b/apiserver/config/__init__.py
similarity index 100%
rename from server/config/__init__.py
rename to apiserver/config/__init__.py
diff --git a/server/config/basic.py b/apiserver/config/basic.py
similarity index 100%
rename from server/config/basic.py
rename to apiserver/config/basic.py
diff --git a/server/config/default/apiserver.conf b/apiserver/config/default/apiserver.conf
similarity index 100%
rename from server/config/default/apiserver.conf
rename to apiserver/config/default/apiserver.conf
diff --git a/server/config/default/hosts.conf b/apiserver/config/default/hosts.conf
similarity index 100%
rename from server/config/default/hosts.conf
rename to apiserver/config/default/hosts.conf
diff --git a/server/config/default/logging.conf b/apiserver/config/default/logging.conf
similarity index 100%
rename from server/config/default/logging.conf
rename to apiserver/config/default/logging.conf
diff --git a/server/config/default/secure.conf b/apiserver/config/default/secure.conf
similarity index 100%
rename from server/config/default/secure.conf
rename to apiserver/config/default/secure.conf
diff --git a/server/config/default/services/auth.conf b/apiserver/config/default/services/auth.conf
similarity index 100%
rename from server/config/default/services/auth.conf
rename to apiserver/config/default/services/auth.conf
diff --git a/server/config/default/services/events.conf b/apiserver/config/default/services/events.conf
similarity index 100%
rename from server/config/default/services/events.conf
rename to apiserver/config/default/services/events.conf
diff --git a/server/config/default/services/organization.conf b/apiserver/config/default/services/organization.conf
similarity index 100%
rename from server/config/default/services/organization.conf
rename to apiserver/config/default/services/organization.conf
diff --git a/server/config/default/services/projects.conf b/apiserver/config/default/services/projects.conf
similarity index 100%
rename from server/config/default/services/projects.conf
rename to apiserver/config/default/services/projects.conf
diff --git a/server/config/default/services/tasks.conf b/apiserver/config/default/services/tasks.conf
similarity index 100%
rename from server/config/default/services/tasks.conf
rename to apiserver/config/default/services/tasks.conf
diff --git a/server/config/info.py b/apiserver/config/info.py
similarity index 100%
rename from server/config/info.py
rename to apiserver/config/info.py
diff --git a/server/database/__init__.py b/apiserver/database/__init__.py
similarity index 100%
rename from server/database/__init__.py
rename to apiserver/database/__init__.py
diff --git a/server/database/defs.py b/apiserver/database/defs.py
similarity index 100%
rename from server/database/defs.py
rename to apiserver/database/defs.py
diff --git a/server/database/errors.py b/apiserver/database/errors.py
similarity index 100%
rename from server/database/errors.py
rename to apiserver/database/errors.py
diff --git a/server/database/fields.py b/apiserver/database/fields.py
similarity index 100%
rename from server/database/fields.py
rename to apiserver/database/fields.py
diff --git a/server/database/model/__init__.py b/apiserver/database/model/__init__.py
similarity index 100%
rename from server/database/model/__init__.py
rename to apiserver/database/model/__init__.py
diff --git a/server/database/model/auth.py b/apiserver/database/model/auth.py
similarity index 100%
rename from server/database/model/auth.py
rename to apiserver/database/model/auth.py
diff --git a/server/database/model/base.py b/apiserver/database/model/base.py
similarity index 100%
rename from server/database/model/base.py
rename to apiserver/database/model/base.py
diff --git a/server/database/model/company.py b/apiserver/database/model/company.py
similarity index 100%
rename from server/database/model/company.py
rename to apiserver/database/model/company.py
diff --git a/server/database/model/model.py b/apiserver/database/model/model.py
similarity index 100%
rename from server/database/model/model.py
rename to apiserver/database/model/model.py
diff --git a/server/database/model/model_labels.py b/apiserver/database/model/model_labels.py
similarity index 100%
rename from server/database/model/model_labels.py
rename to apiserver/database/model/model_labels.py
diff --git a/server/database/model/project.py b/apiserver/database/model/project.py
similarity index 100%
rename from server/database/model/project.py
rename to apiserver/database/model/project.py
diff --git a/server/database/model/queue.py b/apiserver/database/model/queue.py
similarity index 100%
rename from server/database/model/queue.py
rename to apiserver/database/model/queue.py
diff --git a/server/database/model/settings.py b/apiserver/database/model/settings.py
similarity index 100%
rename from server/database/model/settings.py
rename to apiserver/database/model/settings.py
diff --git a/server/database/model/task/metrics.py b/apiserver/database/model/task/metrics.py
similarity index 100%
rename from server/database/model/task/metrics.py
rename to apiserver/database/model/task/metrics.py
diff --git a/server/database/model/task/output.py b/apiserver/database/model/task/output.py
similarity index 100%
rename from server/database/model/task/output.py
rename to apiserver/database/model/task/output.py
diff --git a/server/database/model/task/task.py b/apiserver/database/model/task/task.py
similarity index 100%
rename from server/database/model/task/task.py
rename to apiserver/database/model/task/task.py
diff --git a/server/database/model/user.py b/apiserver/database/model/user.py
similarity index 100%
rename from server/database/model/user.py
rename to apiserver/database/model/user.py
diff --git a/server/database/model/version.py b/apiserver/database/model/version.py
similarity index 100%
rename from server/database/model/version.py
rename to apiserver/database/model/version.py
diff --git a/server/database/projection.py b/apiserver/database/projection.py
similarity index 100%
rename from server/database/projection.py
rename to apiserver/database/projection.py
diff --git a/server/database/props.py b/apiserver/database/props.py
similarity index 100%
rename from server/database/props.py
rename to apiserver/database/props.py
diff --git a/server/database/query.py b/apiserver/database/query.py
similarity index 100%
rename from server/database/query.py
rename to apiserver/database/query.py
diff --git a/server/database/utils.py b/apiserver/database/utils.py
similarity index 100%
rename from server/database/utils.py
rename to apiserver/database/utils.py
diff --git a/server/elastic/apply_mappings.py b/apiserver/elastic/apply_mappings.py
similarity index 100%
rename from server/elastic/apply_mappings.py
rename to apiserver/elastic/apply_mappings.py
diff --git a/server/elastic/initialize.py b/apiserver/elastic/initialize.py
similarity index 100%
rename from server/elastic/initialize.py
rename to apiserver/elastic/initialize.py
diff --git a/server/elastic/mappings/events/events.json b/apiserver/elastic/mappings/events/events.json
similarity index 100%
rename from server/elastic/mappings/events/events.json
rename to apiserver/elastic/mappings/events/events.json
diff --git a/server/elastic/mappings/events/events_log.json b/apiserver/elastic/mappings/events/events_log.json
similarity index 100%
rename from server/elastic/mappings/events/events_log.json
rename to apiserver/elastic/mappings/events/events_log.json
diff --git a/server/elastic/mappings/events/events_plot.json b/apiserver/elastic/mappings/events/events_plot.json
similarity index 100%
rename from server/elastic/mappings/events/events_plot.json
rename to apiserver/elastic/mappings/events/events_plot.json
diff --git a/server/elastic/mappings/events/events_training_debug_image.json b/apiserver/elastic/mappings/events/events_training_debug_image.json
similarity index 100%
rename from server/elastic/mappings/events/events_training_debug_image.json
rename to apiserver/elastic/mappings/events/events_training_debug_image.json
diff --git a/server/elastic/mappings/workers/queue_metrics.json b/apiserver/elastic/mappings/workers/queue_metrics.json
similarity index 100%
rename from server/elastic/mappings/workers/queue_metrics.json
rename to apiserver/elastic/mappings/workers/queue_metrics.json
diff --git a/server/elastic/mappings/workers/worker_stats.json b/apiserver/elastic/mappings/workers/worker_stats.json
similarity index 100%
rename from server/elastic/mappings/workers/worker_stats.json
rename to apiserver/elastic/mappings/workers/worker_stats.json
diff --git a/server/elastic/requirements.txt b/apiserver/elastic/requirements.txt
similarity index 100%
rename from server/elastic/requirements.txt
rename to apiserver/elastic/requirements.txt
diff --git a/server/es_factory.py b/apiserver/es_factory.py
similarity index 100%
rename from server/es_factory.py
rename to apiserver/es_factory.py
diff --git a/server/mongo/initialize/__init__.py b/apiserver/mongo/initialize/__init__.py
similarity index 100%
rename from server/mongo/initialize/__init__.py
rename to apiserver/mongo/initialize/__init__.py
diff --git a/server/mongo/initialize/migration.py b/apiserver/mongo/initialize/migration.py
similarity index 100%
rename from server/mongo/initialize/migration.py
rename to apiserver/mongo/initialize/migration.py
diff --git a/server/mongo/initialize/pre_populate.py b/apiserver/mongo/initialize/pre_populate.py
similarity index 100%
rename from server/mongo/initialize/pre_populate.py
rename to apiserver/mongo/initialize/pre_populate.py
diff --git a/server/mongo/initialize/user.py b/apiserver/mongo/initialize/user.py
similarity index 100%
rename from server/mongo/initialize/user.py
rename to apiserver/mongo/initialize/user.py
diff --git a/server/mongo/initialize/util.py b/apiserver/mongo/initialize/util.py
similarity index 100%
rename from server/mongo/initialize/util.py
rename to apiserver/mongo/initialize/util.py
diff --git a/server/mongo/migrations/0.12.1.py b/apiserver/mongo/migrations/0.12.1.py
similarity index 100%
rename from server/mongo/migrations/0.12.1.py
rename to apiserver/mongo/migrations/0.12.1.py
diff --git a/server/mongo/migrations/0.13.0.py b/apiserver/mongo/migrations/0.13.0.py
similarity index 100%
rename from server/mongo/migrations/0.13.0.py
rename to apiserver/mongo/migrations/0.13.0.py
diff --git a/server/mongo/migrations/0.14.0.py b/apiserver/mongo/migrations/0.14.0.py
similarity index 100%
rename from server/mongo/migrations/0.14.0.py
rename to apiserver/mongo/migrations/0.14.0.py
diff --git a/server/mongo/migrations/0.15.0.py b/apiserver/mongo/migrations/0.15.0.py
similarity index 100%
rename from server/mongo/migrations/0.15.0.py
rename to apiserver/mongo/migrations/0.15.0.py
diff --git a/server/mongo/migrations/0.16.0.py b/apiserver/mongo/migrations/0.16.0.py
similarity index 100%
rename from server/mongo/migrations/0.16.0.py
rename to apiserver/mongo/migrations/0.16.0.py
diff --git a/server/mongo/migrations/0.16.1.py b/apiserver/mongo/migrations/0.16.1.py
similarity index 100%
rename from server/mongo/migrations/0.16.1.py
rename to apiserver/mongo/migrations/0.16.1.py
diff --git a/server/redis_manager.py b/apiserver/redis_manager.py
similarity index 100%
rename from server/redis_manager.py
rename to apiserver/redis_manager.py
diff --git a/server/requirements.txt b/apiserver/requirements.txt
similarity index 100%
rename from server/requirements.txt
rename to apiserver/requirements.txt
diff --git a/server/schema.py b/apiserver/schema.py
similarity index 100%
rename from server/schema.py
rename to apiserver/schema.py
diff --git a/server/schema/meta/__init__.py b/apiserver/schema/meta/__init__.py
similarity index 100%
rename from server/schema/meta/__init__.py
rename to apiserver/schema/meta/__init__.py
diff --git a/server/schema/meta/meta.conf b/apiserver/schema/meta/meta.conf
similarity index 100%
rename from server/schema/meta/meta.conf
rename to apiserver/schema/meta/meta.conf
diff --git a/server/schema/meta/validate.py b/apiserver/schema/meta/validate.py
similarity index 100%
rename from server/schema/meta/validate.py
rename to apiserver/schema/meta/validate.py
diff --git a/server/schema/services/README.md b/apiserver/schema/services/README.md
similarity index 100%
rename from server/schema/services/README.md
rename to apiserver/schema/services/README.md
diff --git a/server/schema/services/_api_defaults.conf b/apiserver/schema/services/_api_defaults.conf
similarity index 100%
rename from server/schema/services/_api_defaults.conf
rename to apiserver/schema/services/_api_defaults.conf
diff --git a/server/schema/services/_common.conf b/apiserver/schema/services/_common.conf
similarity index 100%
rename from server/schema/services/_common.conf
rename to apiserver/schema/services/_common.conf
diff --git a/server/schema/services/auth.conf b/apiserver/schema/services/auth.conf
similarity index 100%
rename from server/schema/services/auth.conf
rename to apiserver/schema/services/auth.conf
diff --git a/server/schema/services/debug.conf b/apiserver/schema/services/debug.conf
similarity index 100%
rename from server/schema/services/debug.conf
rename to apiserver/schema/services/debug.conf
diff --git a/server/schema/services/events.conf b/apiserver/schema/services/events.conf
similarity index 100%
rename from server/schema/services/events.conf
rename to apiserver/schema/services/events.conf
diff --git a/server/schema/services/models.conf b/apiserver/schema/services/models.conf
similarity index 100%
rename from server/schema/services/models.conf
rename to apiserver/schema/services/models.conf
diff --git a/server/schema/services/organization.conf b/apiserver/schema/services/organization.conf
similarity index 100%
rename from server/schema/services/organization.conf
rename to apiserver/schema/services/organization.conf
diff --git a/server/schema/services/projects.conf b/apiserver/schema/services/projects.conf
similarity index 100%
rename from server/schema/services/projects.conf
rename to apiserver/schema/services/projects.conf
diff --git a/server/schema/services/queues.conf b/apiserver/schema/services/queues.conf
similarity index 100%
rename from server/schema/services/queues.conf
rename to apiserver/schema/services/queues.conf
diff --git a/server/schema/services/server.conf b/apiserver/schema/services/server.conf
similarity index 100%
rename from server/schema/services/server.conf
rename to apiserver/schema/services/server.conf
diff --git a/server/schema/services/tasks.conf b/apiserver/schema/services/tasks.conf
similarity index 100%
rename from server/schema/services/tasks.conf
rename to apiserver/schema/services/tasks.conf
diff --git a/server/schema/services/users.conf b/apiserver/schema/services/users.conf
similarity index 100%
rename from server/schema/services/users.conf
rename to apiserver/schema/services/users.conf
diff --git a/server/schema/services/workers.conf b/apiserver/schema/services/workers.conf
similarity index 100%
rename from server/schema/services/workers.conf
rename to apiserver/schema/services/workers.conf
diff --git a/server/server.py b/apiserver/server.py
similarity index 100%
rename from server/server.py
rename to apiserver/server.py
diff --git a/server/service_repo/__init__.py b/apiserver/service_repo/__init__.py
similarity index 100%
rename from server/service_repo/__init__.py
rename to apiserver/service_repo/__init__.py
diff --git a/server/service_repo/apicall.py b/apiserver/service_repo/apicall.py
similarity index 100%
rename from server/service_repo/apicall.py
rename to apiserver/service_repo/apicall.py
diff --git a/server/service_repo/auth/__init__.py b/apiserver/service_repo/auth/__init__.py
similarity index 100%
rename from server/service_repo/auth/__init__.py
rename to apiserver/service_repo/auth/__init__.py
diff --git a/server/service_repo/auth/auth.py b/apiserver/service_repo/auth/auth.py
similarity index 100%
rename from server/service_repo/auth/auth.py
rename to apiserver/service_repo/auth/auth.py
diff --git a/server/service_repo/auth/dictable.py b/apiserver/service_repo/auth/dictable.py
similarity index 100%
rename from server/service_repo/auth/dictable.py
rename to apiserver/service_repo/auth/dictable.py
diff --git a/server/service_repo/auth/fixed_user.py b/apiserver/service_repo/auth/fixed_user.py
similarity index 100%
rename from server/service_repo/auth/fixed_user.py
rename to apiserver/service_repo/auth/fixed_user.py
diff --git a/server/service_repo/auth/identity.py b/apiserver/service_repo/auth/identity.py
similarity index 100%
rename from server/service_repo/auth/identity.py
rename to apiserver/service_repo/auth/identity.py
diff --git a/server/service_repo/auth/payload/__init__.py b/apiserver/service_repo/auth/payload/__init__.py
similarity index 100%
rename from server/service_repo/auth/payload/__init__.py
rename to apiserver/service_repo/auth/payload/__init__.py
diff --git a/server/service_repo/auth/payload/auth_type.py b/apiserver/service_repo/auth/payload/auth_type.py
similarity index 100%
rename from server/service_repo/auth/payload/auth_type.py
rename to apiserver/service_repo/auth/payload/auth_type.py
diff --git a/server/service_repo/auth/payload/basic.py b/apiserver/service_repo/auth/payload/basic.py
similarity index 100%
rename from server/service_repo/auth/payload/basic.py
rename to apiserver/service_repo/auth/payload/basic.py
diff --git a/server/service_repo/auth/payload/payload.py b/apiserver/service_repo/auth/payload/payload.py
similarity index 100%
rename from server/service_repo/auth/payload/payload.py
rename to apiserver/service_repo/auth/payload/payload.py
diff --git a/server/service_repo/auth/payload/token.py b/apiserver/service_repo/auth/payload/token.py
similarity index 100%
rename from server/service_repo/auth/payload/token.py
rename to apiserver/service_repo/auth/payload/token.py
diff --git a/server/service_repo/auth/utils.py b/apiserver/service_repo/auth/utils.py
similarity index 100%
rename from server/service_repo/auth/utils.py
rename to apiserver/service_repo/auth/utils.py
diff --git a/server/service_repo/base.py b/apiserver/service_repo/base.py
similarity index 100%
rename from server/service_repo/base.py
rename to apiserver/service_repo/base.py
diff --git a/server/service_repo/endpoint.py b/apiserver/service_repo/endpoint.py
similarity index 100%
rename from server/service_repo/endpoint.py
rename to apiserver/service_repo/endpoint.py
diff --git a/server/service_repo/errors.py b/apiserver/service_repo/errors.py
similarity index 100%
rename from server/service_repo/errors.py
rename to apiserver/service_repo/errors.py
diff --git a/server/service_repo/schema_validator.py b/apiserver/service_repo/schema_validator.py
similarity index 100%
rename from server/service_repo/schema_validator.py
rename to apiserver/service_repo/schema_validator.py
diff --git a/server/service_repo/service_repo.py b/apiserver/service_repo/service_repo.py
similarity index 100%
rename from server/service_repo/service_repo.py
rename to apiserver/service_repo/service_repo.py
diff --git a/server/service_repo/util.py b/apiserver/service_repo/util.py
similarity index 100%
rename from server/service_repo/util.py
rename to apiserver/service_repo/util.py
diff --git a/server/service_repo/validators.py b/apiserver/service_repo/validators.py
similarity index 100%
rename from server/service_repo/validators.py
rename to apiserver/service_repo/validators.py
diff --git a/server/services/__init__.py b/apiserver/services/__init__.py
similarity index 100%
rename from server/services/__init__.py
rename to apiserver/services/__init__.py
diff --git a/server/services/auth.py b/apiserver/services/auth.py
similarity index 100%
rename from server/services/auth.py
rename to apiserver/services/auth.py
diff --git a/server/services/debug.py b/apiserver/services/debug.py
similarity index 100%
rename from server/services/debug.py
rename to apiserver/services/debug.py
diff --git a/server/services/events.py b/apiserver/services/events.py
similarity index 100%
rename from server/services/events.py
rename to apiserver/services/events.py
diff --git a/server/services/models.py b/apiserver/services/models.py
similarity index 100%
rename from server/services/models.py
rename to apiserver/services/models.py
diff --git a/server/services/organization.py b/apiserver/services/organization.py
similarity index 100%
rename from server/services/organization.py
rename to apiserver/services/organization.py
diff --git a/server/services/projects.py b/apiserver/services/projects.py
similarity index 100%
rename from server/services/projects.py
rename to apiserver/services/projects.py
diff --git a/server/services/queues.py b/apiserver/services/queues.py
similarity index 100%
rename from server/services/queues.py
rename to apiserver/services/queues.py
diff --git a/server/services/server/__init__.py b/apiserver/services/server/__init__.py
similarity index 100%
rename from server/services/server/__init__.py
rename to apiserver/services/server/__init__.py
diff --git a/server/services/tasks.py b/apiserver/services/tasks.py
similarity index 100%
rename from server/services/tasks.py
rename to apiserver/services/tasks.py
diff --git a/server/services/users.py b/apiserver/services/users.py
similarity index 100%
rename from server/services/users.py
rename to apiserver/services/users.py
diff --git a/server/services/utils.py b/apiserver/services/utils.py
similarity index 100%
rename from server/services/utils.py
rename to apiserver/services/utils.py
diff --git a/server/services/workers.py b/apiserver/services/workers.py
similarity index 100%
rename from server/services/workers.py
rename to apiserver/services/workers.py
diff --git a/server/sync.py b/apiserver/sync.py
similarity index 100%
rename from server/sync.py
rename to apiserver/sync.py
diff --git a/server/tests/__init__.py b/apiserver/tests/__init__.py
similarity index 100%
rename from server/tests/__init__.py
rename to apiserver/tests/__init__.py
diff --git a/server/tests/api_client.conf b/apiserver/tests/api_client.conf
similarity index 100%
rename from server/tests/api_client.conf
rename to apiserver/tests/api_client.conf
diff --git a/server/tests/api_client.py b/apiserver/tests/api_client.py
similarity index 100%
rename from server/tests/api_client.py
rename to apiserver/tests/api_client.py
diff --git a/server/tests/automated/__init__.py b/apiserver/tests/automated/__init__.py
similarity index 100%
rename from server/tests/automated/__init__.py
rename to apiserver/tests/automated/__init__.py
diff --git a/server/tests/automated/requirements.txt b/apiserver/tests/automated/requirements.txt
similarity index 100%
rename from server/tests/automated/requirements.txt
rename to apiserver/tests/automated/requirements.txt
diff --git a/server/tests/automated/test_entity_ordering.py b/apiserver/tests/automated/test_entity_ordering.py
similarity index 100%
rename from server/tests/automated/test_entity_ordering.py
rename to apiserver/tests/automated/test_entity_ordering.py
diff --git a/server/tests/automated/test_models.py b/apiserver/tests/automated/test_models.py
similarity index 100%
rename from server/tests/automated/test_models.py
rename to apiserver/tests/automated/test_models.py
diff --git a/server/tests/automated/test_project_tags.py b/apiserver/tests/automated/test_project_tags.py
similarity index 100%
rename from server/tests/automated/test_project_tags.py
rename to apiserver/tests/automated/test_project_tags.py
diff --git a/server/tests/automated/test_projection.py b/apiserver/tests/automated/test_projection.py
similarity index 100%
rename from server/tests/automated/test_projection.py
rename to apiserver/tests/automated/test_projection.py
diff --git a/server/tests/automated/test_projects_edit.py b/apiserver/tests/automated/test_projects_edit.py
similarity index 100%
rename from server/tests/automated/test_projects_edit.py
rename to apiserver/tests/automated/test_projects_edit.py
diff --git a/server/tests/automated/test_queues.py b/apiserver/tests/automated/test_queues.py
similarity index 100%
rename from server/tests/automated/test_queues.py
rename to apiserver/tests/automated/test_queues.py
diff --git a/server/tests/automated/test_tags.py b/apiserver/tests/automated/test_tags.py
similarity index 100%
rename from server/tests/automated/test_tags.py
rename to apiserver/tests/automated/test_tags.py
diff --git a/server/tests/automated/test_task_events.py b/apiserver/tests/automated/test_task_events.py
similarity index 100%
rename from server/tests/automated/test_task_events.py
rename to apiserver/tests/automated/test_task_events.py
diff --git a/server/tests/automated/test_task_hyperparams.py b/apiserver/tests/automated/test_task_hyperparams.py
similarity index 100%
rename from server/tests/automated/test_task_hyperparams.py
rename to apiserver/tests/automated/test_task_hyperparams.py
diff --git a/server/tests/automated/test_tasks_delete.py b/apiserver/tests/automated/test_tasks_delete.py
similarity index 100%
rename from server/tests/automated/test_tasks_delete.py
rename to apiserver/tests/automated/test_tasks_delete.py
diff --git a/server/tests/automated/test_tasks_diff.py b/apiserver/tests/automated/test_tasks_diff.py
similarity index 100%
rename from server/tests/automated/test_tasks_diff.py
rename to apiserver/tests/automated/test_tasks_diff.py
diff --git a/server/tests/automated/test_tasks_edit.py b/apiserver/tests/automated/test_tasks_edit.py
similarity index 100%
rename from server/tests/automated/test_tasks_edit.py
rename to apiserver/tests/automated/test_tasks_edit.py
diff --git a/server/tests/automated/test_users.py b/apiserver/tests/automated/test_users.py
similarity index 100%
rename from server/tests/automated/test_users.py
rename to apiserver/tests/automated/test_users.py
diff --git a/server/tests/automated/test_workers.py b/apiserver/tests/automated/test_workers.py
similarity index 100%
rename from server/tests/automated/test_workers.py
rename to apiserver/tests/automated/test_workers.py
diff --git a/server/tests/requirements.txt b/apiserver/tests/requirements.txt
similarity index 100%
rename from server/tests/requirements.txt
rename to apiserver/tests/requirements.txt
diff --git a/server/timing_context.py b/apiserver/timing_context.py
similarity index 100%
rename from server/timing_context.py
rename to apiserver/timing_context.py
diff --git a/server/tools.py b/apiserver/tools.py
similarity index 100%
rename from server/tools.py
rename to apiserver/tools.py
diff --git a/server/updates.py b/apiserver/updates.py
similarity index 100%
rename from server/updates.py
rename to apiserver/updates.py
diff --git a/server/utilities/__init__.py b/apiserver/utilities/__init__.py
similarity index 100%
rename from server/utilities/__init__.py
rename to apiserver/utilities/__init__.py
diff --git a/server/utilities/attrs.py b/apiserver/utilities/attrs.py
similarity index 100%
rename from server/utilities/attrs.py
rename to apiserver/utilities/attrs.py
diff --git a/server/utilities/dicts.py b/apiserver/utilities/dicts.py
similarity index 100%
rename from server/utilities/dicts.py
rename to apiserver/utilities/dicts.py
diff --git a/server/utilities/json.py b/apiserver/utilities/json.py
similarity index 100%
rename from server/utilities/json.py
rename to apiserver/utilities/json.py
diff --git a/server/utilities/parameter_key_escaper.py b/apiserver/utilities/parameter_key_escaper.py
similarity index 100%
rename from server/utilities/parameter_key_escaper.py
rename to apiserver/utilities/parameter_key_escaper.py
diff --git a/server/utilities/schema.py b/apiserver/utilities/schema.py
similarity index 100%
rename from server/utilities/schema.py
rename to apiserver/utilities/schema.py
diff --git a/server/utilities/stringenum.py b/apiserver/utilities/stringenum.py
similarity index 100%
rename from server/utilities/stringenum.py
rename to apiserver/utilities/stringenum.py
diff --git a/server/utilities/threads_manager.py b/apiserver/utilities/threads_manager.py
similarity index 100%
rename from server/utilities/threads_manager.py
rename to apiserver/utilities/threads_manager.py
diff --git a/server/version.py b/apiserver/version.py
similarity index 100%
rename from server/version.py
rename to apiserver/version.py