diff --git a/.github/workflows/cli.yml b/.github/workflows/cli.yml
index c94c877ac..3cb735175 100644
--- a/.github/workflows/cli.yml
+++ b/.github/workflows/cli.yml
@@ -33,12 +33,11 @@ jobs:
         which python
         python -m pip install --upgrade pip
     - name: Install test dependencies
-      run: pip install -r cli/requirements/test.txt
+      run: pip install -r requirements/test.txt
     - name: Install master dependencies
-      run: pip install -r cli/requirements/master.txt
+      run: pip install -r requirements/master.txt
     - name: Install dev libraries
-      run: export USE_LOCAL_PACKAGES="true" && pip install --upgrade --editable "cli[dev,k8s_async,fsspec,init,sidecar]"
+      run: export USE_LOCAL_PACKAGES="true" && pip install --upgrade --editable ".[dev,k8s_async,fsspec,init,sidecar]"
     - name: Test with pytest
       run: |
-        cd cli
         pytest -vv
diff --git a/cli/MANIFEST.in b/MANIFEST.in
similarity index 61%
rename from cli/MANIFEST.in
rename to MANIFEST.in
index 5557b6dde..230271e48 100644
--- a/cli/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,6 +3,6 @@ global-exclude __pycache__
 prune tests
 prune __pycache__
 include polyaxon/py.typed
-include ../README.md
-include ../CONTRIBUTING.md
-include ../LICENSE
+include README.md
+include CONTRIBUTING.md
+include LICENSE
diff --git a/cli/polyaxon-complete.sh b/cli/polyaxon-complete.sh
deleted file mode 100755
index 29eb0dcfd..000000000
--- a/cli/polyaxon-complete.sh
+++ /dev/null
@@ -1 +0,0 @@
-eval "$(_POLYAXON_COMPLETE=source polyaxon)"
diff --git a/cli/polyaxon/__init__.py b/polyaxon/__init__.py
similarity index 100%
rename from cli/polyaxon/__init__.py
rename to polyaxon/__init__.py
diff --git a/cli/polyaxon/__main__.py b/polyaxon/__main__.py
similarity index 100%
rename from cli/polyaxon/__main__.py
rename to polyaxon/__main__.py
diff --git a/cli/polyaxon/agents/__init__.py b/polyaxon/agents/__init__.py
similarity index 100%
rename from cli/polyaxon/agents/__init__.py
rename to polyaxon/agents/__init__.py
diff --git a/cli/polyaxon/agents/agent.py b/polyaxon/agents/agent.py
similarity index 100%
rename from cli/polyaxon/agents/agent.py
rename to polyaxon/agents/agent.py
diff --git a/cli/polyaxon/agents/base.py b/polyaxon/agents/base.py
similarity index 100%
rename from cli/polyaxon/agents/base.py
rename to polyaxon/agents/base.py
diff --git a/cli/polyaxon/agents/converter.py b/polyaxon/agents/converter.py
similarity index 100%
rename from cli/polyaxon/agents/converter.py
rename to polyaxon/agents/converter.py
diff --git a/cli/polyaxon/agents/manager.py b/polyaxon/agents/manager.py
similarity index 100%
rename from cli/polyaxon/agents/manager.py
rename to polyaxon/agents/manager.py
diff --git a/cli/polyaxon/agents/spawners/__init__.py b/polyaxon/agents/spawners/__init__.py
similarity index 100%
rename from cli/polyaxon/agents/spawners/__init__.py
rename to polyaxon/agents/spawners/__init__.py
diff --git a/cli/polyaxon/agents/spawners/async_spawner.py b/polyaxon/agents/spawners/async_spawner.py
similarity index 100%
rename from cli/polyaxon/agents/spawners/async_spawner.py
rename to polyaxon/agents/spawners/async_spawner.py
diff --git a/cli/polyaxon/agents/spawners/base.py b/polyaxon/agents/spawners/base.py
similarity index 100%
rename from cli/polyaxon/agents/spawners/base.py
rename to polyaxon/agents/spawners/base.py
diff --git a/cli/polyaxon/agents/spawners/spawner.py b/polyaxon/agents/spawners/spawner.py
similarity index 100%
rename from cli/polyaxon/agents/spawners/spawner.py
rename to polyaxon/agents/spawners/spawner.py
diff --git a/cli/polyaxon/api.py b/polyaxon/api.py
similarity index 100%
rename from cli/polyaxon/api.py
rename to polyaxon/api.py
diff --git a/cli/polyaxon/auxiliaries/__init__.py b/polyaxon/auxiliaries/__init__.py
similarity index 100%
rename from cli/polyaxon/auxiliaries/__init__.py
rename to polyaxon/auxiliaries/__init__.py
diff --git a/cli/polyaxon/auxiliaries/cleaner.py b/polyaxon/auxiliaries/cleaner.py
similarity index 100%
rename from cli/polyaxon/auxiliaries/cleaner.py
rename to polyaxon/auxiliaries/cleaner.py
diff --git a/cli/polyaxon/auxiliaries/default_scheduling.py b/polyaxon/auxiliaries/default_scheduling.py
similarity index 100%
rename from cli/polyaxon/auxiliaries/default_scheduling.py
rename to polyaxon/auxiliaries/default_scheduling.py
diff --git a/cli/polyaxon/auxiliaries/init.py b/polyaxon/auxiliaries/init.py
similarity index 100%
rename from cli/polyaxon/auxiliaries/init.py
rename to polyaxon/auxiliaries/init.py
diff --git a/cli/polyaxon/auxiliaries/notifier.py b/polyaxon/auxiliaries/notifier.py
similarity index 100%
rename from cli/polyaxon/auxiliaries/notifier.py
rename to polyaxon/auxiliaries/notifier.py
diff --git a/cli/polyaxon/auxiliaries/sidecar.py b/polyaxon/auxiliaries/sidecar.py
similarity index 100%
rename from cli/polyaxon/auxiliaries/sidecar.py
rename to polyaxon/auxiliaries/sidecar.py
diff --git a/cli/polyaxon/auxiliaries/tuner.py b/polyaxon/auxiliaries/tuner.py
similarity index 100%
rename from cli/polyaxon/auxiliaries/tuner.py
rename to polyaxon/auxiliaries/tuner.py
diff --git a/cli/polyaxon/builds/__init__.py b/polyaxon/builds/__init__.py
similarity index 100%
rename from cli/polyaxon/builds/__init__.py
rename to polyaxon/builds/__init__.py
diff --git a/cli/polyaxon/builds/builder.py b/polyaxon/builds/builder.py
similarity index 100%
rename from cli/polyaxon/builds/builder.py
rename to polyaxon/builds/builder.py
diff --git a/cli/polyaxon/builds/generator/__init__.py b/polyaxon/builds/generator/__init__.py
similarity index 100%
rename from cli/polyaxon/builds/generator/__init__.py
rename to polyaxon/builds/generator/__init__.py
diff --git a/cli/polyaxon/builds/generator/dockerfile.py b/polyaxon/builds/generator/dockerfile.py
similarity index 100%
rename from cli/polyaxon/builds/generator/dockerfile.py
rename to polyaxon/builds/generator/dockerfile.py
diff --git a/cli/polyaxon/builds/generator/generator.py b/polyaxon/builds/generator/generator.py
similarity index 100%
rename from cli/polyaxon/builds/generator/generator.py
rename to polyaxon/builds/generator/generator.py
diff --git a/cli/polyaxon/cli/__init__.py b/polyaxon/cli/__init__.py
similarity index 100%
rename from cli/polyaxon/cli/__init__.py
rename to polyaxon/cli/__init__.py
diff --git a/cli/polyaxon/cli/admin.py b/polyaxon/cli/admin.py
similarity index 100%
rename from cli/polyaxon/cli/admin.py
rename to polyaxon/cli/admin.py
diff --git a/cli/polyaxon/cli/artifacts.py b/polyaxon/cli/artifacts.py
similarity index 100%
rename from cli/polyaxon/cli/artifacts.py
rename to polyaxon/cli/artifacts.py
diff --git a/cli/polyaxon/cli/auth.py b/polyaxon/cli/auth.py
similarity index 100%
rename from cli/polyaxon/cli/auth.py
rename to polyaxon/cli/auth.py
diff --git a/cli/polyaxon/cli/check.py b/polyaxon/cli/check.py
similarity index 100%
rename from cli/polyaxon/cli/check.py
rename to polyaxon/cli/check.py
diff --git a/cli/polyaxon/cli/completion.py b/polyaxon/cli/completion.py
similarity index 100%
rename from cli/polyaxon/cli/completion.py
rename to polyaxon/cli/completion.py
diff --git a/cli/polyaxon/cli/components.py b/polyaxon/cli/components.py
similarity index 100%
rename from cli/polyaxon/cli/components.py
rename to polyaxon/cli/components.py
diff --git a/cli/polyaxon/cli/config.py b/polyaxon/cli/config.py
similarity index 100%
rename from cli/polyaxon/cli/config.py
rename to polyaxon/cli/config.py
diff --git a/cli/polyaxon/cli/dashboard.py b/polyaxon/cli/dashboard.py
similarity index 100%
rename from cli/polyaxon/cli/dashboard.py
rename to polyaxon/cli/dashboard.py
diff --git a/cli/polyaxon/cli/errors.py b/polyaxon/cli/errors.py
similarity index 100%
rename from cli/polyaxon/cli/errors.py
rename to polyaxon/cli/errors.py
diff --git a/cli/polyaxon/cli/executor/__init__.py b/polyaxon/cli/executor/__init__.py
similarity index 100%
rename from cli/polyaxon/cli/executor/__init__.py
rename to polyaxon/cli/executor/__init__.py
diff --git a/cli/polyaxon/cli/executor/conda.py b/polyaxon/cli/executor/conda.py
similarity index 100%
rename from cli/polyaxon/cli/executor/conda.py
rename to polyaxon/cli/executor/conda.py
diff --git a/cli/polyaxon/cli/executor/docker.py b/polyaxon/cli/executor/docker.py
similarity index 100%
rename from cli/polyaxon/cli/executor/docker.py
rename to polyaxon/cli/executor/docker.py
diff --git a/cli/polyaxon/cli/executor/k8s.py b/polyaxon/cli/executor/k8s.py
similarity index 100%
rename from cli/polyaxon/cli/executor/k8s.py
rename to polyaxon/cli/executor/k8s.py
diff --git a/cli/polyaxon/cli/executor/platform.py b/polyaxon/cli/executor/platform.py
similarity index 100%
rename from cli/polyaxon/cli/executor/platform.py
rename to polyaxon/cli/executor/platform.py
diff --git a/cli/polyaxon/cli/init.py b/polyaxon/cli/init.py
similarity index 100%
rename from cli/polyaxon/cli/init.py
rename to polyaxon/cli/init.py
diff --git a/cli/polyaxon/cli/models.py b/polyaxon/cli/models.py
similarity index 100%
rename from cli/polyaxon/cli/models.py
rename to polyaxon/cli/models.py
diff --git a/cli/polyaxon/cli/operations.py b/polyaxon/cli/operations.py
similarity index 100%
rename from cli/polyaxon/cli/operations.py
rename to polyaxon/cli/operations.py
diff --git a/cli/polyaxon/cli/options.py b/polyaxon/cli/options.py
similarity index 100%
rename from cli/polyaxon/cli/options.py
rename to polyaxon/cli/options.py
diff --git a/cli/polyaxon/cli/port_forward.py b/polyaxon/cli/port_forward.py
similarity index 100%
rename from cli/polyaxon/cli/port_forward.py
rename to polyaxon/cli/port_forward.py
diff --git a/cli/polyaxon/cli/project_versions.py b/polyaxon/cli/project_versions.py
similarity index 100%
rename from cli/polyaxon/cli/project_versions.py
rename to polyaxon/cli/project_versions.py
diff --git a/cli/polyaxon/cli/projects.py b/polyaxon/cli/projects.py
similarity index 100%
rename from cli/polyaxon/cli/projects.py
rename to polyaxon/cli/projects.py
diff --git a/cli/polyaxon/cli/run.py b/polyaxon/cli/run.py
similarity index 100%
rename from cli/polyaxon/cli/run.py
rename to polyaxon/cli/run.py
diff --git a/cli/polyaxon/cli/services/__init__.py b/polyaxon/cli/services/__init__.py
similarity index 100%
rename from cli/polyaxon/cli/services/__init__.py
rename to polyaxon/cli/services/__init__.py
diff --git a/cli/polyaxon/cli/services/agent.py b/polyaxon/cli/services/agent.py
similarity index 100%
rename from cli/polyaxon/cli/services/agent.py
rename to polyaxon/cli/services/agent.py
diff --git a/cli/polyaxon/cli/services/clean_artifacts.py b/polyaxon/cli/services/clean_artifacts.py
similarity index 100%
rename from cli/polyaxon/cli/services/clean_artifacts.py
rename to polyaxon/cli/services/clean_artifacts.py
diff --git a/cli/polyaxon/cli/services/docker.py b/polyaxon/cli/services/docker.py
similarity index 100%
rename from cli/polyaxon/cli/services/docker.py
rename to polyaxon/cli/services/docker.py
diff --git a/cli/polyaxon/cli/services/initializer.py b/polyaxon/cli/services/initializer.py
similarity index 100%
rename from cli/polyaxon/cli/services/initializer.py
rename to polyaxon/cli/services/initializer.py
diff --git a/cli/polyaxon/cli/services/notifier.py b/polyaxon/cli/services/notifier.py
similarity index 100%
rename from cli/polyaxon/cli/services/notifier.py
rename to polyaxon/cli/services/notifier.py
diff --git a/cli/polyaxon/cli/services/sidecar.py b/polyaxon/cli/services/sidecar.py
similarity index 100%
rename from cli/polyaxon/cli/services/sidecar.py
rename to polyaxon/cli/services/sidecar.py
diff --git a/cli/polyaxon/cli/services/tuner.py b/polyaxon/cli/services/tuner.py
similarity index 100%
rename from cli/polyaxon/cli/services/tuner.py
rename to polyaxon/cli/services/tuner.py
diff --git a/cli/polyaxon/cli/services/wait.py b/polyaxon/cli/services/wait.py
similarity index 100%
rename from cli/polyaxon/cli/services/wait.py
rename to polyaxon/cli/services/wait.py
diff --git a/cli/polyaxon/cli/session.py b/polyaxon/cli/session.py
similarity index 100%
rename from cli/polyaxon/cli/session.py
rename to polyaxon/cli/session.py
diff --git a/cli/polyaxon/cli/utils.py b/polyaxon/cli/utils.py
similarity index 100%
rename from cli/polyaxon/cli/utils.py
rename to polyaxon/cli/utils.py
diff --git a/cli/polyaxon/cli/version.py b/polyaxon/cli/version.py
similarity index 100%
rename from cli/polyaxon/cli/version.py
rename to polyaxon/cli/version.py
diff --git a/cli/polyaxon/client/__init__.py b/polyaxon/client/__init__.py
similarity index 100%
rename from cli/polyaxon/client/__init__.py
rename to polyaxon/client/__init__.py
diff --git a/cli/polyaxon/client/client.py b/polyaxon/client/client.py
similarity index 100%
rename from cli/polyaxon/client/client.py
rename to polyaxon/client/client.py
diff --git a/cli/polyaxon/client/decorators/__init__.py b/polyaxon/client/decorators/__init__.py
similarity index 100%
rename from cli/polyaxon/client/decorators/__init__.py
rename to polyaxon/client/decorators/__init__.py
diff --git a/cli/polyaxon/client/decorators/client_call_handler.py b/polyaxon/client/decorators/client_call_handler.py
similarity index 100%
rename from cli/polyaxon/client/decorators/client_call_handler.py
rename to polyaxon/client/decorators/client_call_handler.py
diff --git a/cli/polyaxon/client/decorators/errors.py b/polyaxon/client/decorators/errors.py
similarity index 100%
rename from cli/polyaxon/client/decorators/errors.py
rename to polyaxon/client/decorators/errors.py
diff --git a/cli/polyaxon/client/decorators/is_managed.py b/polyaxon/client/decorators/is_managed.py
similarity index 100%
rename from cli/polyaxon/client/decorators/is_managed.py
rename to polyaxon/client/decorators/is_managed.py
diff --git a/cli/polyaxon/client/impersonate.py b/polyaxon/client/impersonate.py
similarity index 100%
rename from cli/polyaxon/client/impersonate.py
rename to polyaxon/client/impersonate.py
diff --git a/cli/polyaxon/client/init.py b/polyaxon/client/init.py
similarity index 100%
rename from cli/polyaxon/client/init.py
rename to polyaxon/client/init.py
diff --git a/cli/polyaxon/client/project.py b/polyaxon/client/project.py
similarity index 100%
rename from cli/polyaxon/client/project.py
rename to polyaxon/client/project.py
diff --git a/cli/polyaxon/client/run.py b/polyaxon/client/run.py
similarity index 100%
rename from cli/polyaxon/client/run.py
rename to polyaxon/client/run.py
diff --git a/cli/polyaxon/client/transport/__init__.py b/polyaxon/client/transport/__init__.py
similarity index 100%
rename from cli/polyaxon/client/transport/__init__.py
rename to polyaxon/client/transport/__init__.py
diff --git a/cli/polyaxon/client/transport/http_transport.py b/polyaxon/client/transport/http_transport.py
similarity index 100%
rename from cli/polyaxon/client/transport/http_transport.py
rename to polyaxon/client/transport/http_transport.py
diff --git a/cli/polyaxon/client/transport/periodic_transport.py b/polyaxon/client/transport/periodic_transport.py
similarity index 100%
rename from cli/polyaxon/client/transport/periodic_transport.py
rename to polyaxon/client/transport/periodic_transport.py
diff --git a/cli/polyaxon/client/transport/retry_transport.py b/polyaxon/client/transport/retry_transport.py
similarity index 100%
rename from cli/polyaxon/client/transport/retry_transport.py
rename to polyaxon/client/transport/retry_transport.py
diff --git a/cli/polyaxon/client/transport/socket_transport.py b/polyaxon/client/transport/socket_transport.py
similarity index 100%
rename from cli/polyaxon/client/transport/socket_transport.py
rename to polyaxon/client/transport/socket_transport.py
diff --git a/cli/polyaxon/client/transport/threaded_transport.py b/polyaxon/client/transport/threaded_transport.py
similarity index 100%
rename from cli/polyaxon/client/transport/threaded_transport.py
rename to polyaxon/client/transport/threaded_transport.py
diff --git a/cli/polyaxon/client/transport/ws_client.py b/polyaxon/client/transport/ws_client.py
similarity index 100%
rename from cli/polyaxon/client/transport/ws_client.py
rename to polyaxon/client/transport/ws_client.py
diff --git a/cli/polyaxon/client/workers/__init__.py b/polyaxon/client/workers/__init__.py
similarity index 100%
rename from cli/polyaxon/client/workers/__init__.py
rename to polyaxon/client/workers/__init__.py
diff --git a/cli/polyaxon/client/workers/base_worker.py b/polyaxon/client/workers/base_worker.py
similarity index 100%
rename from cli/polyaxon/client/workers/base_worker.py
rename to polyaxon/client/workers/base_worker.py
diff --git a/cli/polyaxon/client/workers/periodic_worker.py b/polyaxon/client/workers/periodic_worker.py
similarity index 100%
rename from cli/polyaxon/client/workers/periodic_worker.py
rename to polyaxon/client/workers/periodic_worker.py
diff --git a/cli/polyaxon/client/workers/queue_worker.py b/polyaxon/client/workers/queue_worker.py
similarity index 100%
rename from cli/polyaxon/client/workers/queue_worker.py
rename to polyaxon/client/workers/queue_worker.py
diff --git a/cli/polyaxon/config_reader/__init__.py b/polyaxon/config_reader/__init__.py
similarity index 100%
rename from cli/polyaxon/config_reader/__init__.py
rename to polyaxon/config_reader/__init__.py
diff --git a/cli/polyaxon/config_reader/manager.py b/polyaxon/config_reader/manager.py
similarity index 100%
rename from cli/polyaxon/config_reader/manager.py
rename to polyaxon/config_reader/manager.py
diff --git a/cli/polyaxon/config_reader/spec.py b/polyaxon/config_reader/spec.py
similarity index 100%
rename from cli/polyaxon/config_reader/spec.py
rename to polyaxon/config_reader/spec.py
diff --git a/cli/polyaxon/connections/__init__.py b/polyaxon/connections/__init__.py
similarity index 100%
rename from cli/polyaxon/connections/__init__.py
rename to polyaxon/connections/__init__.py
diff --git a/cli/polyaxon/connections/aws/__init__.py b/polyaxon/connections/aws/__init__.py
similarity index 100%
rename from cli/polyaxon/connections/aws/__init__.py
rename to polyaxon/connections/aws/__init__.py
diff --git a/cli/polyaxon/connections/aws/base.py b/polyaxon/connections/aws/base.py
similarity index 100%
rename from cli/polyaxon/connections/aws/base.py
rename to polyaxon/connections/aws/base.py
diff --git a/cli/polyaxon/connections/aws/service.py b/polyaxon/connections/aws/service.py
similarity index 100%
rename from cli/polyaxon/connections/aws/service.py
rename to polyaxon/connections/aws/service.py
diff --git a/cli/polyaxon/connections/azure/__init__.py b/polyaxon/connections/azure/__init__.py
similarity index 100%
rename from cli/polyaxon/connections/azure/__init__.py
rename to polyaxon/connections/azure/__init__.py
diff --git a/cli/polyaxon/connections/azure/base.py b/polyaxon/connections/azure/base.py
similarity index 100%
rename from cli/polyaxon/connections/azure/base.py
rename to polyaxon/connections/azure/base.py
diff --git a/cli/polyaxon/connections/azure/service.py b/polyaxon/connections/azure/service.py
similarity index 100%
rename from cli/polyaxon/connections/azure/service.py
rename to polyaxon/connections/azure/service.py
diff --git a/cli/polyaxon/connections/base.py b/polyaxon/connections/base.py
similarity index 100%
rename from cli/polyaxon/connections/base.py
rename to polyaxon/connections/base.py
diff --git a/cli/polyaxon/connections/gcp/__init__.py b/polyaxon/connections/gcp/__init__.py
similarity index 100%
rename from cli/polyaxon/connections/gcp/__init__.py
rename to polyaxon/connections/gcp/__init__.py
diff --git a/cli/polyaxon/connections/gcp/base.py b/polyaxon/connections/gcp/base.py
similarity index 100%
rename from cli/polyaxon/connections/gcp/base.py
rename to polyaxon/connections/gcp/base.py
diff --git a/cli/polyaxon/connections/gcp/service.py b/polyaxon/connections/gcp/service.py
similarity index 100%
rename from cli/polyaxon/connections/gcp/service.py
rename to polyaxon/connections/gcp/service.py
diff --git a/cli/polyaxon/connections/kinds.py b/polyaxon/connections/kinds.py
similarity index 100%
rename from cli/polyaxon/connections/kinds.py
rename to polyaxon/connections/kinds.py
diff --git a/cli/polyaxon/connections/reader.py b/polyaxon/connections/reader.py
similarity index 100%
rename from cli/polyaxon/connections/reader.py
rename to polyaxon/connections/reader.py
diff --git a/cli/polyaxon/connections/schemas/__init__.py b/polyaxon/connections/schemas/__init__.py
similarity index 100%
rename from cli/polyaxon/connections/schemas/__init__.py
rename to polyaxon/connections/schemas/__init__.py
diff --git a/cli/polyaxon/connections/schemas/connections.py b/polyaxon/connections/schemas/connections.py
similarity index 100%
rename from cli/polyaxon/connections/schemas/connections.py
rename to polyaxon/connections/schemas/connections.py
diff --git a/cli/polyaxon/connections/schemas/k8s_resources.py b/polyaxon/connections/schemas/k8s_resources.py
similarity index 100%
rename from cli/polyaxon/connections/schemas/k8s_resources.py
rename to polyaxon/connections/schemas/k8s_resources.py
diff --git a/cli/polyaxon/constants/__init__.py b/polyaxon/constants/__init__.py
similarity index 100%
rename from cli/polyaxon/constants/__init__.py
rename to polyaxon/constants/__init__.py
diff --git a/cli/polyaxon/constants/globals.py b/polyaxon/constants/globals.py
similarity index 100%
rename from cli/polyaxon/constants/globals.py
rename to polyaxon/constants/globals.py
diff --git a/cli/polyaxon/constants/metadata.py b/polyaxon/constants/metadata.py
similarity index 100%
rename from cli/polyaxon/constants/metadata.py
rename to polyaxon/constants/metadata.py
diff --git a/cli/polyaxon/containers/__init__.py b/polyaxon/containers/__init__.py
similarity index 100%
rename from cli/polyaxon/containers/__init__.py
rename to polyaxon/containers/__init__.py
diff --git a/cli/polyaxon/containers/names.py b/polyaxon/containers/names.py
similarity index 100%
rename from cli/polyaxon/containers/names.py
rename to polyaxon/containers/names.py
diff --git a/cli/polyaxon/containers/pull_policy.py b/polyaxon/containers/pull_policy.py
similarity index 100%
rename from cli/polyaxon/containers/pull_policy.py
rename to polyaxon/containers/pull_policy.py
diff --git a/cli/polyaxon/containers/statuses.py b/polyaxon/containers/statuses.py
similarity index 100%
rename from cli/polyaxon/containers/statuses.py
rename to polyaxon/containers/statuses.py
diff --git a/cli/polyaxon/contexts/__init__.py b/polyaxon/contexts/__init__.py
similarity index 100%
rename from cli/polyaxon/contexts/__init__.py
rename to polyaxon/contexts/__init__.py
diff --git a/cli/polyaxon/contexts/keys.py b/polyaxon/contexts/keys.py
similarity index 100%
rename from cli/polyaxon/contexts/keys.py
rename to polyaxon/contexts/keys.py
diff --git a/cli/polyaxon/contexts/params.py b/polyaxon/contexts/params.py
similarity index 100%
rename from cli/polyaxon/contexts/params.py
rename to polyaxon/contexts/params.py
diff --git a/cli/polyaxon/contexts/paths.py b/polyaxon/contexts/paths.py
similarity index 100%
rename from cli/polyaxon/contexts/paths.py
rename to polyaxon/contexts/paths.py
diff --git a/cli/polyaxon/contexts/refs.py b/polyaxon/contexts/refs.py
similarity index 100%
rename from cli/polyaxon/contexts/refs.py
rename to polyaxon/contexts/refs.py
diff --git a/cli/polyaxon/contexts/sections.py b/polyaxon/contexts/sections.py
similarity index 100%
rename from cli/polyaxon/contexts/sections.py
rename to polyaxon/contexts/sections.py
diff --git a/cli/polyaxon/deploy/__init__.py b/polyaxon/deploy/__init__.py
similarity index 100%
rename from cli/polyaxon/deploy/__init__.py
rename to polyaxon/deploy/__init__.py
diff --git a/cli/polyaxon/deploy/operators/__init__.py b/polyaxon/deploy/operators/__init__.py
similarity index 100%
rename from cli/polyaxon/deploy/operators/__init__.py
rename to polyaxon/deploy/operators/__init__.py
diff --git a/cli/polyaxon/deploy/operators/cmd_operator.py b/polyaxon/deploy/operators/cmd_operator.py
similarity index 100%
rename from cli/polyaxon/deploy/operators/cmd_operator.py
rename to polyaxon/deploy/operators/cmd_operator.py
diff --git a/cli/polyaxon/deploy/operators/compose.py b/polyaxon/deploy/operators/compose.py
similarity index 100%
rename from cli/polyaxon/deploy/operators/compose.py
rename to polyaxon/deploy/operators/compose.py
diff --git a/cli/polyaxon/deploy/operators/conda.py b/polyaxon/deploy/operators/conda.py
similarity index 100%
rename from cli/polyaxon/deploy/operators/conda.py
rename to polyaxon/deploy/operators/conda.py
diff --git a/cli/polyaxon/deploy/operators/docker.py b/polyaxon/deploy/operators/docker.py
similarity index 100%
rename from cli/polyaxon/deploy/operators/docker.py
rename to polyaxon/deploy/operators/docker.py
diff --git a/cli/polyaxon/deploy/operators/helm.py b/polyaxon/deploy/operators/helm.py
similarity index 100%
rename from cli/polyaxon/deploy/operators/helm.py
rename to polyaxon/deploy/operators/helm.py
diff --git a/cli/polyaxon/deploy/operators/kubectl.py b/polyaxon/deploy/operators/kubectl.py
similarity index 100%
rename from cli/polyaxon/deploy/operators/kubectl.py
rename to polyaxon/deploy/operators/kubectl.py
diff --git a/cli/polyaxon/deploy/operators/pip.py b/polyaxon/deploy/operators/pip.py
similarity index 100%
rename from cli/polyaxon/deploy/operators/pip.py
rename to polyaxon/deploy/operators/pip.py
diff --git a/cli/polyaxon/deploy/reader.py b/polyaxon/deploy/reader.py
similarity index 100%
rename from cli/polyaxon/deploy/reader.py
rename to polyaxon/deploy/reader.py
diff --git a/cli/polyaxon/deploy/schemas/__init__.py b/polyaxon/deploy/schemas/__init__.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/__init__.py
rename to polyaxon/deploy/schemas/__init__.py
diff --git a/cli/polyaxon/deploy/schemas/auth.py b/polyaxon/deploy/schemas/auth.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/auth.py
rename to polyaxon/deploy/schemas/auth.py
diff --git a/cli/polyaxon/deploy/schemas/celery.py b/polyaxon/deploy/schemas/celery.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/celery.py
rename to polyaxon/deploy/schemas/celery.py
diff --git a/cli/polyaxon/deploy/schemas/deployment.py b/polyaxon/deploy/schemas/deployment.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/deployment.py
rename to polyaxon/deploy/schemas/deployment.py
diff --git a/cli/polyaxon/deploy/schemas/deployment_types.py b/polyaxon/deploy/schemas/deployment_types.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/deployment_types.py
rename to polyaxon/deploy/schemas/deployment_types.py
diff --git a/cli/polyaxon/deploy/schemas/email.py b/polyaxon/deploy/schemas/email.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/email.py
rename to polyaxon/deploy/schemas/email.py
diff --git a/cli/polyaxon/deploy/schemas/ingress.py b/polyaxon/deploy/schemas/ingress.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/ingress.py
rename to polyaxon/deploy/schemas/ingress.py
diff --git a/cli/polyaxon/deploy/schemas/intervals.py b/polyaxon/deploy/schemas/intervals.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/intervals.py
rename to polyaxon/deploy/schemas/intervals.py
diff --git a/cli/polyaxon/deploy/schemas/operators.py b/polyaxon/deploy/schemas/operators.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/operators.py
rename to polyaxon/deploy/schemas/operators.py
diff --git a/cli/polyaxon/deploy/schemas/proxy.py b/polyaxon/deploy/schemas/proxy.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/proxy.py
rename to polyaxon/deploy/schemas/proxy.py
diff --git a/cli/polyaxon/deploy/schemas/rbac.py b/polyaxon/deploy/schemas/rbac.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/rbac.py
rename to polyaxon/deploy/schemas/rbac.py
diff --git a/cli/polyaxon/deploy/schemas/root_user.py b/polyaxon/deploy/schemas/root_user.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/root_user.py
rename to polyaxon/deploy/schemas/root_user.py
diff --git a/cli/polyaxon/deploy/schemas/security_context.py b/polyaxon/deploy/schemas/security_context.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/security_context.py
rename to polyaxon/deploy/schemas/security_context.py
diff --git a/cli/polyaxon/deploy/schemas/service.py b/polyaxon/deploy/schemas/service.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/service.py
rename to polyaxon/deploy/schemas/service.py
diff --git a/cli/polyaxon/deploy/schemas/service_types.py b/polyaxon/deploy/schemas/service_types.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/service_types.py
rename to polyaxon/deploy/schemas/service_types.py
diff --git a/cli/polyaxon/deploy/schemas/ssl.py b/polyaxon/deploy/schemas/ssl.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/ssl.py
rename to polyaxon/deploy/schemas/ssl.py
diff --git a/cli/polyaxon/deploy/schemas/ui.py b/polyaxon/deploy/schemas/ui.py
similarity index 100%
rename from cli/polyaxon/deploy/schemas/ui.py
rename to polyaxon/deploy/schemas/ui.py
diff --git a/cli/polyaxon/dist.py b/polyaxon/dist.py
similarity index 100%
rename from cli/polyaxon/dist.py
rename to polyaxon/dist.py
diff --git a/cli/polyaxon/env_vars/__init__.py b/polyaxon/env_vars/__init__.py
similarity index 100%
rename from cli/polyaxon/env_vars/__init__.py
rename to polyaxon/env_vars/__init__.py
diff --git a/cli/polyaxon/env_vars/getters/__init__.py b/polyaxon/env_vars/getters/__init__.py
similarity index 100%
rename from cli/polyaxon/env_vars/getters/__init__.py
rename to polyaxon/env_vars/getters/__init__.py
diff --git a/cli/polyaxon/env_vars/getters/agent.py b/polyaxon/env_vars/getters/agent.py
similarity index 100%
rename from cli/polyaxon/env_vars/getters/agent.py
rename to polyaxon/env_vars/getters/agent.py
diff --git a/cli/polyaxon/env_vars/getters/owner_entity.py b/polyaxon/env_vars/getters/owner_entity.py
similarity index 100%
rename from cli/polyaxon/env_vars/getters/owner_entity.py
rename to polyaxon/env_vars/getters/owner_entity.py
diff --git a/cli/polyaxon/env_vars/getters/project.py b/polyaxon/env_vars/getters/project.py
similarity index 100%
rename from cli/polyaxon/env_vars/getters/project.py
rename to polyaxon/env_vars/getters/project.py
diff --git a/cli/polyaxon/env_vars/getters/queue.py b/polyaxon/env_vars/getters/queue.py
similarity index 100%
rename from cli/polyaxon/env_vars/getters/queue.py
rename to polyaxon/env_vars/getters/queue.py
diff --git a/cli/polyaxon/env_vars/getters/run.py b/polyaxon/env_vars/getters/run.py
similarity index 100%
rename from cli/polyaxon/env_vars/getters/run.py
rename to polyaxon/env_vars/getters/run.py
diff --git a/cli/polyaxon/env_vars/getters/user.py b/polyaxon/env_vars/getters/user.py
similarity index 100%
rename from cli/polyaxon/env_vars/getters/user.py
rename to polyaxon/env_vars/getters/user.py
diff --git a/cli/polyaxon/env_vars/getters/versioned_entity.py b/polyaxon/env_vars/getters/versioned_entity.py
similarity index 100%
rename from cli/polyaxon/env_vars/getters/versioned_entity.py
rename to polyaxon/env_vars/getters/versioned_entity.py
diff --git a/cli/polyaxon/env_vars/keys.py b/polyaxon/env_vars/keys.py
similarity index 100%
rename from cli/polyaxon/env_vars/keys.py
rename to polyaxon/env_vars/keys.py
diff --git a/cli/polyaxon/exceptions.py b/polyaxon/exceptions.py
similarity index 100%
rename from cli/polyaxon/exceptions.py
rename to polyaxon/exceptions.py
diff --git a/cli/polyaxon/fs/__init__.py b/polyaxon/fs/__init__.py
similarity index 100%
rename from cli/polyaxon/fs/__init__.py
rename to polyaxon/fs/__init__.py
diff --git a/cli/polyaxon/fs/async_manager.py b/polyaxon/fs/async_manager.py
similarity index 100%
rename from cli/polyaxon/fs/async_manager.py
rename to polyaxon/fs/async_manager.py
diff --git a/cli/polyaxon/fs/azure.py b/polyaxon/fs/azure.py
similarity index 100%
rename from cli/polyaxon/fs/azure.py
rename to polyaxon/fs/azure.py
diff --git a/cli/polyaxon/fs/fs.py b/polyaxon/fs/fs.py
similarity index 100%
rename from cli/polyaxon/fs/fs.py
rename to polyaxon/fs/fs.py
diff --git a/cli/polyaxon/fs/gcs.py b/polyaxon/fs/gcs.py
similarity index 100%
rename from cli/polyaxon/fs/gcs.py
rename to polyaxon/fs/gcs.py
diff --git a/cli/polyaxon/fs/manager.py b/polyaxon/fs/manager.py
similarity index 100%
rename from cli/polyaxon/fs/manager.py
rename to polyaxon/fs/manager.py
diff --git a/cli/polyaxon/fs/s3.py b/polyaxon/fs/s3.py
similarity index 100%
rename from cli/polyaxon/fs/s3.py
rename to polyaxon/fs/s3.py
diff --git a/cli/polyaxon/fs/tar.py b/polyaxon/fs/tar.py
similarity index 100%
rename from cli/polyaxon/fs/tar.py
rename to polyaxon/fs/tar.py
diff --git a/cli/polyaxon/fs/types.py b/polyaxon/fs/types.py
similarity index 100%
rename from cli/polyaxon/fs/types.py
rename to polyaxon/fs/types.py
diff --git a/cli/polyaxon/fs/watcher.py b/polyaxon/fs/watcher.py
similarity index 100%
rename from cli/polyaxon/fs/watcher.py
rename to polyaxon/fs/watcher.py
diff --git a/cli/polyaxon/init/__init__.py b/polyaxon/init/__init__.py
similarity index 100%
rename from cli/polyaxon/init/__init__.py
rename to polyaxon/init/__init__.py
diff --git a/cli/polyaxon/init/artifacts.py b/polyaxon/init/artifacts.py
similarity index 100%
rename from cli/polyaxon/init/artifacts.py
rename to polyaxon/init/artifacts.py
diff --git a/cli/polyaxon/init/auth.py b/polyaxon/init/auth.py
similarity index 100%
rename from cli/polyaxon/init/auth.py
rename to polyaxon/init/auth.py
diff --git a/cli/polyaxon/init/dockerfile.py b/polyaxon/init/dockerfile.py
similarity index 100%
rename from cli/polyaxon/init/dockerfile.py
rename to polyaxon/init/dockerfile.py
diff --git a/cli/polyaxon/init/file.py b/polyaxon/init/file.py
similarity index 100%
rename from cli/polyaxon/init/file.py
rename to polyaxon/init/file.py
diff --git a/cli/polyaxon/init/git.py b/polyaxon/init/git.py
similarity index 100%
rename from cli/polyaxon/init/git.py
rename to polyaxon/init/git.py
diff --git a/cli/polyaxon/init/tensorboard.py b/polyaxon/init/tensorboard.py
similarity index 100%
rename from cli/polyaxon/init/tensorboard.py
rename to polyaxon/init/tensorboard.py
diff --git a/cli/polyaxon/k8s/__init__.py b/polyaxon/k8s/__init__.py
similarity index 100%
rename from cli/polyaxon/k8s/__init__.py
rename to polyaxon/k8s/__init__.py
diff --git a/cli/polyaxon/k8s/async_manager.py b/polyaxon/k8s/async_manager.py
similarity index 100%
rename from cli/polyaxon/k8s/async_manager.py
rename to polyaxon/k8s/async_manager.py
diff --git a/cli/polyaxon/k8s/constants.py b/polyaxon/k8s/constants.py
similarity index 100%
rename from cli/polyaxon/k8s/constants.py
rename to polyaxon/k8s/constants.py
diff --git a/cli/polyaxon/k8s/custom_resources/__init__.py b/polyaxon/k8s/custom_resources/__init__.py
similarity index 100%
rename from cli/polyaxon/k8s/custom_resources/__init__.py
rename to polyaxon/k8s/custom_resources/__init__.py
diff --git a/cli/polyaxon/k8s/custom_resources/crd.py b/polyaxon/k8s/custom_resources/crd.py
similarity index 100%
rename from cli/polyaxon/k8s/custom_resources/crd.py
rename to polyaxon/k8s/custom_resources/crd.py
diff --git a/cli/polyaxon/k8s/custom_resources/operation.py b/polyaxon/k8s/custom_resources/operation.py
similarity index 100%
rename from cli/polyaxon/k8s/custom_resources/operation.py
rename to polyaxon/k8s/custom_resources/operation.py
diff --git a/cli/polyaxon/k8s/events.py b/polyaxon/k8s/events.py
similarity index 100%
rename from cli/polyaxon/k8s/events.py
rename to polyaxon/k8s/events.py
diff --git a/cli/polyaxon/k8s/k8s_schemas.py b/polyaxon/k8s/k8s_schemas.py
similarity index 100%
rename from cli/polyaxon/k8s/k8s_schemas.py
rename to polyaxon/k8s/k8s_schemas.py
diff --git a/cli/polyaxon/k8s/k8s_validation.py b/polyaxon/k8s/k8s_validation.py
similarity index 100%
rename from cli/polyaxon/k8s/k8s_validation.py
rename to polyaxon/k8s/k8s_validation.py
diff --git a/cli/polyaxon/k8s/logging/__init__.py b/polyaxon/k8s/logging/__init__.py
similarity index 100%
rename from cli/polyaxon/k8s/logging/__init__.py
rename to polyaxon/k8s/logging/__init__.py
diff --git a/cli/polyaxon/k8s/logging/async_monitor.py b/polyaxon/k8s/logging/async_monitor.py
similarity index 100%
rename from cli/polyaxon/k8s/logging/async_monitor.py
rename to polyaxon/k8s/logging/async_monitor.py
diff --git a/cli/polyaxon/k8s/logging/monitor.py b/polyaxon/k8s/logging/monitor.py
similarity index 100%
rename from cli/polyaxon/k8s/logging/monitor.py
rename to polyaxon/k8s/logging/monitor.py
diff --git a/cli/polyaxon/k8s/manager.py b/polyaxon/k8s/manager.py
similarity index 100%
rename from cli/polyaxon/k8s/manager.py
rename to polyaxon/k8s/manager.py
diff --git a/cli/polyaxon/k8s/monitor.py b/polyaxon/k8s/monitor.py
similarity index 100%
rename from cli/polyaxon/k8s/monitor.py
rename to polyaxon/k8s/monitor.py
diff --git a/cli/polyaxon/k8s/namespace.py b/polyaxon/k8s/namespace.py
similarity index 100%
rename from cli/polyaxon/k8s/namespace.py
rename to polyaxon/k8s/namespace.py
diff --git a/cli/polyaxon/k8s/nodes.py b/polyaxon/k8s/nodes.py
similarity index 100%
rename from cli/polyaxon/k8s/nodes.py
rename to polyaxon/k8s/nodes.py
diff --git a/cli/polyaxon/k8s/pods.py b/polyaxon/k8s/pods.py
similarity index 100%
rename from cli/polyaxon/k8s/pods.py
rename to polyaxon/k8s/pods.py
diff --git a/cli/polyaxon/k8s/run_instance.py b/polyaxon/k8s/run_instance.py
similarity index 100%
rename from cli/polyaxon/k8s/run_instance.py
rename to polyaxon/k8s/run_instance.py
diff --git a/cli/polyaxon/lifecycle.py b/polyaxon/lifecycle.py
similarity index 100%
rename from cli/polyaxon/lifecycle.py
rename to polyaxon/lifecycle.py
diff --git a/cli/polyaxon/live_state.py b/polyaxon/live_state.py
similarity index 100%
rename from cli/polyaxon/live_state.py
rename to polyaxon/live_state.py
diff --git a/cli/polyaxon/logger.py b/polyaxon/logger.py
similarity index 100%
rename from cli/polyaxon/logger.py
rename to polyaxon/logger.py
diff --git a/cli/polyaxon/main.py b/polyaxon/main.py
similarity index 100%
rename from cli/polyaxon/main.py
rename to polyaxon/main.py
diff --git a/cli/polyaxon/managers/__init__.py b/polyaxon/managers/__init__.py
similarity index 100%
rename from cli/polyaxon/managers/__init__.py
rename to polyaxon/managers/__init__.py
diff --git a/cli/polyaxon/managers/agent.py b/polyaxon/managers/agent.py
similarity index 100%
rename from cli/polyaxon/managers/agent.py
rename to polyaxon/managers/agent.py
diff --git a/cli/polyaxon/managers/auth.py b/polyaxon/managers/auth.py
similarity index 100%
rename from cli/polyaxon/managers/auth.py
rename to polyaxon/managers/auth.py
diff --git a/cli/polyaxon/managers/base.py b/polyaxon/managers/base.py
similarity index 100%
rename from cli/polyaxon/managers/base.py
rename to polyaxon/managers/base.py
diff --git a/cli/polyaxon/managers/cli.py b/polyaxon/managers/cli.py
similarity index 100%
rename from cli/polyaxon/managers/cli.py
rename to polyaxon/managers/cli.py
diff --git a/cli/polyaxon/managers/client.py b/polyaxon/managers/client.py
similarity index 100%
rename from cli/polyaxon/managers/client.py
rename to polyaxon/managers/client.py
diff --git a/cli/polyaxon/managers/compose.py b/polyaxon/managers/compose.py
similarity index 100%
rename from cli/polyaxon/managers/compose.py
rename to polyaxon/managers/compose.py
diff --git a/cli/polyaxon/managers/deploy.py b/polyaxon/managers/deploy.py
similarity index 100%
rename from cli/polyaxon/managers/deploy.py
rename to polyaxon/managers/deploy.py
diff --git a/cli/polyaxon/managers/git.py b/polyaxon/managers/git.py
similarity index 100%
rename from cli/polyaxon/managers/git.py
rename to polyaxon/managers/git.py
diff --git a/cli/polyaxon/managers/home.py b/polyaxon/managers/home.py
similarity index 100%
rename from cli/polyaxon/managers/home.py
rename to polyaxon/managers/home.py
diff --git a/cli/polyaxon/managers/ignore.py b/polyaxon/managers/ignore.py
similarity index 100%
rename from cli/polyaxon/managers/ignore.py
rename to polyaxon/managers/ignore.py
diff --git a/cli/polyaxon/managers/project.py b/polyaxon/managers/project.py
similarity index 100%
rename from cli/polyaxon/managers/project.py
rename to polyaxon/managers/project.py
diff --git a/cli/polyaxon/managers/run.py b/polyaxon/managers/run.py
similarity index 100%
rename from cli/polyaxon/managers/run.py
rename to polyaxon/managers/run.py
diff --git a/cli/polyaxon/managers/user.py b/polyaxon/managers/user.py
similarity index 100%
rename from cli/polyaxon/managers/user.py
rename to polyaxon/managers/user.py
diff --git a/cli/polyaxon/notifiers/__init__.py b/polyaxon/notifiers/__init__.py
similarity index 100%
rename from cli/polyaxon/notifiers/__init__.py
rename to polyaxon/notifiers/__init__.py
diff --git a/cli/polyaxon/notifiers/base.py b/polyaxon/notifiers/base.py
similarity index 100%
rename from cli/polyaxon/notifiers/base.py
rename to polyaxon/notifiers/base.py
diff --git a/cli/polyaxon/notifiers/discord_webhook.py b/polyaxon/notifiers/discord_webhook.py
similarity index 100%
rename from cli/polyaxon/notifiers/discord_webhook.py
rename to polyaxon/notifiers/discord_webhook.py
diff --git a/cli/polyaxon/notifiers/hipchat_webhook.py b/polyaxon/notifiers/hipchat_webhook.py
similarity index 100%
rename from cli/polyaxon/notifiers/hipchat_webhook.py
rename to polyaxon/notifiers/hipchat_webhook.py
diff --git a/cli/polyaxon/notifiers/keys.py b/polyaxon/notifiers/keys.py
similarity index 100%
rename from cli/polyaxon/notifiers/keys.py
rename to polyaxon/notifiers/keys.py
diff --git a/cli/polyaxon/notifiers/mattermost_webhook.py b/polyaxon/notifiers/mattermost_webhook.py
similarity index 100%
rename from cli/polyaxon/notifiers/mattermost_webhook.py
rename to polyaxon/notifiers/mattermost_webhook.py
diff --git a/cli/polyaxon/notifiers/pagerduty_webhook.py b/polyaxon/notifiers/pagerduty_webhook.py
similarity index 100%
rename from cli/polyaxon/notifiers/pagerduty_webhook.py
rename to polyaxon/notifiers/pagerduty_webhook.py
diff --git a/cli/polyaxon/notifiers/slack_webhook.py b/polyaxon/notifiers/slack_webhook.py
similarity index 100%
rename from cli/polyaxon/notifiers/slack_webhook.py
rename to polyaxon/notifiers/slack_webhook.py
diff --git a/cli/polyaxon/notifiers/spec.py b/polyaxon/notifiers/spec.py
similarity index 100%
rename from cli/polyaxon/notifiers/spec.py
rename to polyaxon/notifiers/spec.py
diff --git a/cli/polyaxon/notifiers/webhook.py b/polyaxon/notifiers/webhook.py
similarity index 100%
rename from cli/polyaxon/notifiers/webhook.py
rename to polyaxon/notifiers/webhook.py
diff --git a/cli/polyaxon/operations/__init__.py b/polyaxon/operations/__init__.py
similarity index 100%
rename from cli/polyaxon/operations/__init__.py
rename to polyaxon/operations/__init__.py
diff --git a/cli/polyaxon/operations/cleaner.py b/polyaxon/operations/cleaner.py
similarity index 100%
rename from cli/polyaxon/operations/cleaner.py
rename to polyaxon/operations/cleaner.py
diff --git a/cli/polyaxon/operations/notifier.py b/polyaxon/operations/notifier.py
similarity index 100%
rename from cli/polyaxon/operations/notifier.py
rename to polyaxon/operations/notifier.py
diff --git a/cli/polyaxon/operations/tuner.py b/polyaxon/operations/tuner.py
similarity index 100%
rename from cli/polyaxon/operations/tuner.py
rename to polyaxon/operations/tuner.py
diff --git a/cli/polyaxon/parser/__init__.py b/polyaxon/parser/__init__.py
similarity index 100%
rename from cli/polyaxon/parser/__init__.py
rename to polyaxon/parser/__init__.py
diff --git a/cli/polyaxon/parser/constants.py b/polyaxon/parser/constants.py
similarity index 100%
rename from cli/polyaxon/parser/constants.py
rename to polyaxon/parser/constants.py
diff --git a/cli/polyaxon/parser/parser.py b/polyaxon/parser/parser.py
similarity index 100%
rename from cli/polyaxon/parser/parser.py
rename to polyaxon/parser/parser.py
diff --git a/cli/polyaxon/pkg.py b/polyaxon/pkg.py
similarity index 100%
rename from cli/polyaxon/pkg.py
rename to polyaxon/pkg.py
diff --git a/cli/polyaxon/plugins/__init__.py b/polyaxon/plugins/__init__.py
similarity index 100%
rename from cli/polyaxon/plugins/__init__.py
rename to polyaxon/plugins/__init__.py
diff --git a/cli/polyaxon/plugins/sentry.py b/polyaxon/plugins/sentry.py
similarity index 100%
rename from cli/polyaxon/plugins/sentry.py
rename to polyaxon/plugins/sentry.py
diff --git a/cli/polyaxon/polyaxonfile/__init__.py b/polyaxon/polyaxonfile/__init__.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/__init__.py
rename to polyaxon/polyaxonfile/__init__.py
diff --git a/cli/polyaxon/polyaxonfile/check.py b/polyaxon/polyaxonfile/check.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/check.py
rename to polyaxon/polyaxonfile/check.py
diff --git a/cli/polyaxon/polyaxonfile/manager/__init__.py b/polyaxon/polyaxonfile/manager/__init__.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/manager/__init__.py
rename to polyaxon/polyaxonfile/manager/__init__.py
diff --git a/cli/polyaxon/polyaxonfile/manager/operations.py b/polyaxon/polyaxonfile/manager/operations.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/manager/operations.py
rename to polyaxon/polyaxonfile/manager/operations.py
diff --git a/cli/polyaxon/polyaxonfile/manager/workflows.py b/polyaxon/polyaxonfile/manager/workflows.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/manager/workflows.py
rename to polyaxon/polyaxonfile/manager/workflows.py
diff --git a/cli/polyaxon/polyaxonfile/params.py b/polyaxon/polyaxonfile/params.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/params.py
rename to polyaxon/polyaxonfile/params.py
diff --git a/cli/polyaxon/polyaxonfile/specs/__init__.py b/polyaxon/polyaxonfile/specs/__init__.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/__init__.py
rename to polyaxon/polyaxonfile/specs/__init__.py
diff --git a/cli/polyaxon/polyaxonfile/specs/base.py b/polyaxon/polyaxonfile/specs/base.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/base.py
rename to polyaxon/polyaxonfile/specs/base.py
diff --git a/cli/polyaxon/polyaxonfile/specs/compiled_operation.py b/polyaxon/polyaxonfile/specs/compiled_operation.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/compiled_operation.py
rename to polyaxon/polyaxonfile/specs/compiled_operation.py
diff --git a/cli/polyaxon/polyaxonfile/specs/component.py b/polyaxon/polyaxonfile/specs/component.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/component.py
rename to polyaxon/polyaxonfile/specs/component.py
diff --git a/cli/polyaxon/polyaxonfile/specs/kinds.py b/polyaxon/polyaxonfile/specs/kinds.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/kinds.py
rename to polyaxon/polyaxonfile/specs/kinds.py
diff --git a/cli/polyaxon/polyaxonfile/specs/libs/__init__.py b/polyaxon/polyaxonfile/specs/libs/__init__.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/libs/__init__.py
rename to polyaxon/polyaxonfile/specs/libs/__init__.py
diff --git a/cli/polyaxon/polyaxonfile/specs/libs/engine.py b/polyaxon/polyaxonfile/specs/libs/engine.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/libs/engine.py
rename to polyaxon/polyaxonfile/specs/libs/engine.py
diff --git a/cli/polyaxon/polyaxonfile/specs/libs/parser.py b/polyaxon/polyaxonfile/specs/libs/parser.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/libs/parser.py
rename to polyaxon/polyaxonfile/specs/libs/parser.py
diff --git a/cli/polyaxon/polyaxonfile/specs/libs/validator.py b/polyaxon/polyaxonfile/specs/libs/validator.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/libs/validator.py
rename to polyaxon/polyaxonfile/specs/libs/validator.py
diff --git a/cli/polyaxon/polyaxonfile/specs/operation.py b/polyaxon/polyaxonfile/specs/operation.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/operation.py
rename to polyaxon/polyaxonfile/specs/operation.py
diff --git a/cli/polyaxon/polyaxonfile/specs/sections.py b/polyaxon/polyaxonfile/specs/sections.py
similarity index 100%
rename from cli/polyaxon/polyaxonfile/specs/sections.py
rename to polyaxon/polyaxonfile/specs/sections.py
diff --git a/cli/polyaxon/polyboard/__init__.py b/polyaxon/polyboard/__init__.py
similarity index 100%
rename from cli/polyaxon/polyboard/__init__.py
rename to polyaxon/polyboard/__init__.py
diff --git a/cli/polyaxon/polyboard/artifacts.py b/polyaxon/polyboard/artifacts.py
similarity index 100%
rename from cli/polyaxon/polyboard/artifacts.py
rename to polyaxon/polyboard/artifacts.py
diff --git a/cli/polyaxon/polyboard/events.py b/polyaxon/polyboard/events.py
similarity index 100%
rename from cli/polyaxon/polyboard/events.py
rename to polyaxon/polyboard/events.py
diff --git a/cli/polyaxon/polyboard/logging.py b/polyaxon/polyboard/logging.py
similarity index 100%
rename from cli/polyaxon/polyboard/logging.py
rename to polyaxon/polyboard/logging.py
diff --git a/cli/polyaxon/polyflow/__init__.py b/polyaxon/polyflow/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/__init__.py
rename to polyaxon/polyflow/__init__.py
diff --git a/cli/polyaxon/polyflow/builds/__init__.py b/polyaxon/polyflow/builds/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/builds/__init__.py
rename to polyaxon/polyflow/builds/__init__.py
diff --git a/cli/polyaxon/polyflow/cache/__init__.py b/polyaxon/polyflow/cache/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/cache/__init__.py
rename to polyaxon/polyflow/cache/__init__.py
diff --git a/cli/polyaxon/polyflow/component/__init__.py b/polyaxon/polyflow/component/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/component/__init__.py
rename to polyaxon/polyflow/component/__init__.py
diff --git a/cli/polyaxon/polyflow/component/base.py b/polyaxon/polyflow/component/base.py
similarity index 100%
rename from cli/polyaxon/polyflow/component/base.py
rename to polyaxon/polyflow/component/base.py
diff --git a/cli/polyaxon/polyflow/component/component.py b/polyaxon/polyflow/component/component.py
similarity index 100%
rename from cli/polyaxon/polyflow/component/component.py
rename to polyaxon/polyflow/component/component.py
diff --git a/cli/polyaxon/polyflow/component/component_reference.py b/polyaxon/polyflow/component/component_reference.py
similarity index 100%
rename from cli/polyaxon/polyflow/component/component_reference.py
rename to polyaxon/polyflow/component/component_reference.py
diff --git a/cli/polyaxon/polyflow/containers/__init__.py b/polyaxon/polyflow/containers/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/containers/__init__.py
rename to polyaxon/polyflow/containers/__init__.py
diff --git a/cli/polyaxon/polyflow/containers/container.py b/polyaxon/polyflow/containers/container.py
similarity index 100%
rename from cli/polyaxon/polyflow/containers/container.py
rename to polyaxon/polyflow/containers/container.py
diff --git a/cli/polyaxon/polyflow/dags/__init__.py b/polyaxon/polyflow/dags/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/dags/__init__.py
rename to polyaxon/polyflow/dags/__init__.py
diff --git a/cli/polyaxon/polyflow/early_stopping/__init__.py b/polyaxon/polyflow/early_stopping/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/early_stopping/__init__.py
rename to polyaxon/polyflow/early_stopping/__init__.py
diff --git a/cli/polyaxon/polyflow/early_stopping/policies.py b/polyaxon/polyflow/early_stopping/policies.py
similarity index 100%
rename from cli/polyaxon/polyflow/early_stopping/policies.py
rename to polyaxon/polyflow/early_stopping/policies.py
diff --git a/cli/polyaxon/polyflow/environment/__init__.py b/polyaxon/polyflow/environment/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/environment/__init__.py
rename to polyaxon/polyflow/environment/__init__.py
diff --git a/cli/polyaxon/polyflow/events/__init__.py b/polyaxon/polyflow/events/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/events/__init__.py
rename to polyaxon/polyflow/events/__init__.py
diff --git a/cli/polyaxon/polyflow/hooks/__init__.py b/polyaxon/polyflow/hooks/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/hooks/__init__.py
rename to polyaxon/polyflow/hooks/__init__.py
diff --git a/cli/polyaxon/polyflow/init/__init__.py b/polyaxon/polyflow/init/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/init/__init__.py
rename to polyaxon/polyflow/init/__init__.py
diff --git a/cli/polyaxon/polyflow/io/__init__.py b/polyaxon/polyflow/io/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/io/__init__.py
rename to polyaxon/polyflow/io/__init__.py
diff --git a/cli/polyaxon/polyflow/io/io.py b/polyaxon/polyflow/io/io.py
similarity index 100%
rename from cli/polyaxon/polyflow/io/io.py
rename to polyaxon/polyflow/io/io.py
diff --git a/cli/polyaxon/polyflow/joins/__init__.py b/polyaxon/polyflow/joins/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/joins/__init__.py
rename to polyaxon/polyflow/joins/__init__.py
diff --git a/cli/polyaxon/polyflow/matrix/__init__.py b/polyaxon/polyflow/matrix/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/__init__.py
rename to polyaxon/polyflow/matrix/__init__.py
diff --git a/cli/polyaxon/polyflow/matrix/base.py b/polyaxon/polyflow/matrix/base.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/base.py
rename to polyaxon/polyflow/matrix/base.py
diff --git a/cli/polyaxon/polyflow/matrix/bayes.py b/polyaxon/polyflow/matrix/bayes.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/bayes.py
rename to polyaxon/polyflow/matrix/bayes.py
diff --git a/cli/polyaxon/polyflow/matrix/grid_search.py b/polyaxon/polyflow/matrix/grid_search.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/grid_search.py
rename to polyaxon/polyflow/matrix/grid_search.py
diff --git a/cli/polyaxon/polyflow/matrix/hyperband.py b/polyaxon/polyflow/matrix/hyperband.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/hyperband.py
rename to polyaxon/polyflow/matrix/hyperband.py
diff --git a/cli/polyaxon/polyflow/matrix/hyperopt.py b/polyaxon/polyflow/matrix/hyperopt.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/hyperopt.py
rename to polyaxon/polyflow/matrix/hyperopt.py
diff --git a/cli/polyaxon/polyflow/matrix/iterative.py b/polyaxon/polyflow/matrix/iterative.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/iterative.py
rename to polyaxon/polyflow/matrix/iterative.py
diff --git a/cli/polyaxon/polyflow/matrix/kinds.py b/polyaxon/polyflow/matrix/kinds.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/kinds.py
rename to polyaxon/polyflow/matrix/kinds.py
diff --git a/cli/polyaxon/polyflow/matrix/mapping.py b/polyaxon/polyflow/matrix/mapping.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/mapping.py
rename to polyaxon/polyflow/matrix/mapping.py
diff --git a/cli/polyaxon/polyflow/matrix/params.py b/polyaxon/polyflow/matrix/params.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/params.py
rename to polyaxon/polyflow/matrix/params.py
diff --git a/cli/polyaxon/polyflow/matrix/random_search.py b/polyaxon/polyflow/matrix/random_search.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/random_search.py
rename to polyaxon/polyflow/matrix/random_search.py
diff --git a/cli/polyaxon/polyflow/matrix/tuner.py b/polyaxon/polyflow/matrix/tuner.py
similarity index 100%
rename from cli/polyaxon/polyflow/matrix/tuner.py
rename to polyaxon/polyflow/matrix/tuner.py
diff --git a/cli/polyaxon/polyflow/mounts/__init__.py b/polyaxon/polyflow/mounts/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/mounts/__init__.py
rename to polyaxon/polyflow/mounts/__init__.py
diff --git a/cli/polyaxon/polyflow/mounts/artifacts_mounts.py b/polyaxon/polyflow/mounts/artifacts_mounts.py
similarity index 100%
rename from cli/polyaxon/polyflow/mounts/artifacts_mounts.py
rename to polyaxon/polyflow/mounts/artifacts_mounts.py
diff --git a/cli/polyaxon/polyflow/notifications/__init__.py b/polyaxon/polyflow/notifications/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/notifications/__init__.py
rename to polyaxon/polyflow/notifications/__init__.py
diff --git a/cli/polyaxon/polyflow/operations/__init__.py b/polyaxon/polyflow/operations/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/operations/__init__.py
rename to polyaxon/polyflow/operations/__init__.py
diff --git a/cli/polyaxon/polyflow/operations/base.py b/polyaxon/polyflow/operations/base.py
similarity index 100%
rename from cli/polyaxon/polyflow/operations/base.py
rename to polyaxon/polyflow/operations/base.py
diff --git a/cli/polyaxon/polyflow/operations/compiled_operation.py b/polyaxon/polyflow/operations/compiled_operation.py
similarity index 100%
rename from cli/polyaxon/polyflow/operations/compiled_operation.py
rename to polyaxon/polyflow/operations/compiled_operation.py
diff --git a/cli/polyaxon/polyflow/operations/operation.py b/polyaxon/polyflow/operations/operation.py
similarity index 100%
rename from cli/polyaxon/polyflow/operations/operation.py
rename to polyaxon/polyflow/operations/operation.py
diff --git a/cli/polyaxon/polyflow/operators.py b/polyaxon/polyflow/operators.py
similarity index 100%
rename from cli/polyaxon/polyflow/operators.py
rename to polyaxon/polyflow/operators.py
diff --git a/cli/polyaxon/polyflow/optimization/__init__.py b/polyaxon/polyflow/optimization/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/optimization/__init__.py
rename to polyaxon/polyflow/optimization/__init__.py
diff --git a/cli/polyaxon/polyflow/params/__init__.py b/polyaxon/polyflow/params/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/params/__init__.py
rename to polyaxon/polyflow/params/__init__.py
diff --git a/cli/polyaxon/polyflow/params/ops_params.py b/polyaxon/polyflow/params/ops_params.py
similarity index 100%
rename from cli/polyaxon/polyflow/params/ops_params.py
rename to polyaxon/polyflow/params/ops_params.py
diff --git a/cli/polyaxon/polyflow/params/params.py b/polyaxon/polyflow/params/params.py
similarity index 100%
rename from cli/polyaxon/polyflow/params/params.py
rename to polyaxon/polyflow/params/params.py
diff --git a/cli/polyaxon/polyflow/plugins/__init__.py b/polyaxon/polyflow/plugins/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/plugins/__init__.py
rename to polyaxon/polyflow/plugins/__init__.py
diff --git a/cli/polyaxon/polyflow/references/__init__.py b/polyaxon/polyflow/references/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/references/__init__.py
rename to polyaxon/polyflow/references/__init__.py
diff --git a/cli/polyaxon/polyflow/references/dag.py b/polyaxon/polyflow/references/dag.py
similarity index 100%
rename from cli/polyaxon/polyflow/references/dag.py
rename to polyaxon/polyflow/references/dag.py
diff --git a/cli/polyaxon/polyflow/references/hub.py b/polyaxon/polyflow/references/hub.py
similarity index 100%
rename from cli/polyaxon/polyflow/references/hub.py
rename to polyaxon/polyflow/references/hub.py
diff --git a/cli/polyaxon/polyflow/references/mixin.py b/polyaxon/polyflow/references/mixin.py
similarity index 100%
rename from cli/polyaxon/polyflow/references/mixin.py
rename to polyaxon/polyflow/references/mixin.py
diff --git a/cli/polyaxon/polyflow/references/path.py b/polyaxon/polyflow/references/path.py
similarity index 100%
rename from cli/polyaxon/polyflow/references/path.py
rename to polyaxon/polyflow/references/path.py
diff --git a/cli/polyaxon/polyflow/references/url.py b/polyaxon/polyflow/references/url.py
similarity index 100%
rename from cli/polyaxon/polyflow/references/url.py
rename to polyaxon/polyflow/references/url.py
diff --git a/cli/polyaxon/polyflow/run/__init__.py b/polyaxon/polyflow/run/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/__init__.py
rename to polyaxon/polyflow/run/__init__.py
diff --git a/cli/polyaxon/polyflow/run/base.py b/polyaxon/polyflow/run/base.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/base.py
rename to polyaxon/polyflow/run/base.py
diff --git a/cli/polyaxon/polyflow/run/cleaner.py b/polyaxon/polyflow/run/cleaner.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/cleaner.py
rename to polyaxon/polyflow/run/cleaner.py
diff --git a/cli/polyaxon/polyflow/run/dag.py b/polyaxon/polyflow/run/dag.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/dag.py
rename to polyaxon/polyflow/run/dag.py
diff --git a/cli/polyaxon/polyflow/run/dask.py b/polyaxon/polyflow/run/dask.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/dask.py
rename to polyaxon/polyflow/run/dask.py
diff --git a/cli/polyaxon/polyflow/run/flink.py b/polyaxon/polyflow/run/flink.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/flink.py
rename to polyaxon/polyflow/run/flink.py
diff --git a/cli/polyaxon/polyflow/run/job.py b/polyaxon/polyflow/run/job.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/job.py
rename to polyaxon/polyflow/run/job.py
diff --git a/cli/polyaxon/polyflow/run/kinds.py b/polyaxon/polyflow/run/kinds.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kinds.py
rename to polyaxon/polyflow/run/kinds.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/__init__.py b/polyaxon/polyflow/run/kubeflow/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/__init__.py
rename to polyaxon/polyflow/run/kubeflow/__init__.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/clean_pod_policy.py b/polyaxon/polyflow/run/kubeflow/clean_pod_policy.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/clean_pod_policy.py
rename to polyaxon/polyflow/run/kubeflow/clean_pod_policy.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/mpi_job.py b/polyaxon/polyflow/run/kubeflow/mpi_job.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/mpi_job.py
rename to polyaxon/polyflow/run/kubeflow/mpi_job.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/mx_job.py b/polyaxon/polyflow/run/kubeflow/mx_job.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/mx_job.py
rename to polyaxon/polyflow/run/kubeflow/mx_job.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/paddle_job.py b/polyaxon/polyflow/run/kubeflow/paddle_job.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/paddle_job.py
rename to polyaxon/polyflow/run/kubeflow/paddle_job.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/pytorch_job.py b/polyaxon/polyflow/run/kubeflow/pytorch_job.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/pytorch_job.py
rename to polyaxon/polyflow/run/kubeflow/pytorch_job.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/replica.py b/polyaxon/polyflow/run/kubeflow/replica.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/replica.py
rename to polyaxon/polyflow/run/kubeflow/replica.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/scheduling_policy.py b/polyaxon/polyflow/run/kubeflow/scheduling_policy.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/scheduling_policy.py
rename to polyaxon/polyflow/run/kubeflow/scheduling_policy.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/tf_job.py b/polyaxon/polyflow/run/kubeflow/tf_job.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/tf_job.py
rename to polyaxon/polyflow/run/kubeflow/tf_job.py
diff --git a/cli/polyaxon/polyflow/run/kubeflow/xgboost_job.py b/polyaxon/polyflow/run/kubeflow/xgboost_job.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/kubeflow/xgboost_job.py
rename to polyaxon/polyflow/run/kubeflow/xgboost_job.py
diff --git a/cli/polyaxon/polyflow/run/notifier.py b/polyaxon/polyflow/run/notifier.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/notifier.py
rename to polyaxon/polyflow/run/notifier.py
diff --git a/cli/polyaxon/polyflow/run/patch.py b/polyaxon/polyflow/run/patch.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/patch.py
rename to polyaxon/polyflow/run/patch.py
diff --git a/cli/polyaxon/polyflow/run/ray.py b/polyaxon/polyflow/run/ray.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/ray.py
rename to polyaxon/polyflow/run/ray.py
diff --git a/cli/polyaxon/polyflow/run/resources.py b/polyaxon/polyflow/run/resources.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/resources.py
rename to polyaxon/polyflow/run/resources.py
diff --git a/cli/polyaxon/polyflow/run/service.py b/polyaxon/polyflow/run/service.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/service.py
rename to polyaxon/polyflow/run/service.py
diff --git a/cli/polyaxon/polyflow/run/spark/__init__.py b/polyaxon/polyflow/run/spark/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/spark/__init__.py
rename to polyaxon/polyflow/run/spark/__init__.py
diff --git a/cli/polyaxon/polyflow/run/spark/replica.py b/polyaxon/polyflow/run/spark/replica.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/spark/replica.py
rename to polyaxon/polyflow/run/spark/replica.py
diff --git a/cli/polyaxon/polyflow/run/spark/spark.py b/polyaxon/polyflow/run/spark/spark.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/spark/spark.py
rename to polyaxon/polyflow/run/spark/spark.py
diff --git a/cli/polyaxon/polyflow/run/tuner.py b/polyaxon/polyflow/run/tuner.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/tuner.py
rename to polyaxon/polyflow/run/tuner.py
diff --git a/cli/polyaxon/polyflow/run/utils.py b/polyaxon/polyflow/run/utils.py
similarity index 100%
rename from cli/polyaxon/polyflow/run/utils.py
rename to polyaxon/polyflow/run/utils.py
diff --git a/cli/polyaxon/polyflow/schedules/__init__.py b/polyaxon/polyflow/schedules/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/schedules/__init__.py
rename to polyaxon/polyflow/schedules/__init__.py
diff --git a/cli/polyaxon/polyflow/schedules/cron.py b/polyaxon/polyflow/schedules/cron.py
similarity index 100%
rename from cli/polyaxon/polyflow/schedules/cron.py
rename to polyaxon/polyflow/schedules/cron.py
diff --git a/cli/polyaxon/polyflow/schedules/datetime.py b/polyaxon/polyflow/schedules/datetime.py
similarity index 100%
rename from cli/polyaxon/polyflow/schedules/datetime.py
rename to polyaxon/polyflow/schedules/datetime.py
diff --git a/cli/polyaxon/polyflow/schedules/interval.py b/polyaxon/polyflow/schedules/interval.py
similarity index 100%
rename from cli/polyaxon/polyflow/schedules/interval.py
rename to polyaxon/polyflow/schedules/interval.py
diff --git a/cli/polyaxon/polyflow/schedules/kinds.py b/polyaxon/polyflow/schedules/kinds.py
similarity index 100%
rename from cli/polyaxon/polyflow/schedules/kinds.py
rename to polyaxon/polyflow/schedules/kinds.py
diff --git a/cli/polyaxon/polyflow/templates/__init__.py b/polyaxon/polyflow/templates/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/templates/__init__.py
rename to polyaxon/polyflow/templates/__init__.py
diff --git a/cli/polyaxon/polyflow/termination/__init__.py b/polyaxon/polyflow/termination/__init__.py
similarity index 100%
rename from cli/polyaxon/polyflow/termination/__init__.py
rename to polyaxon/polyflow/termination/__init__.py
diff --git a/cli/polyaxon/polyflow/trigger_policies.py b/polyaxon/polyflow/trigger_policies.py
similarity index 100%
rename from cli/polyaxon/polyflow/trigger_policies.py
rename to polyaxon/polyflow/trigger_policies.py
diff --git a/cli/polyaxon/polyplot/__init__.py b/polyaxon/polyplot/__init__.py
similarity index 100%
rename from cli/polyaxon/polyplot/__init__.py
rename to polyaxon/polyplot/__init__.py
diff --git a/cli/polyaxon/polypod/__init__.py b/polyaxon/polypod/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/__init__.py
rename to polyaxon/polypod/__init__.py
diff --git a/cli/polyaxon/polypod/common/__init__.py b/polyaxon/polypod/common/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/common/__init__.py
rename to polyaxon/polypod/common/__init__.py
diff --git a/cli/polyaxon/polypod/common/accelerators.py b/polyaxon/polypod/common/accelerators.py
similarity index 100%
rename from cli/polyaxon/polypod/common/accelerators.py
rename to polyaxon/polypod/common/accelerators.py
diff --git a/cli/polyaxon/polypod/common/annotations.py b/polyaxon/polypod/common/annotations.py
similarity index 100%
rename from cli/polyaxon/polypod/common/annotations.py
rename to polyaxon/polypod/common/annotations.py
diff --git a/cli/polyaxon/polypod/common/constants.py b/polyaxon/polypod/common/constants.py
similarity index 100%
rename from cli/polyaxon/polypod/common/constants.py
rename to polyaxon/polypod/common/constants.py
diff --git a/cli/polyaxon/polypod/common/container_resources.py b/polyaxon/polypod/common/container_resources.py
similarity index 100%
rename from cli/polyaxon/polypod/common/container_resources.py
rename to polyaxon/polypod/common/container_resources.py
diff --git a/cli/polyaxon/polypod/common/containers.py b/polyaxon/polypod/common/containers.py
similarity index 100%
rename from cli/polyaxon/polypod/common/containers.py
rename to polyaxon/polypod/common/containers.py
diff --git a/cli/polyaxon/polypod/common/env_vars.py b/polyaxon/polypod/common/env_vars.py
similarity index 100%
rename from cli/polyaxon/polypod/common/env_vars.py
rename to polyaxon/polypod/common/env_vars.py
diff --git a/cli/polyaxon/polypod/common/mounts.py b/polyaxon/polypod/common/mounts.py
similarity index 100%
rename from cli/polyaxon/polypod/common/mounts.py
rename to polyaxon/polypod/common/mounts.py
diff --git a/cli/polyaxon/polypod/common/setter.py b/polyaxon/polypod/common/setter.py
similarity index 100%
rename from cli/polyaxon/polypod/common/setter.py
rename to polyaxon/polypod/common/setter.py
diff --git a/cli/polyaxon/polypod/common/stores.py b/polyaxon/polypod/common/stores.py
similarity index 100%
rename from cli/polyaxon/polypod/common/stores.py
rename to polyaxon/polypod/common/stores.py
diff --git a/cli/polyaxon/polypod/common/volumes.py b/polyaxon/polypod/common/volumes.py
similarity index 100%
rename from cli/polyaxon/polypod/common/volumes.py
rename to polyaxon/polypod/common/volumes.py
diff --git a/cli/polyaxon/polypod/compiler/__init__.py b/polyaxon/polypod/compiler/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/__init__.py
rename to polyaxon/polypod/compiler/__init__.py
diff --git a/cli/polyaxon/polypod/compiler/config.py b/polyaxon/polypod/compiler/config.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/config.py
rename to polyaxon/polypod/compiler/config.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/__init__.py b/polyaxon/polypod/compiler/contexts/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/__init__.py
rename to polyaxon/polypod/compiler/contexts/__init__.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/base.py b/polyaxon/polypod/compiler/contexts/base.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/base.py
rename to polyaxon/polypod/compiler/contexts/base.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/contexts.py b/polyaxon/polypod/compiler/contexts/contexts.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/contexts.py
rename to polyaxon/polypod/compiler/contexts/contexts.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/job.py b/polyaxon/polypod/compiler/contexts/job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/job.py
rename to polyaxon/polypod/compiler/contexts/job.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/kubeflow/__init__.py b/polyaxon/polypod/compiler/contexts/kubeflow/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/kubeflow/__init__.py
rename to polyaxon/polypod/compiler/contexts/kubeflow/__init__.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/kubeflow/mpi_job.py b/polyaxon/polypod/compiler/contexts/kubeflow/mpi_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/kubeflow/mpi_job.py
rename to polyaxon/polypod/compiler/contexts/kubeflow/mpi_job.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/kubeflow/mx_job.py b/polyaxon/polypod/compiler/contexts/kubeflow/mx_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/kubeflow/mx_job.py
rename to polyaxon/polypod/compiler/contexts/kubeflow/mx_job.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/kubeflow/paddle_job.py b/polyaxon/polypod/compiler/contexts/kubeflow/paddle_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/kubeflow/paddle_job.py
rename to polyaxon/polypod/compiler/contexts/kubeflow/paddle_job.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/kubeflow/pytroch_job.py b/polyaxon/polypod/compiler/contexts/kubeflow/pytroch_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/kubeflow/pytroch_job.py
rename to polyaxon/polypod/compiler/contexts/kubeflow/pytroch_job.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/kubeflow/tf_job.py b/polyaxon/polypod/compiler/contexts/kubeflow/tf_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/kubeflow/tf_job.py
rename to polyaxon/polypod/compiler/contexts/kubeflow/tf_job.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/kubeflow/xgb_job.py b/polyaxon/polypod/compiler/contexts/kubeflow/xgb_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/kubeflow/xgb_job.py
rename to polyaxon/polypod/compiler/contexts/kubeflow/xgb_job.py
diff --git a/cli/polyaxon/polypod/compiler/contexts/service.py b/polyaxon/polypod/compiler/contexts/service.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/contexts/service.py
rename to polyaxon/polypod/compiler/contexts/service.py
diff --git a/cli/polyaxon/polypod/compiler/converter.py b/polyaxon/polypod/compiler/converter.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converter.py
rename to polyaxon/polypod/compiler/converter.py
diff --git a/cli/polyaxon/polypod/compiler/converters/__init__.py b/polyaxon/polypod/compiler/converters/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/__init__.py
rename to polyaxon/polypod/compiler/converters/__init__.py
diff --git a/cli/polyaxon/polypod/compiler/converters/base.py b/polyaxon/polypod/compiler/converters/base.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/base.py
rename to polyaxon/polypod/compiler/converters/base.py
diff --git a/cli/polyaxon/polypod/compiler/converters/helpers.py b/polyaxon/polypod/compiler/converters/helpers.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/helpers.py
rename to polyaxon/polypod/compiler/converters/helpers.py
diff --git a/cli/polyaxon/polypod/compiler/converters/job.py b/polyaxon/polypod/compiler/converters/job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/job.py
rename to polyaxon/polypod/compiler/converters/job.py
diff --git a/cli/polyaxon/polypod/compiler/converters/kubeflow/__init__.py b/polyaxon/polypod/compiler/converters/kubeflow/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/kubeflow/__init__.py
rename to polyaxon/polypod/compiler/converters/kubeflow/__init__.py
diff --git a/cli/polyaxon/polypod/compiler/converters/kubeflow/mpi_job.py b/polyaxon/polypod/compiler/converters/kubeflow/mpi_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/kubeflow/mpi_job.py
rename to polyaxon/polypod/compiler/converters/kubeflow/mpi_job.py
diff --git a/cli/polyaxon/polypod/compiler/converters/kubeflow/mx_job.py b/polyaxon/polypod/compiler/converters/kubeflow/mx_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/kubeflow/mx_job.py
rename to polyaxon/polypod/compiler/converters/kubeflow/mx_job.py
diff --git a/cli/polyaxon/polypod/compiler/converters/kubeflow/paddle_job.py b/polyaxon/polypod/compiler/converters/kubeflow/paddle_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/kubeflow/paddle_job.py
rename to polyaxon/polypod/compiler/converters/kubeflow/paddle_job.py
diff --git a/cli/polyaxon/polypod/compiler/converters/kubeflow/pytroch_job.py b/polyaxon/polypod/compiler/converters/kubeflow/pytroch_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/kubeflow/pytroch_job.py
rename to polyaxon/polypod/compiler/converters/kubeflow/pytroch_job.py
diff --git a/cli/polyaxon/polypod/compiler/converters/kubeflow/tf_job.py b/polyaxon/polypod/compiler/converters/kubeflow/tf_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/kubeflow/tf_job.py
rename to polyaxon/polypod/compiler/converters/kubeflow/tf_job.py
diff --git a/cli/polyaxon/polypod/compiler/converters/kubeflow/xgboost_job.py b/polyaxon/polypod/compiler/converters/kubeflow/xgboost_job.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/kubeflow/xgboost_job.py
rename to polyaxon/polypod/compiler/converters/kubeflow/xgboost_job.py
diff --git a/cli/polyaxon/polypod/compiler/converters/service.py b/polyaxon/polypod/compiler/converters/service.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/converters/service.py
rename to polyaxon/polypod/compiler/converters/service.py
diff --git a/cli/polyaxon/polypod/compiler/lineage/__init__.py b/polyaxon/polypod/compiler/lineage/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/lineage/__init__.py
rename to polyaxon/polypod/compiler/lineage/__init__.py
diff --git a/cli/polyaxon/polypod/compiler/lineage/artifacts_collector.py b/polyaxon/polypod/compiler/lineage/artifacts_collector.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/lineage/artifacts_collector.py
rename to polyaxon/polypod/compiler/lineage/artifacts_collector.py
diff --git a/cli/polyaxon/polypod/compiler/lineage/collector.py b/polyaxon/polypod/compiler/lineage/collector.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/lineage/collector.py
rename to polyaxon/polypod/compiler/lineage/collector.py
diff --git a/cli/polyaxon/polypod/compiler/lineage/io_collector.py b/polyaxon/polypod/compiler/lineage/io_collector.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/lineage/io_collector.py
rename to polyaxon/polypod/compiler/lineage/io_collector.py
diff --git a/cli/polyaxon/polypod/compiler/lineage/params_collector.py b/polyaxon/polypod/compiler/lineage/params_collector.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/lineage/params_collector.py
rename to polyaxon/polypod/compiler/lineage/params_collector.py
diff --git a/cli/polyaxon/polypod/compiler/resolver/__init__.py b/polyaxon/polypod/compiler/resolver/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/resolver/__init__.py
rename to polyaxon/polypod/compiler/resolver/__init__.py
diff --git a/cli/polyaxon/polypod/compiler/resolver/base.py b/polyaxon/polypod/compiler/resolver/base.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/resolver/base.py
rename to polyaxon/polypod/compiler/resolver/base.py
diff --git a/cli/polyaxon/polypod/compiler/resolver/resolver.py b/polyaxon/polypod/compiler/resolver/resolver.py
similarity index 100%
rename from cli/polyaxon/polypod/compiler/resolver/resolver.py
rename to polyaxon/polypod/compiler/resolver/resolver.py
diff --git a/cli/polyaxon/polypod/custom_resources/__init__.py b/polyaxon/polypod/custom_resources/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/__init__.py
rename to polyaxon/polypod/custom_resources/__init__.py
diff --git a/cli/polyaxon/polypod/custom_resources/job.py b/polyaxon/polypod/custom_resources/job.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/job.py
rename to polyaxon/polypod/custom_resources/job.py
diff --git a/cli/polyaxon/polypod/custom_resources/kubeflow/__init__.py b/polyaxon/polypod/custom_resources/kubeflow/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/kubeflow/__init__.py
rename to polyaxon/polypod/custom_resources/kubeflow/__init__.py
diff --git a/cli/polyaxon/polypod/custom_resources/kubeflow/common.py b/polyaxon/polypod/custom_resources/kubeflow/common.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/kubeflow/common.py
rename to polyaxon/polypod/custom_resources/kubeflow/common.py
diff --git a/cli/polyaxon/polypod/custom_resources/kubeflow/mpi_job.py b/polyaxon/polypod/custom_resources/kubeflow/mpi_job.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/kubeflow/mpi_job.py
rename to polyaxon/polypod/custom_resources/kubeflow/mpi_job.py
diff --git a/cli/polyaxon/polypod/custom_resources/kubeflow/mx_job.py b/polyaxon/polypod/custom_resources/kubeflow/mx_job.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/kubeflow/mx_job.py
rename to polyaxon/polypod/custom_resources/kubeflow/mx_job.py
diff --git a/cli/polyaxon/polypod/custom_resources/kubeflow/paddle_job.py b/polyaxon/polypod/custom_resources/kubeflow/paddle_job.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/kubeflow/paddle_job.py
rename to polyaxon/polypod/custom_resources/kubeflow/paddle_job.py
diff --git a/cli/polyaxon/polypod/custom_resources/kubeflow/pytorch_job.py b/polyaxon/polypod/custom_resources/kubeflow/pytorch_job.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/kubeflow/pytorch_job.py
rename to polyaxon/polypod/custom_resources/kubeflow/pytorch_job.py
diff --git a/cli/polyaxon/polypod/custom_resources/kubeflow/tf_job.py b/polyaxon/polypod/custom_resources/kubeflow/tf_job.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/kubeflow/tf_job.py
rename to polyaxon/polypod/custom_resources/kubeflow/tf_job.py
diff --git a/cli/polyaxon/polypod/custom_resources/kubeflow/xgb_job.py b/polyaxon/polypod/custom_resources/kubeflow/xgb_job.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/kubeflow/xgb_job.py
rename to polyaxon/polypod/custom_resources/kubeflow/xgb_job.py
diff --git a/cli/polyaxon/polypod/custom_resources/service.py b/polyaxon/polypod/custom_resources/service.py
similarity index 100%
rename from cli/polyaxon/polypod/custom_resources/service.py
rename to polyaxon/polypod/custom_resources/service.py
diff --git a/cli/polyaxon/polypod/init/__init__.py b/polyaxon/polypod/init/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/init/__init__.py
rename to polyaxon/polypod/init/__init__.py
diff --git a/cli/polyaxon/polypod/init/artifacts.py b/polyaxon/polypod/init/artifacts.py
similarity index 100%
rename from cli/polyaxon/polypod/init/artifacts.py
rename to polyaxon/polypod/init/artifacts.py
diff --git a/cli/polyaxon/polypod/init/auth.py b/polyaxon/polypod/init/auth.py
similarity index 100%
rename from cli/polyaxon/polypod/init/auth.py
rename to polyaxon/polypod/init/auth.py
diff --git a/cli/polyaxon/polypod/init/custom.py b/polyaxon/polypod/init/custom.py
similarity index 100%
rename from cli/polyaxon/polypod/init/custom.py
rename to polyaxon/polypod/init/custom.py
diff --git a/cli/polyaxon/polypod/init/dockerfile.py b/polyaxon/polypod/init/dockerfile.py
similarity index 100%
rename from cli/polyaxon/polypod/init/dockerfile.py
rename to polyaxon/polypod/init/dockerfile.py
diff --git a/cli/polyaxon/polypod/init/file.py b/polyaxon/polypod/init/file.py
similarity index 100%
rename from cli/polyaxon/polypod/init/file.py
rename to polyaxon/polypod/init/file.py
diff --git a/cli/polyaxon/polypod/init/git.py b/polyaxon/polypod/init/git.py
similarity index 100%
rename from cli/polyaxon/polypod/init/git.py
rename to polyaxon/polypod/init/git.py
diff --git a/cli/polyaxon/polypod/init/store.py b/polyaxon/polypod/init/store.py
similarity index 100%
rename from cli/polyaxon/polypod/init/store.py
rename to polyaxon/polypod/init/store.py
diff --git a/cli/polyaxon/polypod/init/tensorboard.py b/polyaxon/polypod/init/tensorboard.py
similarity index 100%
rename from cli/polyaxon/polypod/init/tensorboard.py
rename to polyaxon/polypod/init/tensorboard.py
diff --git a/cli/polyaxon/polypod/main/__init__.py b/polyaxon/polypod/main/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/main/__init__.py
rename to polyaxon/polypod/main/__init__.py
diff --git a/cli/polyaxon/polypod/main/container.py b/polyaxon/polypod/main/container.py
similarity index 100%
rename from cli/polyaxon/polypod/main/container.py
rename to polyaxon/polypod/main/container.py
diff --git a/cli/polyaxon/polypod/main/env_vars.py b/polyaxon/polypod/main/env_vars.py
similarity index 100%
rename from cli/polyaxon/polypod/main/env_vars.py
rename to polyaxon/polypod/main/env_vars.py
diff --git a/cli/polyaxon/polypod/main/k8s_resources.py b/polyaxon/polypod/main/k8s_resources.py
similarity index 100%
rename from cli/polyaxon/polypod/main/k8s_resources.py
rename to polyaxon/polypod/main/k8s_resources.py
diff --git a/cli/polyaxon/polypod/main/volumes.py b/polyaxon/polypod/main/volumes.py
similarity index 100%
rename from cli/polyaxon/polypod/main/volumes.py
rename to polyaxon/polypod/main/volumes.py
diff --git a/cli/polyaxon/polypod/mixins.py b/polyaxon/polypod/mixins.py
similarity index 100%
rename from cli/polyaxon/polypod/mixins.py
rename to polyaxon/polypod/mixins.py
diff --git a/cli/polyaxon/polypod/pod/__init__.py b/polyaxon/polypod/pod/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/pod/__init__.py
rename to polyaxon/polypod/pod/__init__.py
diff --git a/cli/polyaxon/polypod/pod/spec.py b/polyaxon/polypod/pod/spec.py
similarity index 100%
rename from cli/polyaxon/polypod/pod/spec.py
rename to polyaxon/polypod/pod/spec.py
diff --git a/cli/polyaxon/polypod/pod/volumes.py b/polyaxon/polypod/pod/volumes.py
similarity index 100%
rename from cli/polyaxon/polypod/pod/volumes.py
rename to polyaxon/polypod/pod/volumes.py
diff --git a/cli/polyaxon/polypod/sidecar/__init__.py b/polyaxon/polypod/sidecar/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/sidecar/__init__.py
rename to polyaxon/polypod/sidecar/__init__.py
diff --git a/cli/polyaxon/polypod/sidecar/container.py b/polyaxon/polypod/sidecar/container.py
similarity index 100%
rename from cli/polyaxon/polypod/sidecar/container.py
rename to polyaxon/polypod/sidecar/container.py
diff --git a/cli/polyaxon/polypod/sidecar/env_vars.py b/polyaxon/polypod/sidecar/env_vars.py
similarity index 100%
rename from cli/polyaxon/polypod/sidecar/env_vars.py
rename to polyaxon/polypod/sidecar/env_vars.py
diff --git a/cli/polyaxon/polypod/specs/__init__.py b/polyaxon/polypod/specs/__init__.py
similarity index 100%
rename from cli/polyaxon/polypod/specs/__init__.py
rename to polyaxon/polypod/specs/__init__.py
diff --git a/cli/polyaxon/polypod/specs/contexts.py b/polyaxon/polypod/specs/contexts.py
similarity index 100%
rename from cli/polyaxon/polypod/specs/contexts.py
rename to polyaxon/polypod/specs/contexts.py
diff --git a/cli/polyaxon/polypod/specs/replica.py b/polyaxon/polypod/specs/replica.py
similarity index 100%
rename from cli/polyaxon/polypod/specs/replica.py
rename to polyaxon/polypod/specs/replica.py
diff --git a/cli/polyaxon/polytune/__init__.py b/polyaxon/polytune/__init__.py
similarity index 100%
rename from cli/polyaxon/polytune/__init__.py
rename to polyaxon/polytune/__init__.py
diff --git a/cli/polyaxon/polytune/search_managers/__init__.py b/polyaxon/polytune/search_managers/__init__.py
similarity index 100%
rename from cli/polyaxon/polytune/search_managers/__init__.py
rename to polyaxon/polytune/search_managers/__init__.py
diff --git a/cli/polyaxon/polytune/search_managers/bayesian_optimization/__init__.py b/polyaxon/polytune/search_managers/bayesian_optimization/__init__.py
similarity index 100%
rename from cli/polyaxon/polytune/search_managers/bayesian_optimization/__init__.py
rename to polyaxon/polytune/search_managers/bayesian_optimization/__init__.py
diff --git a/cli/polyaxon/polytune/search_managers/grid_search/__init__.py b/polyaxon/polytune/search_managers/grid_search/__init__.py
similarity index 100%
rename from cli/polyaxon/polytune/search_managers/grid_search/__init__.py
rename to polyaxon/polytune/search_managers/grid_search/__init__.py
diff --git a/cli/polyaxon/polytune/search_managers/hyperband/__init__.py b/polyaxon/polytune/search_managers/hyperband/__init__.py
similarity index 100%
rename from cli/polyaxon/polytune/search_managers/hyperband/__init__.py
rename to polyaxon/polytune/search_managers/hyperband/__init__.py
diff --git a/cli/polyaxon/polytune/search_managers/hyperopt/__init__.py b/polyaxon/polytune/search_managers/hyperopt/__init__.py
similarity index 100%
rename from cli/polyaxon/polytune/search_managers/hyperopt/__init__.py
rename to polyaxon/polytune/search_managers/hyperopt/__init__.py
diff --git a/cli/polyaxon/polytune/search_managers/mapping/__init__.py b/polyaxon/polytune/search_managers/mapping/__init__.py
similarity index 100%
rename from cli/polyaxon/polytune/search_managers/mapping/__init__.py
rename to polyaxon/polytune/search_managers/mapping/__init__.py
diff --git a/cli/polyaxon/polytune/search_managers/random_search/__init__.py b/polyaxon/polytune/search_managers/random_search/__init__.py
similarity index 100%
rename from cli/polyaxon/polytune/search_managers/random_search/__init__.py
rename to polyaxon/polytune/search_managers/random_search/__init__.py
diff --git a/cli/polyaxon/pql/__init__.py b/polyaxon/pql/__init__.py
similarity index 100%
rename from cli/polyaxon/pql/__init__.py
rename to polyaxon/pql/__init__.py
diff --git a/cli/polyaxon/pql/builder.py b/polyaxon/pql/builder.py
similarity index 100%
rename from cli/polyaxon/pql/builder.py
rename to polyaxon/pql/builder.py
diff --git a/cli/polyaxon/pql/manager.py b/polyaxon/pql/manager.py
similarity index 100%
rename from cli/polyaxon/pql/manager.py
rename to polyaxon/pql/manager.py
diff --git a/cli/polyaxon/pql/parser.py b/polyaxon/pql/parser.py
similarity index 100%
rename from cli/polyaxon/pql/parser.py
rename to polyaxon/pql/parser.py
diff --git a/cli/polyaxon/py.typed b/polyaxon/py.typed
similarity index 100%
rename from cli/polyaxon/py.typed
rename to polyaxon/py.typed
diff --git a/cli/polyaxon/schemas/__init__.py b/polyaxon/schemas/__init__.py
similarity index 100%
rename from cli/polyaxon/schemas/__init__.py
rename to polyaxon/schemas/__init__.py
diff --git a/cli/polyaxon/schemas/api/__init__.py b/polyaxon/schemas/api/__init__.py
similarity index 100%
rename from cli/polyaxon/schemas/api/__init__.py
rename to polyaxon/schemas/api/__init__.py
diff --git a/cli/polyaxon/schemas/api/authentication.py b/polyaxon/schemas/api/authentication.py
similarity index 100%
rename from cli/polyaxon/schemas/api/authentication.py
rename to polyaxon/schemas/api/authentication.py
diff --git a/cli/polyaxon/schemas/api/compatibility.py b/polyaxon/schemas/api/compatibility.py
similarity index 100%
rename from cli/polyaxon/schemas/api/compatibility.py
rename to polyaxon/schemas/api/compatibility.py
diff --git a/cli/polyaxon/schemas/api/home.py b/polyaxon/schemas/api/home.py
similarity index 100%
rename from cli/polyaxon/schemas/api/home.py
rename to polyaxon/schemas/api/home.py
diff --git a/cli/polyaxon/schemas/api/installation.py b/polyaxon/schemas/api/installation.py
similarity index 100%
rename from cli/polyaxon/schemas/api/installation.py
rename to polyaxon/schemas/api/installation.py
diff --git a/cli/polyaxon/schemas/api/log_handler.py b/polyaxon/schemas/api/log_handler.py
similarity index 100%
rename from cli/polyaxon/schemas/api/log_handler.py
rename to polyaxon/schemas/api/log_handler.py
diff --git a/cli/polyaxon/schemas/api/resources.py b/polyaxon/schemas/api/resources.py
similarity index 100%
rename from cli/polyaxon/schemas/api/resources.py
rename to polyaxon/schemas/api/resources.py
diff --git a/cli/polyaxon/schemas/api/user.py b/polyaxon/schemas/api/user.py
similarity index 100%
rename from cli/polyaxon/schemas/api/user.py
rename to polyaxon/schemas/api/user.py
diff --git a/cli/polyaxon/schemas/api/version.py b/polyaxon/schemas/api/version.py
similarity index 100%
rename from cli/polyaxon/schemas/api/version.py
rename to polyaxon/schemas/api/version.py
diff --git a/cli/polyaxon/schemas/base.py b/polyaxon/schemas/base.py
similarity index 100%
rename from cli/polyaxon/schemas/base.py
rename to polyaxon/schemas/base.py
diff --git a/cli/polyaxon/schemas/cli/__init__.py b/polyaxon/schemas/cli/__init__.py
similarity index 100%
rename from cli/polyaxon/schemas/cli/__init__.py
rename to polyaxon/schemas/cli/__init__.py
diff --git a/cli/polyaxon/schemas/cli/agent_config.py b/polyaxon/schemas/cli/agent_config.py
similarity index 100%
rename from cli/polyaxon/schemas/cli/agent_config.py
rename to polyaxon/schemas/cli/agent_config.py
diff --git a/cli/polyaxon/schemas/cli/checks_config.py b/polyaxon/schemas/cli/checks_config.py
similarity index 100%
rename from cli/polyaxon/schemas/cli/checks_config.py
rename to polyaxon/schemas/cli/checks_config.py
diff --git a/cli/polyaxon/schemas/cli/cli_config.py b/polyaxon/schemas/cli/cli_config.py
similarity index 100%
rename from cli/polyaxon/schemas/cli/cli_config.py
rename to polyaxon/schemas/cli/cli_config.py
diff --git a/cli/polyaxon/schemas/cli/client_config.py b/polyaxon/schemas/cli/client_config.py
similarity index 100%
rename from cli/polyaxon/schemas/cli/client_config.py
rename to polyaxon/schemas/cli/client_config.py
diff --git a/cli/polyaxon/schemas/fields/__init__.py b/polyaxon/schemas/fields/__init__.py
similarity index 100%
rename from cli/polyaxon/schemas/fields/__init__.py
rename to polyaxon/schemas/fields/__init__.py
diff --git a/cli/polyaxon/schemas/fields/docker_image.py b/polyaxon/schemas/fields/docker_image.py
similarity index 100%
rename from cli/polyaxon/schemas/fields/docker_image.py
rename to polyaxon/schemas/fields/docker_image.py
diff --git a/cli/polyaxon/schemas/fields/email.py b/polyaxon/schemas/fields/email.py
similarity index 100%
rename from cli/polyaxon/schemas/fields/email.py
rename to polyaxon/schemas/fields/email.py
diff --git a/cli/polyaxon/schemas/fields/number.py b/polyaxon/schemas/fields/number.py
similarity index 100%
rename from cli/polyaxon/schemas/fields/number.py
rename to polyaxon/schemas/fields/number.py
diff --git a/cli/polyaxon/schemas/fields/ref_or_obj.py b/polyaxon/schemas/fields/ref_or_obj.py
similarity index 100%
rename from cli/polyaxon/schemas/fields/ref_or_obj.py
rename to polyaxon/schemas/fields/ref_or_obj.py
diff --git a/cli/polyaxon/schemas/fields/uuids.py b/polyaxon/schemas/fields/uuids.py
similarity index 100%
rename from cli/polyaxon/schemas/fields/uuids.py
rename to polyaxon/schemas/fields/uuids.py
diff --git a/cli/polyaxon/schemas/patch_strategy.py b/polyaxon/schemas/patch_strategy.py
similarity index 100%
rename from cli/polyaxon/schemas/patch_strategy.py
rename to polyaxon/schemas/patch_strategy.py
diff --git a/cli/polyaxon/schemas/pending.py b/polyaxon/schemas/pending.py
similarity index 100%
rename from cli/polyaxon/schemas/pending.py
rename to polyaxon/schemas/pending.py
diff --git a/cli/polyaxon/schemas/responses/__init__.py b/polyaxon/schemas/responses/__init__.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/__init__.py
rename to polyaxon/schemas/responses/__init__.py
diff --git a/cli/polyaxon/schemas/responses/v1_activity.py b/polyaxon/schemas/responses/v1_activity.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_activity.py
rename to polyaxon/schemas/responses/v1_activity.py
diff --git a/cli/polyaxon/schemas/responses/v1_agent.py b/polyaxon/schemas/responses/v1_agent.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_agent.py
rename to polyaxon/schemas/responses/v1_agent.py
diff --git a/cli/polyaxon/schemas/responses/v1_agent_state_response.py b/polyaxon/schemas/responses/v1_agent_state_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_agent_state_response.py
rename to polyaxon/schemas/responses/v1_agent_state_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_agent_state_response_agent_state.py b/polyaxon/schemas/responses/v1_agent_state_response_agent_state.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_agent_state_response_agent_state.py
rename to polyaxon/schemas/responses/v1_agent_state_response_agent_state.py
diff --git a/cli/polyaxon/schemas/responses/v1_agent_status_body_request.py b/polyaxon/schemas/responses/v1_agent_status_body_request.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_agent_status_body_request.py
rename to polyaxon/schemas/responses/v1_agent_status_body_request.py
diff --git a/cli/polyaxon/schemas/responses/v1_analytics_spec.py b/polyaxon/schemas/responses/v1_analytics_spec.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_analytics_spec.py
rename to polyaxon/schemas/responses/v1_analytics_spec.py
diff --git a/cli/polyaxon/schemas/responses/v1_artifact_tree.py b/polyaxon/schemas/responses/v1_artifact_tree.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_artifact_tree.py
rename to polyaxon/schemas/responses/v1_artifact_tree.py
diff --git a/cli/polyaxon/schemas/responses/v1_auth.py b/polyaxon/schemas/responses/v1_auth.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_auth.py
rename to polyaxon/schemas/responses/v1_auth.py
diff --git a/cli/polyaxon/schemas/responses/v1_cloning.py b/polyaxon/schemas/responses/v1_cloning.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_cloning.py
rename to polyaxon/schemas/responses/v1_cloning.py
diff --git a/cli/polyaxon/schemas/responses/v1_connection_response.py b/polyaxon/schemas/responses/v1_connection_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_connection_response.py
rename to polyaxon/schemas/responses/v1_connection_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_dashboard.py b/polyaxon/schemas/responses/v1_dashboard.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_dashboard.py
rename to polyaxon/schemas/responses/v1_dashboard.py
diff --git a/cli/polyaxon/schemas/responses/v1_dashboard_spec.py b/polyaxon/schemas/responses/v1_dashboard_spec.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_dashboard_spec.py
rename to polyaxon/schemas/responses/v1_dashboard_spec.py
diff --git a/cli/polyaxon/schemas/responses/v1_entities_tags.py b/polyaxon/schemas/responses/v1_entities_tags.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_entities_tags.py
rename to polyaxon/schemas/responses/v1_entities_tags.py
diff --git a/cli/polyaxon/schemas/responses/v1_entities_transfer.py b/polyaxon/schemas/responses/v1_entities_transfer.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_entities_transfer.py
rename to polyaxon/schemas/responses/v1_entities_transfer.py
diff --git a/cli/polyaxon/schemas/responses/v1_entity_notification_body.py b/polyaxon/schemas/responses/v1_entity_notification_body.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_entity_notification_body.py
rename to polyaxon/schemas/responses/v1_entity_notification_body.py
diff --git a/cli/polyaxon/schemas/responses/v1_entity_stage_body_request.py b/polyaxon/schemas/responses/v1_entity_stage_body_request.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_entity_stage_body_request.py
rename to polyaxon/schemas/responses/v1_entity_stage_body_request.py
diff --git a/cli/polyaxon/schemas/responses/v1_entity_status_body_request.py b/polyaxon/schemas/responses/v1_entity_status_body_request.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_entity_status_body_request.py
rename to polyaxon/schemas/responses/v1_entity_status_body_request.py
diff --git a/cli/polyaxon/schemas/responses/v1_events_response.py b/polyaxon/schemas/responses/v1_events_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_events_response.py
rename to polyaxon/schemas/responses/v1_events_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_activities_response.py b/polyaxon/schemas/responses/v1_list_activities_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_activities_response.py
rename to polyaxon/schemas/responses/v1_list_activities_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_agents_response.py b/polyaxon/schemas/responses/v1_list_agents_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_agents_response.py
rename to polyaxon/schemas/responses/v1_list_agents_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_bookmarks_response.py b/polyaxon/schemas/responses/v1_list_bookmarks_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_bookmarks_response.py
rename to polyaxon/schemas/responses/v1_list_bookmarks_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_connections_response.py b/polyaxon/schemas/responses/v1_list_connections_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_connections_response.py
rename to polyaxon/schemas/responses/v1_list_connections_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_dashboards_response.py b/polyaxon/schemas/responses/v1_list_dashboards_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_dashboards_response.py
rename to polyaxon/schemas/responses/v1_list_dashboards_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_organization_members_response.py b/polyaxon/schemas/responses/v1_list_organization_members_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_organization_members_response.py
rename to polyaxon/schemas/responses/v1_list_organization_members_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_organizations_response.py b/polyaxon/schemas/responses/v1_list_organizations_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_organizations_response.py
rename to polyaxon/schemas/responses/v1_list_organizations_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_presets_response.py b/polyaxon/schemas/responses/v1_list_presets_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_presets_response.py
rename to polyaxon/schemas/responses/v1_list_presets_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_project_versions_response.py b/polyaxon/schemas/responses/v1_list_project_versions_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_project_versions_response.py
rename to polyaxon/schemas/responses/v1_list_project_versions_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_projects_response.py b/polyaxon/schemas/responses/v1_list_projects_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_projects_response.py
rename to polyaxon/schemas/responses/v1_list_projects_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_queues_response.py b/polyaxon/schemas/responses/v1_list_queues_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_queues_response.py
rename to polyaxon/schemas/responses/v1_list_queues_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_run_artifacts_response.py b/polyaxon/schemas/responses/v1_list_run_artifacts_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_run_artifacts_response.py
rename to polyaxon/schemas/responses/v1_list_run_artifacts_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_run_connections_response.py b/polyaxon/schemas/responses/v1_list_run_connections_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_run_connections_response.py
rename to polyaxon/schemas/responses/v1_list_run_connections_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_run_edges_response.py b/polyaxon/schemas/responses/v1_list_run_edges_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_run_edges_response.py
rename to polyaxon/schemas/responses/v1_list_run_edges_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_runs_response.py b/polyaxon/schemas/responses/v1_list_runs_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_runs_response.py
rename to polyaxon/schemas/responses/v1_list_runs_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_searches_response.py b/polyaxon/schemas/responses/v1_list_searches_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_searches_response.py
rename to polyaxon/schemas/responses/v1_list_searches_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_service_accounts_response.py b/polyaxon/schemas/responses/v1_list_service_accounts_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_service_accounts_response.py
rename to polyaxon/schemas/responses/v1_list_service_accounts_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_tags_response.py b/polyaxon/schemas/responses/v1_list_tags_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_tags_response.py
rename to polyaxon/schemas/responses/v1_list_tags_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_team_members_response.py b/polyaxon/schemas/responses/v1_list_team_members_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_team_members_response.py
rename to polyaxon/schemas/responses/v1_list_team_members_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_teams_response.py b/polyaxon/schemas/responses/v1_list_teams_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_teams_response.py
rename to polyaxon/schemas/responses/v1_list_teams_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_list_token_response.py b/polyaxon/schemas/responses/v1_list_token_response.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_list_token_response.py
rename to polyaxon/schemas/responses/v1_list_token_response.py
diff --git a/cli/polyaxon/schemas/responses/v1_operation_body.py b/polyaxon/schemas/responses/v1_operation_body.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_operation_body.py
rename to polyaxon/schemas/responses/v1_operation_body.py
diff --git a/cli/polyaxon/schemas/responses/v1_organization.py b/polyaxon/schemas/responses/v1_organization.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_organization.py
rename to polyaxon/schemas/responses/v1_organization.py
diff --git a/cli/polyaxon/schemas/responses/v1_organization_member.py b/polyaxon/schemas/responses/v1_organization_member.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_organization_member.py
rename to polyaxon/schemas/responses/v1_organization_member.py
diff --git a/cli/polyaxon/schemas/responses/v1_password_change.py b/polyaxon/schemas/responses/v1_password_change.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_password_change.py
rename to polyaxon/schemas/responses/v1_password_change.py
diff --git a/cli/polyaxon/schemas/responses/v1_pipeline.py b/polyaxon/schemas/responses/v1_pipeline.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_pipeline.py
rename to polyaxon/schemas/responses/v1_pipeline.py
diff --git a/cli/polyaxon/schemas/responses/v1_preset.py b/polyaxon/schemas/responses/v1_preset.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_preset.py
rename to polyaxon/schemas/responses/v1_preset.py
diff --git a/cli/polyaxon/schemas/responses/v1_project.py b/polyaxon/schemas/responses/v1_project.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_project.py
rename to polyaxon/schemas/responses/v1_project.py
diff --git a/cli/polyaxon/schemas/responses/v1_project_settings.py b/polyaxon/schemas/responses/v1_project_settings.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_project_settings.py
rename to polyaxon/schemas/responses/v1_project_settings.py
diff --git a/cli/polyaxon/schemas/responses/v1_project_user_access.py b/polyaxon/schemas/responses/v1_project_user_access.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_project_user_access.py
rename to polyaxon/schemas/responses/v1_project_user_access.py
diff --git a/cli/polyaxon/schemas/responses/v1_project_version.py b/polyaxon/schemas/responses/v1_project_version.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_project_version.py
rename to polyaxon/schemas/responses/v1_project_version.py
diff --git a/cli/polyaxon/schemas/responses/v1_queue.py b/polyaxon/schemas/responses/v1_queue.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_queue.py
rename to polyaxon/schemas/responses/v1_queue.py
diff --git a/cli/polyaxon/schemas/responses/v1_run.py b/polyaxon/schemas/responses/v1_run.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_run.py
rename to polyaxon/schemas/responses/v1_run.py
diff --git a/cli/polyaxon/schemas/responses/v1_run_connection.py b/polyaxon/schemas/responses/v1_run_connection.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_run_connection.py
rename to polyaxon/schemas/responses/v1_run_connection.py
diff --git a/cli/polyaxon/schemas/responses/v1_run_edge.py b/polyaxon/schemas/responses/v1_run_edge.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_run_edge.py
rename to polyaxon/schemas/responses/v1_run_edge.py
diff --git a/cli/polyaxon/schemas/responses/v1_run_reference_catalog.py b/polyaxon/schemas/responses/v1_run_reference_catalog.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_run_reference_catalog.py
rename to polyaxon/schemas/responses/v1_run_reference_catalog.py
diff --git a/cli/polyaxon/schemas/responses/v1_run_settings.py b/polyaxon/schemas/responses/v1_run_settings.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_run_settings.py
rename to polyaxon/schemas/responses/v1_run_settings.py
diff --git a/cli/polyaxon/schemas/responses/v1_search.py b/polyaxon/schemas/responses/v1_search.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_search.py
rename to polyaxon/schemas/responses/v1_search.py
diff --git a/cli/polyaxon/schemas/responses/v1_search_spec.py b/polyaxon/schemas/responses/v1_search_spec.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_search_spec.py
rename to polyaxon/schemas/responses/v1_search_spec.py
diff --git a/cli/polyaxon/schemas/responses/v1_section_spec.py b/polyaxon/schemas/responses/v1_section_spec.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_section_spec.py
rename to polyaxon/schemas/responses/v1_section_spec.py
diff --git a/cli/polyaxon/schemas/responses/v1_service_account.py b/polyaxon/schemas/responses/v1_service_account.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_service_account.py
rename to polyaxon/schemas/responses/v1_service_account.py
diff --git a/cli/polyaxon/schemas/responses/v1_settings_catalog.py b/polyaxon/schemas/responses/v1_settings_catalog.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_settings_catalog.py
rename to polyaxon/schemas/responses/v1_settings_catalog.py
diff --git a/cli/polyaxon/schemas/responses/v1_tag.py b/polyaxon/schemas/responses/v1_tag.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_tag.py
rename to polyaxon/schemas/responses/v1_tag.py
diff --git a/cli/polyaxon/schemas/responses/v1_team.py b/polyaxon/schemas/responses/v1_team.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_team.py
rename to polyaxon/schemas/responses/v1_team.py
diff --git a/cli/polyaxon/schemas/responses/v1_team_member.py b/polyaxon/schemas/responses/v1_team_member.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_team_member.py
rename to polyaxon/schemas/responses/v1_team_member.py
diff --git a/cli/polyaxon/schemas/responses/v1_team_settings.py b/polyaxon/schemas/responses/v1_team_settings.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_team_settings.py
rename to polyaxon/schemas/responses/v1_team_settings.py
diff --git a/cli/polyaxon/schemas/responses/v1_token.py b/polyaxon/schemas/responses/v1_token.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_token.py
rename to polyaxon/schemas/responses/v1_token.py
diff --git a/cli/polyaxon/schemas/responses/v1_trial_start.py b/polyaxon/schemas/responses/v1_trial_start.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_trial_start.py
rename to polyaxon/schemas/responses/v1_trial_start.py
diff --git a/cli/polyaxon/schemas/responses/v1_user.py b/polyaxon/schemas/responses/v1_user.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_user.py
rename to polyaxon/schemas/responses/v1_user.py
diff --git a/cli/polyaxon/schemas/responses/v1_user_email.py b/polyaxon/schemas/responses/v1_user_email.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_user_email.py
rename to polyaxon/schemas/responses/v1_user_email.py
diff --git a/cli/polyaxon/schemas/responses/v1_user_singup.py b/polyaxon/schemas/responses/v1_user_singup.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_user_singup.py
rename to polyaxon/schemas/responses/v1_user_singup.py
diff --git a/cli/polyaxon/schemas/responses/v1_uuids.py b/polyaxon/schemas/responses/v1_uuids.py
similarity index 100%
rename from cli/polyaxon/schemas/responses/v1_uuids.py
rename to polyaxon/schemas/responses/v1_uuids.py
diff --git a/cli/polyaxon/schemas/services.py b/polyaxon/schemas/services.py
similarity index 100%
rename from cli/polyaxon/schemas/services.py
rename to polyaxon/schemas/services.py
diff --git a/cli/polyaxon/schemas/types/__init__.py b/polyaxon/schemas/types/__init__.py
similarity index 100%
rename from cli/polyaxon/schemas/types/__init__.py
rename to polyaxon/schemas/types/__init__.py
diff --git a/cli/polyaxon/schemas/types/artifacts.py b/polyaxon/schemas/types/artifacts.py
similarity index 100%
rename from cli/polyaxon/schemas/types/artifacts.py
rename to polyaxon/schemas/types/artifacts.py
diff --git a/cli/polyaxon/schemas/types/auth.py b/polyaxon/schemas/types/auth.py
similarity index 100%
rename from cli/polyaxon/schemas/types/auth.py
rename to polyaxon/schemas/types/auth.py
diff --git a/cli/polyaxon/schemas/types/base.py b/polyaxon/schemas/types/base.py
similarity index 100%
rename from cli/polyaxon/schemas/types/base.py
rename to polyaxon/schemas/types/base.py
diff --git a/cli/polyaxon/schemas/types/connections.py b/polyaxon/schemas/types/connections.py
similarity index 100%
rename from cli/polyaxon/schemas/types/connections.py
rename to polyaxon/schemas/types/connections.py
diff --git a/cli/polyaxon/schemas/types/dockerfile.py b/polyaxon/schemas/types/dockerfile.py
similarity index 100%
rename from cli/polyaxon/schemas/types/dockerfile.py
rename to polyaxon/schemas/types/dockerfile.py
diff --git a/cli/polyaxon/schemas/types/event.py b/polyaxon/schemas/types/event.py
similarity index 100%
rename from cli/polyaxon/schemas/types/event.py
rename to polyaxon/schemas/types/event.py
diff --git a/cli/polyaxon/schemas/types/file.py b/polyaxon/schemas/types/file.py
similarity index 100%
rename from cli/polyaxon/schemas/types/file.py
rename to polyaxon/schemas/types/file.py
diff --git a/cli/polyaxon/schemas/types/gcs.py b/polyaxon/schemas/types/gcs.py
similarity index 100%
rename from cli/polyaxon/schemas/types/gcs.py
rename to polyaxon/schemas/types/gcs.py
diff --git a/cli/polyaxon/schemas/types/git.py b/polyaxon/schemas/types/git.py
similarity index 100%
rename from cli/polyaxon/schemas/types/git.py
rename to polyaxon/schemas/types/git.py
diff --git a/cli/polyaxon/schemas/types/k8s_resources.py b/polyaxon/schemas/types/k8s_resources.py
similarity index 100%
rename from cli/polyaxon/schemas/types/k8s_resources.py
rename to polyaxon/schemas/types/k8s_resources.py
diff --git a/cli/polyaxon/schemas/types/s3.py b/polyaxon/schemas/types/s3.py
similarity index 100%
rename from cli/polyaxon/schemas/types/s3.py
rename to polyaxon/schemas/types/s3.py
diff --git a/cli/polyaxon/schemas/types/tensorboard.py b/polyaxon/schemas/types/tensorboard.py
similarity index 100%
rename from cli/polyaxon/schemas/types/tensorboard.py
rename to polyaxon/schemas/types/tensorboard.py
diff --git a/cli/polyaxon/schemas/types/uri.py b/polyaxon/schemas/types/uri.py
similarity index 100%
rename from cli/polyaxon/schemas/types/uri.py
rename to polyaxon/schemas/types/uri.py
diff --git a/cli/polyaxon/schemas/types/wasb.py b/polyaxon/schemas/types/wasb.py
similarity index 100%
rename from cli/polyaxon/schemas/types/wasb.py
rename to polyaxon/schemas/types/wasb.py
diff --git a/cli/polyaxon/sdk/__init__.py b/polyaxon/sdk/__init__.py
similarity index 100%
rename from cli/polyaxon/sdk/__init__.py
rename to polyaxon/sdk/__init__.py
diff --git a/cli/polyaxon/sdk/api/__init__.py b/polyaxon/sdk/api/__init__.py
similarity index 100%
rename from cli/polyaxon/sdk/api/__init__.py
rename to polyaxon/sdk/api/__init__.py
diff --git a/cli/polyaxon/sdk/api/agents_v1_api.py b/polyaxon/sdk/api/agents_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/agents_v1_api.py
rename to polyaxon/sdk/api/agents_v1_api.py
diff --git a/cli/polyaxon/sdk/api/artifacts_stores_v1_api.py b/polyaxon/sdk/api/artifacts_stores_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/artifacts_stores_v1_api.py
rename to polyaxon/sdk/api/artifacts_stores_v1_api.py
diff --git a/cli/polyaxon/sdk/api/auth_v1_api.py b/polyaxon/sdk/api/auth_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/auth_v1_api.py
rename to polyaxon/sdk/api/auth_v1_api.py
diff --git a/cli/polyaxon/sdk/api/connections_v1_api.py b/polyaxon/sdk/api/connections_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/connections_v1_api.py
rename to polyaxon/sdk/api/connections_v1_api.py
diff --git a/cli/polyaxon/sdk/api/dashboards_v1_api.py b/polyaxon/sdk/api/dashboards_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/dashboards_v1_api.py
rename to polyaxon/sdk/api/dashboards_v1_api.py
diff --git a/cli/polyaxon/sdk/api/organizations_v1_api.py b/polyaxon/sdk/api/organizations_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/organizations_v1_api.py
rename to polyaxon/sdk/api/organizations_v1_api.py
diff --git a/cli/polyaxon/sdk/api/presets_v1_api.py b/polyaxon/sdk/api/presets_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/presets_v1_api.py
rename to polyaxon/sdk/api/presets_v1_api.py
diff --git a/cli/polyaxon/sdk/api/project_dashboards_v1_api.py b/polyaxon/sdk/api/project_dashboards_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/project_dashboards_v1_api.py
rename to polyaxon/sdk/api/project_dashboards_v1_api.py
diff --git a/cli/polyaxon/sdk/api/project_searches_v1_api.py b/polyaxon/sdk/api/project_searches_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/project_searches_v1_api.py
rename to polyaxon/sdk/api/project_searches_v1_api.py
diff --git a/cli/polyaxon/sdk/api/projects_v1_api.py b/polyaxon/sdk/api/projects_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/projects_v1_api.py
rename to polyaxon/sdk/api/projects_v1_api.py
diff --git a/cli/polyaxon/sdk/api/queues_v1_api.py b/polyaxon/sdk/api/queues_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/queues_v1_api.py
rename to polyaxon/sdk/api/queues_v1_api.py
diff --git a/cli/polyaxon/sdk/api/runs_v1_api.py b/polyaxon/sdk/api/runs_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/runs_v1_api.py
rename to polyaxon/sdk/api/runs_v1_api.py
diff --git a/cli/polyaxon/sdk/api/searches_v1_api.py b/polyaxon/sdk/api/searches_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/searches_v1_api.py
rename to polyaxon/sdk/api/searches_v1_api.py
diff --git a/cli/polyaxon/sdk/api/service_accounts_v1_api.py b/polyaxon/sdk/api/service_accounts_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/service_accounts_v1_api.py
rename to polyaxon/sdk/api/service_accounts_v1_api.py
diff --git a/cli/polyaxon/sdk/api/tags_v1_api.py b/polyaxon/sdk/api/tags_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/tags_v1_api.py
rename to polyaxon/sdk/api/tags_v1_api.py
diff --git a/cli/polyaxon/sdk/api/teams_v1_api.py b/polyaxon/sdk/api/teams_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/teams_v1_api.py
rename to polyaxon/sdk/api/teams_v1_api.py
diff --git a/cli/polyaxon/sdk/api/users_v1_api.py b/polyaxon/sdk/api/users_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/users_v1_api.py
rename to polyaxon/sdk/api/users_v1_api.py
diff --git a/cli/polyaxon/sdk/api/versions_v1_api.py b/polyaxon/sdk/api/versions_v1_api.py
similarity index 100%
rename from cli/polyaxon/sdk/api/versions_v1_api.py
rename to polyaxon/sdk/api/versions_v1_api.py
diff --git a/cli/polyaxon/sdk/async_client/__init__.py b/polyaxon/sdk/async_client/__init__.py
similarity index 100%
rename from cli/polyaxon/sdk/async_client/__init__.py
rename to polyaxon/sdk/async_client/__init__.py
diff --git a/cli/polyaxon/sdk/async_client/api_client.py b/polyaxon/sdk/async_client/api_client.py
similarity index 100%
rename from cli/polyaxon/sdk/async_client/api_client.py
rename to polyaxon/sdk/async_client/api_client.py
diff --git a/cli/polyaxon/sdk/async_client/rest.py b/polyaxon/sdk/async_client/rest.py
similarity index 100%
rename from cli/polyaxon/sdk/async_client/rest.py
rename to polyaxon/sdk/async_client/rest.py
diff --git a/cli/polyaxon/sdk/base_api.py b/polyaxon/sdk/base_api.py
similarity index 100%
rename from cli/polyaxon/sdk/base_api.py
rename to polyaxon/sdk/base_api.py
diff --git a/cli/polyaxon/sdk/configuration.py b/polyaxon/sdk/configuration.py
similarity index 100%
rename from cli/polyaxon/sdk/configuration.py
rename to polyaxon/sdk/configuration.py
diff --git a/cli/polyaxon/sdk/exceptions.py b/polyaxon/sdk/exceptions.py
similarity index 100%
rename from cli/polyaxon/sdk/exceptions.py
rename to polyaxon/sdk/exceptions.py
diff --git a/cli/polyaxon/sdk/models.py b/polyaxon/sdk/models.py
similarity index 100%
rename from cli/polyaxon/sdk/models.py
rename to polyaxon/sdk/models.py
diff --git a/cli/polyaxon/sdk/sync_client/__init__.py b/polyaxon/sdk/sync_client/__init__.py
similarity index 100%
rename from cli/polyaxon/sdk/sync_client/__init__.py
rename to polyaxon/sdk/sync_client/__init__.py
diff --git a/cli/polyaxon/sdk/sync_client/api_client.py b/polyaxon/sdk/sync_client/api_client.py
similarity index 100%
rename from cli/polyaxon/sdk/sync_client/api_client.py
rename to polyaxon/sdk/sync_client/api_client.py
diff --git a/cli/polyaxon/sdk/sync_client/rest.py b/polyaxon/sdk/sync_client/rest.py
similarity index 100%
rename from cli/polyaxon/sdk/sync_client/rest.py
rename to polyaxon/sdk/sync_client/rest.py
diff --git a/cli/polyaxon/services/__init__.py b/polyaxon/services/__init__.py
similarity index 100%
rename from cli/polyaxon/services/__init__.py
rename to polyaxon/services/__init__.py
diff --git a/cli/polyaxon/services/auth.py b/polyaxon/services/auth.py
similarity index 100%
rename from cli/polyaxon/services/auth.py
rename to polyaxon/services/auth.py
diff --git a/cli/polyaxon/services/ephemeral.py b/polyaxon/services/ephemeral.py
similarity index 100%
rename from cli/polyaxon/services/ephemeral.py
rename to polyaxon/services/ephemeral.py
diff --git a/cli/polyaxon/services/headers.py b/polyaxon/services/headers.py
similarity index 100%
rename from cli/polyaxon/services/headers.py
rename to polyaxon/services/headers.py
diff --git a/cli/polyaxon/services/values.py b/polyaxon/services/values.py
similarity index 100%
rename from cli/polyaxon/services/values.py
rename to polyaxon/services/values.py
diff --git a/cli/polyaxon/settings.py b/polyaxon/settings.py
similarity index 100%
rename from cli/polyaxon/settings.py
rename to polyaxon/settings.py
diff --git a/cli/polyaxon/sidecar/__init__.py b/polyaxon/sidecar/__init__.py
similarity index 100%
rename from cli/polyaxon/sidecar/__init__.py
rename to polyaxon/sidecar/__init__.py
diff --git a/cli/polyaxon/sidecar/container/__init__.py b/polyaxon/sidecar/container/__init__.py
similarity index 100%
rename from cli/polyaxon/sidecar/container/__init__.py
rename to polyaxon/sidecar/container/__init__.py
diff --git a/cli/polyaxon/sidecar/container/intervals.py b/polyaxon/sidecar/container/intervals.py
similarity index 100%
rename from cli/polyaxon/sidecar/container/intervals.py
rename to polyaxon/sidecar/container/intervals.py
diff --git a/cli/polyaxon/sidecar/container/monitors/__init__.py b/polyaxon/sidecar/container/monitors/__init__.py
similarity index 100%
rename from cli/polyaxon/sidecar/container/monitors/__init__.py
rename to polyaxon/sidecar/container/monitors/__init__.py
diff --git a/cli/polyaxon/sidecar/container/monitors/artifacts.py b/polyaxon/sidecar/container/monitors/artifacts.py
similarity index 100%
rename from cli/polyaxon/sidecar/container/monitors/artifacts.py
rename to polyaxon/sidecar/container/monitors/artifacts.py
diff --git a/cli/polyaxon/sidecar/container/monitors/logs.py b/polyaxon/sidecar/container/monitors/logs.py
similarity index 100%
rename from cli/polyaxon/sidecar/container/monitors/logs.py
rename to polyaxon/sidecar/container/monitors/logs.py
diff --git a/cli/polyaxon/sidecar/ignore.py b/polyaxon/sidecar/ignore.py
similarity index 100%
rename from cli/polyaxon/sidecar/ignore.py
rename to polyaxon/sidecar/ignore.py
diff --git a/cli/polyaxon/sidecar/processor.py b/polyaxon/sidecar/processor.py
similarity index 100%
rename from cli/polyaxon/sidecar/processor.py
rename to polyaxon/sidecar/processor.py
diff --git a/cli/polyaxon/stores/__init__.py b/polyaxon/stores/__init__.py
similarity index 100%
rename from cli/polyaxon/stores/__init__.py
rename to polyaxon/stores/__init__.py
diff --git a/cli/polyaxon/stores/polyaxon_store.py b/polyaxon/stores/polyaxon_store.py
similarity index 100%
rename from cli/polyaxon/stores/polyaxon_store.py
rename to polyaxon/stores/polyaxon_store.py
diff --git a/cli/polyaxon/tracking/__init__.py b/polyaxon/tracking/__init__.py
similarity index 100%
rename from cli/polyaxon/tracking/__init__.py
rename to polyaxon/tracking/__init__.py
diff --git a/cli/polyaxon/tracking/contrib/__init__.py b/polyaxon/tracking/contrib/__init__.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/__init__.py
rename to polyaxon/tracking/contrib/__init__.py
diff --git a/cli/polyaxon/tracking/contrib/fastai.py b/polyaxon/tracking/contrib/fastai.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/fastai.py
rename to polyaxon/tracking/contrib/fastai.py
diff --git a/cli/polyaxon/tracking/contrib/fastai_v1.py b/polyaxon/tracking/contrib/fastai_v1.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/fastai_v1.py
rename to polyaxon/tracking/contrib/fastai_v1.py
diff --git a/cli/polyaxon/tracking/contrib/hugging_face.py b/polyaxon/tracking/contrib/hugging_face.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/hugging_face.py
rename to polyaxon/tracking/contrib/hugging_face.py
diff --git a/cli/polyaxon/tracking/contrib/ignite.py b/polyaxon/tracking/contrib/ignite.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/ignite.py
rename to polyaxon/tracking/contrib/ignite.py
diff --git a/cli/polyaxon/tracking/contrib/keras.py b/polyaxon/tracking/contrib/keras.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/keras.py
rename to polyaxon/tracking/contrib/keras.py
diff --git a/cli/polyaxon/tracking/contrib/lightgbm.py b/polyaxon/tracking/contrib/lightgbm.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/lightgbm.py
rename to polyaxon/tracking/contrib/lightgbm.py
diff --git a/cli/polyaxon/tracking/contrib/pytorch_lightning.py b/polyaxon/tracking/contrib/pytorch_lightning.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/pytorch_lightning.py
rename to polyaxon/tracking/contrib/pytorch_lightning.py
diff --git a/cli/polyaxon/tracking/contrib/scikit.py b/polyaxon/tracking/contrib/scikit.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/scikit.py
rename to polyaxon/tracking/contrib/scikit.py
diff --git a/cli/polyaxon/tracking/contrib/tensorboard.py b/polyaxon/tracking/contrib/tensorboard.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/tensorboard.py
rename to polyaxon/tracking/contrib/tensorboard.py
diff --git a/cli/polyaxon/tracking/contrib/tensorflow.py b/polyaxon/tracking/contrib/tensorflow.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/tensorflow.py
rename to polyaxon/tracking/contrib/tensorflow.py
diff --git a/cli/polyaxon/tracking/contrib/xgboost.py b/polyaxon/tracking/contrib/xgboost.py
similarity index 100%
rename from cli/polyaxon/tracking/contrib/xgboost.py
rename to polyaxon/tracking/contrib/xgboost.py
diff --git a/cli/polyaxon/tracking/run.py b/polyaxon/tracking/run.py
similarity index 100%
rename from cli/polyaxon/tracking/run.py
rename to polyaxon/tracking/run.py
diff --git a/cli/polyaxon/types.py b/polyaxon/types.py
similarity index 100%
rename from cli/polyaxon/types.py
rename to polyaxon/types.py
diff --git a/cli/polyaxon/utils/__init__.py b/polyaxon/utils/__init__.py
similarity index 100%
rename from cli/polyaxon/utils/__init__.py
rename to polyaxon/utils/__init__.py
diff --git a/cli/polyaxon/utils/cache.py b/polyaxon/utils/cache.py
similarity index 100%
rename from cli/polyaxon/utils/cache.py
rename to polyaxon/utils/cache.py
diff --git a/cli/polyaxon/utils/cli_constants.py b/polyaxon/utils/cli_constants.py
similarity index 100%
rename from cli/polyaxon/utils/cli_constants.py
rename to polyaxon/utils/cli_constants.py
diff --git a/cli/polyaxon/utils/fixtures/__init__.py b/polyaxon/utils/fixtures/__init__.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/__init__.py
rename to polyaxon/utils/fixtures/__init__.py
diff --git a/cli/polyaxon/utils/fixtures/backfill.py b/polyaxon/utils/fixtures/backfill.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/backfill.py
rename to polyaxon/utils/fixtures/backfill.py
diff --git a/cli/polyaxon/utils/fixtures/bo.py b/polyaxon/utils/fixtures/bo.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/bo.py
rename to polyaxon/utils/fixtures/bo.py
diff --git a/cli/polyaxon/utils/fixtures/build.py b/polyaxon/utils/fixtures/build.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/build.py
rename to polyaxon/utils/fixtures/build.py
diff --git a/cli/polyaxon/utils/fixtures/grid.py b/polyaxon/utils/fixtures/grid.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/grid.py
rename to polyaxon/utils/fixtures/grid.py
diff --git a/cli/polyaxon/utils/fixtures/jobs.py b/polyaxon/utils/fixtures/jobs.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/jobs.py
rename to polyaxon/utils/fixtures/jobs.py
diff --git a/cli/polyaxon/utils/fixtures/mapping.py b/polyaxon/utils/fixtures/mapping.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/mapping.py
rename to polyaxon/utils/fixtures/mapping.py
diff --git a/cli/polyaxon/utils/fixtures/pipelines.py b/polyaxon/utils/fixtures/pipelines.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/pipelines.py
rename to polyaxon/utils/fixtures/pipelines.py
diff --git a/cli/polyaxon/utils/fixtures/schedule.py b/polyaxon/utils/fixtures/schedule.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/schedule.py
rename to polyaxon/utils/fixtures/schedule.py
diff --git a/cli/polyaxon/utils/fixtures/services.py b/polyaxon/utils/fixtures/services.py
similarity index 100%
rename from cli/polyaxon/utils/fixtures/services.py
rename to polyaxon/utils/fixtures/services.py
diff --git a/cli/polyaxon/utils/formatting.py b/polyaxon/utils/formatting.py
similarity index 100%
rename from cli/polyaxon/utils/formatting.py
rename to polyaxon/utils/formatting.py
diff --git a/cli/polyaxon/utils/fqn_utils.py b/polyaxon/utils/fqn_utils.py
similarity index 100%
rename from cli/polyaxon/utils/fqn_utils.py
rename to polyaxon/utils/fqn_utils.py
diff --git a/cli/polyaxon/utils/host_utils.py b/polyaxon/utils/host_utils.py
similarity index 100%
rename from cli/polyaxon/utils/host_utils.py
rename to polyaxon/utils/host_utils.py
diff --git a/cli/polyaxon/utils/test_utils.py b/polyaxon/utils/test_utils.py
similarity index 100%
rename from cli/polyaxon/utils/test_utils.py
rename to polyaxon/utils/test_utils.py
diff --git a/cli/polyaxon/utils/urls_utils.py b/polyaxon/utils/urls_utils.py
similarity index 100%
rename from cli/polyaxon/utils/urls_utils.py
rename to polyaxon/utils/urls_utils.py
diff --git a/cli/polyaxon/vendor/__init__.py b/polyaxon/vendor/__init__.py
similarity index 100%
rename from cli/polyaxon/vendor/__init__.py
rename to polyaxon/vendor/__init__.py
diff --git a/cli/polyaxon/vendor/shell_pty.py b/polyaxon/vendor/shell_pty.py
similarity index 100%
rename from cli/polyaxon/vendor/shell_pty.py
rename to polyaxon/vendor/shell_pty.py
diff --git a/cli/polyaxon_sdk/__init__.py b/polyaxon_sdk/__init__.py
similarity index 100%
rename from cli/polyaxon_sdk/__init__.py
rename to polyaxon_sdk/__init__.py
diff --git a/cli/requirements/dev.txt b/requirements/dev.txt
similarity index 100%
rename from cli/requirements/dev.txt
rename to requirements/dev.txt
diff --git a/cli/requirements/fs.txt b/requirements/fs.txt
similarity index 100%
rename from cli/requirements/fs.txt
rename to requirements/fs.txt
diff --git a/cli/requirements/init.txt b/requirements/init.txt
similarity index 100%
rename from cli/requirements/init.txt
rename to requirements/init.txt
diff --git a/cli/requirements/k8s_async.txt b/requirements/k8s_async.txt
similarity index 100%
rename from cli/requirements/k8s_async.txt
rename to requirements/k8s_async.txt
diff --git a/cli/requirements/master.txt b/requirements/master.txt
similarity index 71%
rename from cli/requirements/master.txt
rename to requirements/master.txt
index 64e50b1ba..f3100fc31 100644
--- a/cli/requirements/master.txt
+++ b/requirements/master.txt
@@ -1,2 +1,2 @@
--e git+https://github.com/polyaxon/traceml.git@master#egg=traceml&subdirectory=traceml
--e git+https://github.com/polyaxon/hypertune.git@master#egg=hypertune&subdirectory=hypertune
+-e git+https://github.com/polyaxon/traceml.git@master#egg=traceml
+-e git+https://github.com/polyaxon/hypertune.git@master#egg=hypertune
diff --git a/cli/requirements/prod.txt b/requirements/prod.txt
similarity index 100%
rename from cli/requirements/prod.txt
rename to requirements/prod.txt
diff --git a/cli/requirements/requirements.txt b/requirements/requirements.txt
similarity index 100%
rename from cli/requirements/requirements.txt
rename to requirements/requirements.txt
diff --git a/cli/requirements/sidecar.txt b/requirements/sidecar.txt
similarity index 100%
rename from cli/requirements/sidecar.txt
rename to requirements/sidecar.txt
diff --git a/cli/requirements/test.txt b/requirements/test.txt
similarity index 100%
rename from cli/requirements/test.txt
rename to requirements/test.txt
diff --git a/cli/setup.cfg b/setup.cfg
similarity index 100%
rename from cli/setup.cfg
rename to setup.cfg
diff --git a/cli/setup.py b/setup.py
similarity index 100%
rename from cli/setup.py
rename to setup.py
diff --git a/cli/tests/__init__.py b/tests/__init__.py
similarity index 100%
rename from cli/tests/__init__.py
rename to tests/__init__.py
diff --git a/cli/tests/conftest.py b/tests/conftest.py
similarity index 100%
rename from cli/tests/conftest.py
rename to tests/conftest.py
diff --git a/cli/tests/fixtures/deployment/all_agent_values.yml b/tests/fixtures/deployment/all_agent_values.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/all_agent_values.yml
rename to tests/fixtures/deployment/all_agent_values.yml
diff --git a/cli/tests/fixtures/deployment/all_external_platform_values.yml b/tests/fixtures/deployment/all_external_platform_values.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/all_external_platform_values.yml
rename to tests/fixtures/deployment/all_external_platform_values.yml
diff --git a/cli/tests/fixtures/deployment/all_platform_values.yml b/tests/fixtures/deployment/all_platform_values.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/all_platform_values.yml
rename to tests/fixtures/deployment/all_platform_values.yml
diff --git a/cli/tests/fixtures/deployment/external_pgsql_values.yml b/tests/fixtures/deployment/external_pgsql_values.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/external_pgsql_values.yml
rename to tests/fixtures/deployment/external_pgsql_values.yml
diff --git a/cli/tests/fixtures/deployment/external_rabbitmq_values.yml b/tests/fixtures/deployment/external_rabbitmq_values.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/external_rabbitmq_values.yml
rename to tests/fixtures/deployment/external_rabbitmq_values.yml
diff --git a/cli/tests/fixtures/deployment/external_redis_values.yml b/tests/fixtures/deployment/external_redis_values.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/external_redis_values.yml
rename to tests/fixtures/deployment/external_redis_values.yml
diff --git a/cli/tests/fixtures/deployment/internal_redis_rabbitmq_values.yml b/tests/fixtures/deployment/internal_redis_rabbitmq_values.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/internal_redis_rabbitmq_values.yml
rename to tests/fixtures/deployment/internal_redis_rabbitmq_values.yml
diff --git a/cli/tests/fixtures/deployment/monitoring_values.yml b/tests/fixtures/deployment/monitoring_values.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/monitoring_values.yml
rename to tests/fixtures/deployment/monitoring_values.yml
diff --git a/cli/tests/fixtures/deployment/values1.yml b/tests/fixtures/deployment/values1.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/values1.yml
rename to tests/fixtures/deployment/values1.yml
diff --git a/cli/tests/fixtures/deployment/values2.yml b/tests/fixtures/deployment/values2.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/values2.yml
rename to tests/fixtures/deployment/values2.yml
diff --git a/cli/tests/fixtures/deployment/values3.yml b/tests/fixtures/deployment/values3.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/values3.yml
rename to tests/fixtures/deployment/values3.yml
diff --git a/cli/tests/fixtures/deployment/values4.yml b/tests/fixtures/deployment/values4.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/values4.yml
rename to tests/fixtures/deployment/values4.yml
diff --git a/cli/tests/fixtures/deployment/values5.yml b/tests/fixtures/deployment/values5.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/values5.yml
rename to tests/fixtures/deployment/values5.yml
diff --git a/cli/tests/fixtures/deployment/values6.yml b/tests/fixtures/deployment/values6.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/values6.yml
rename to tests/fixtures/deployment/values6.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values1.yml b/tests/fixtures/deployment/wrong_values1.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values1.yml
rename to tests/fixtures/deployment/wrong_values1.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values10.yml b/tests/fixtures/deployment/wrong_values10.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values10.yml
rename to tests/fixtures/deployment/wrong_values10.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values11.yml b/tests/fixtures/deployment/wrong_values11.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values11.yml
rename to tests/fixtures/deployment/wrong_values11.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values2.yml b/tests/fixtures/deployment/wrong_values2.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values2.yml
rename to tests/fixtures/deployment/wrong_values2.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values3.yml b/tests/fixtures/deployment/wrong_values3.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values3.yml
rename to tests/fixtures/deployment/wrong_values3.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values4.yml b/tests/fixtures/deployment/wrong_values4.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values4.yml
rename to tests/fixtures/deployment/wrong_values4.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values5.yml b/tests/fixtures/deployment/wrong_values5.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values5.yml
rename to tests/fixtures/deployment/wrong_values5.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values6.yml b/tests/fixtures/deployment/wrong_values6.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values6.yml
rename to tests/fixtures/deployment/wrong_values6.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values7.yml b/tests/fixtures/deployment/wrong_values7.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values7.yml
rename to tests/fixtures/deployment/wrong_values7.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values8.yml b/tests/fixtures/deployment/wrong_values8.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values8.yml
rename to tests/fixtures/deployment/wrong_values8.yml
diff --git a/cli/tests/fixtures/deployment/wrong_values9.yml b/tests/fixtures/deployment/wrong_values9.yml
similarity index 100%
rename from cli/tests/fixtures/deployment/wrong_values9.yml
rename to tests/fixtures/deployment/wrong_values9.yml
diff --git a/cli/tests/fixtures/parsing/configs/config_tests.json b/tests/fixtures/parsing/configs/config_tests.json
similarity index 100%
rename from cli/tests/fixtures/parsing/configs/config_tests.json
rename to tests/fixtures/parsing/configs/config_tests.json
diff --git a/cli/tests/fixtures/parsing/configs/invalid_config_tests.json b/tests/fixtures/parsing/configs/invalid_config_tests.json
similarity index 100%
rename from cli/tests/fixtures/parsing/configs/invalid_config_tests.json
rename to tests/fixtures/parsing/configs/invalid_config_tests.json
diff --git a/cli/tests/fixtures/parsing/configs/invalid_config_tests.yaml b/tests/fixtures/parsing/configs/invalid_config_tests.yaml
similarity index 100%
rename from cli/tests/fixtures/parsing/configs/invalid_config_tests.yaml
rename to tests/fixtures/parsing/configs/invalid_config_tests.yaml
diff --git a/cli/tests/fixtures/parsing/json_file b/tests/fixtures/parsing/json_file
similarity index 100%
rename from cli/tests/fixtures/parsing/json_file
rename to tests/fixtures/parsing/json_file
diff --git a/cli/tests/fixtures/parsing/json_file.json b/tests/fixtures/parsing/json_file.json
similarity index 100%
rename from cli/tests/fixtures/parsing/json_file.json
rename to tests/fixtures/parsing/json_file.json
diff --git a/cli/tests/fixtures/parsing/yaml_file b/tests/fixtures/parsing/yaml_file
similarity index 100%
rename from cli/tests/fixtures/parsing/yaml_file
rename to tests/fixtures/parsing/yaml_file
diff --git a/cli/tests/fixtures/parsing/yaml_file.yml b/tests/fixtures/parsing/yaml_file.yml
similarity index 100%
rename from cli/tests/fixtures/parsing/yaml_file.yml
rename to tests/fixtures/parsing/yaml_file.yml
diff --git a/cli/tests/fixtures/pipelines/build_run_pipeline.yml b/tests/fixtures/pipelines/build_run_pipeline.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/build_run_pipeline.yml
rename to tests/fixtures/pipelines/build_run_pipeline.yml
diff --git a/cli/tests/fixtures/pipelines/cyclic_pipeline.yml b/tests/fixtures/pipelines/cyclic_pipeline.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/cyclic_pipeline.yml
rename to tests/fixtures/pipelines/cyclic_pipeline.yml
diff --git a/cli/tests/fixtures/pipelines/matrix_file.yml b/tests/fixtures/pipelines/matrix_file.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/matrix_file.yml
rename to tests/fixtures/pipelines/matrix_file.yml
diff --git a/cli/tests/fixtures/pipelines/matrix_file_early_stopping.yml b/tests/fixtures/pipelines/matrix_file_early_stopping.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/matrix_file_early_stopping.yml
rename to tests/fixtures/pipelines/matrix_file_early_stopping.yml
diff --git a/cli/tests/fixtures/pipelines/matrix_file_with_int_float_types.yml b/tests/fixtures/pipelines/matrix_file_with_int_float_types.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/matrix_file_with_int_float_types.yml
rename to tests/fixtures/pipelines/matrix_file_with_int_float_types.yml
diff --git a/cli/tests/fixtures/pipelines/pipeline_ops_not_corresponding_to_components.yml b/tests/fixtures/pipelines/pipeline_ops_not_corresponding_to_components.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/pipeline_ops_not_corresponding_to_components.yml
rename to tests/fixtures/pipelines/pipeline_ops_not_corresponding_to_components.yml
diff --git a/cli/tests/fixtures/pipelines/pipeline_with_no_components.yml b/tests/fixtures/pipelines/pipeline_with_no_components.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/pipeline_with_no_components.yml
rename to tests/fixtures/pipelines/pipeline_with_no_components.yml
diff --git a/cli/tests/fixtures/pipelines/pipeline_with_no_ops.yml b/tests/fixtures/pipelines/pipeline_with_no_ops.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/pipeline_with_no_ops.yml
rename to tests/fixtures/pipelines/pipeline_with_no_ops.yml
diff --git a/cli/tests/fixtures/pipelines/ref_pipeline.yml b/tests/fixtures/pipelines/ref_pipeline.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/ref_pipeline.yml
rename to tests/fixtures/pipelines/ref_pipeline.yml
diff --git a/cli/tests/fixtures/pipelines/simple_cron_pipeline.yml b/tests/fixtures/pipelines/simple_cron_pipeline.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/simple_cron_pipeline.yml
rename to tests/fixtures/pipelines/simple_cron_pipeline.yml
diff --git a/cli/tests/fixtures/pipelines/simple_dag_pipeline.yml b/tests/fixtures/pipelines/simple_dag_pipeline.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/simple_dag_pipeline.yml
rename to tests/fixtures/pipelines/simple_dag_pipeline.yml
diff --git a/cli/tests/fixtures/pipelines/simple_dag_pipeline_with_builds.yml b/tests/fixtures/pipelines/simple_dag_pipeline_with_builds.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/simple_dag_pipeline_with_builds.yml
rename to tests/fixtures/pipelines/simple_dag_pipeline_with_builds.yml
diff --git a/cli/tests/fixtures/pipelines/simple_joins_pipeline.yml b/tests/fixtures/pipelines/simple_joins_pipeline.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/simple_joins_pipeline.yml
rename to tests/fixtures/pipelines/simple_joins_pipeline.yml
diff --git a/cli/tests/fixtures/pipelines/simple_parallel_pipeline.yml b/tests/fixtures/pipelines/simple_parallel_pipeline.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/simple_parallel_pipeline.yml
rename to tests/fixtures/pipelines/simple_parallel_pipeline.yml
diff --git a/cli/tests/fixtures/pipelines/simple_recurrent_pipeline.yml b/tests/fixtures/pipelines/simple_recurrent_pipeline.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/simple_recurrent_pipeline.yml
rename to tests/fixtures/pipelines/simple_recurrent_pipeline.yml
diff --git a/cli/tests/fixtures/pipelines/simple_sequential_pipeline.yml b/tests/fixtures/pipelines/simple_sequential_pipeline.yml
similarity index 100%
rename from cli/tests/fixtures/pipelines/simple_sequential_pipeline.yml
rename to tests/fixtures/pipelines/simple_sequential_pipeline.yml
diff --git a/cli/tests/fixtures/plain/distributed_mpi_file.yml b/tests/fixtures/plain/distributed_mpi_file.yml
similarity index 100%
rename from cli/tests/fixtures/plain/distributed_mpi_file.yml
rename to tests/fixtures/plain/distributed_mpi_file.yml
diff --git a/cli/tests/fixtures/plain/distributed_mxnet_file.yml b/tests/fixtures/plain/distributed_mxnet_file.yml
similarity index 100%
rename from cli/tests/fixtures/plain/distributed_mxnet_file.yml
rename to tests/fixtures/plain/distributed_mxnet_file.yml
diff --git a/cli/tests/fixtures/plain/distributed_paddle_file.yml b/tests/fixtures/plain/distributed_paddle_file.yml
similarity index 100%
rename from cli/tests/fixtures/plain/distributed_paddle_file.yml
rename to tests/fixtures/plain/distributed_paddle_file.yml
diff --git a/cli/tests/fixtures/plain/distributed_pytorch_file.yml b/tests/fixtures/plain/distributed_pytorch_file.yml
similarity index 100%
rename from cli/tests/fixtures/plain/distributed_pytorch_file.yml
rename to tests/fixtures/plain/distributed_pytorch_file.yml
diff --git a/cli/tests/fixtures/plain/distributed_tensorflow_file.yml b/tests/fixtures/plain/distributed_tensorflow_file.yml
similarity index 100%
rename from cli/tests/fixtures/plain/distributed_tensorflow_file.yml
rename to tests/fixtures/plain/distributed_tensorflow_file.yml
diff --git a/cli/tests/fixtures/plain/distributed_tensorflow_file_build.yml b/tests/fixtures/plain/distributed_tensorflow_file_build.yml
similarity index 100%
rename from cli/tests/fixtures/plain/distributed_tensorflow_file_build.yml
rename to tests/fixtures/plain/distributed_tensorflow_file_build.yml
diff --git a/cli/tests/fixtures/plain/job_file_with_environment.yml b/tests/fixtures/plain/job_file_with_environment.yml
similarity index 100%
rename from cli/tests/fixtures/plain/job_file_with_environment.yml
rename to tests/fixtures/plain/job_file_with_environment.yml
diff --git a/cli/tests/fixtures/plain/job_file_with_init.yml b/tests/fixtures/plain/job_file_with_init.yml
similarity index 100%
rename from cli/tests/fixtures/plain/job_file_with_init.yml
rename to tests/fixtures/plain/job_file_with_init.yml
diff --git a/cli/tests/fixtures/plain/job_file_with_templated_file_init_and_to_env.yml b/tests/fixtures/plain/job_file_with_templated_file_init_and_to_env.yml
similarity index 100%
rename from cli/tests/fixtures/plain/job_file_with_templated_file_init_and_to_env.yml
rename to tests/fixtures/plain/job_file_with_templated_file_init_and_to_env.yml
diff --git a/cli/tests/fixtures/plain/job_file_with_termination.yml b/tests/fixtures/plain/job_file_with_termination.yml
similarity index 100%
rename from cli/tests/fixtures/plain/job_file_with_termination.yml
rename to tests/fixtures/plain/job_file_with_termination.yml
diff --git a/cli/tests/fixtures/plain/job_missing_container.yml b/tests/fixtures/plain/job_missing_container.yml
similarity index 100%
rename from cli/tests/fixtures/plain/job_missing_container.yml
rename to tests/fixtures/plain/job_missing_container.yml
diff --git a/cli/tests/fixtures/plain/jupyterlab_service_with_custom_environment.yml b/tests/fixtures/plain/jupyterlab_service_with_custom_environment.yml
similarity index 100%
rename from cli/tests/fixtures/plain/jupyterlab_service_with_custom_environment.yml
rename to tests/fixtures/plain/jupyterlab_service_with_custom_environment.yml
diff --git a/cli/tests/fixtures/plain/mapping_job_file_early_stopping.yml b/tests/fixtures/plain/mapping_job_file_early_stopping.yml
similarity index 100%
rename from cli/tests/fixtures/plain/mapping_job_file_early_stopping.yml
rename to tests/fixtures/plain/mapping_job_file_early_stopping.yml
diff --git a/cli/tests/fixtures/plain/matrix_job_file.yml b/tests/fixtures/plain/matrix_job_file.yml
similarity index 100%
rename from cli/tests/fixtures/plain/matrix_job_file.yml
rename to tests/fixtures/plain/matrix_job_file.yml
diff --git a/cli/tests/fixtures/plain/matrix_job_file_build.yml b/tests/fixtures/plain/matrix_job_file_build.yml
similarity index 100%
rename from cli/tests/fixtures/plain/matrix_job_file_build.yml
rename to tests/fixtures/plain/matrix_job_file_build.yml
diff --git a/cli/tests/fixtures/plain/matrix_job_file_early_stopping.yml b/tests/fixtures/plain/matrix_job_file_early_stopping.yml
similarity index 100%
rename from cli/tests/fixtures/plain/matrix_job_file_early_stopping.yml
rename to tests/fixtures/plain/matrix_job_file_early_stopping.yml
diff --git a/cli/tests/fixtures/plain/matrix_job_file_with_int_float_types.yml b/tests/fixtures/plain/matrix_job_file_with_int_float_types.yml
similarity index 100%
rename from cli/tests/fixtures/plain/matrix_job_file_with_int_float_types.yml
rename to tests/fixtures/plain/matrix_job_file_with_int_float_types.yml
diff --git a/cli/tests/fixtures/plain/missing_kind.yml b/tests/fixtures/plain/missing_kind.yml
similarity index 100%
rename from cli/tests/fixtures/plain/missing_kind.yml
rename to tests/fixtures/plain/missing_kind.yml
diff --git a/cli/tests/fixtures/plain/missing_version.yml b/tests/fixtures/plain/missing_version.yml
similarity index 100%
rename from cli/tests/fixtures/plain/missing_version.yml
rename to tests/fixtures/plain/missing_version.yml
diff --git a/cli/tests/fixtures/plain/non_supported_file.yml b/tests/fixtures/plain/non_supported_file.yml
similarity index 100%
rename from cli/tests/fixtures/plain/non_supported_file.yml
rename to tests/fixtures/plain/non_supported_file.yml
diff --git a/cli/tests/fixtures/plain/polyaxonfile_with_contexts_requirements.yaml b/tests/fixtures/plain/polyaxonfile_with_contexts_requirements.yaml
similarity index 100%
rename from cli/tests/fixtures/plain/polyaxonfile_with_contexts_requirements.yaml
rename to tests/fixtures/plain/polyaxonfile_with_contexts_requirements.yaml
diff --git a/cli/tests/fixtures/plain/polyaxonfile_with_quotes.yaml b/tests/fixtures/plain/polyaxonfile_with_quotes.yaml
similarity index 100%
rename from cli/tests/fixtures/plain/polyaxonfile_with_quotes.yaml
rename to tests/fixtures/plain/polyaxonfile_with_quotes.yaml
diff --git a/cli/tests/fixtures/plain/replicas_file_with_custom_configs_and_resources.yml b/tests/fixtures/plain/replicas_file_with_custom_configs_and_resources.yml
similarity index 100%
rename from cli/tests/fixtures/plain/replicas_file_with_custom_configs_and_resources.yml
rename to tests/fixtures/plain/replicas_file_with_custom_configs_and_resources.yml
diff --git a/cli/tests/fixtures/plain/simple_job.yml b/tests/fixtures/plain/simple_job.yml
similarity index 100%
rename from cli/tests/fixtures/plain/simple_job.yml
rename to tests/fixtures/plain/simple_job.yml
diff --git a/cli/tests/fixtures/plain/simple_job_run_patch.yml b/tests/fixtures/plain/simple_job_run_patch.yml
similarity index 100%
rename from cli/tests/fixtures/plain/simple_job_run_patch.yml
rename to tests/fixtures/plain/simple_job_run_patch.yml
diff --git a/cli/tests/fixtures/plain/simple_json_file.json b/tests/fixtures/plain/simple_json_file.json
similarity index 100%
rename from cli/tests/fixtures/plain/simple_json_file.json
rename to tests/fixtures/plain/simple_json_file.json
diff --git a/cli/tests/fixtures/plain/tensorboard_with_custom_environment.yml b/tests/fixtures/plain/tensorboard_with_custom_environment.yml
similarity index 100%
rename from cli/tests/fixtures/plain/tensorboard_with_custom_environment.yml
rename to tests/fixtures/plain/tensorboard_with_custom_environment.yml
diff --git a/cli/tests/fixtures/samples/artifaction_location.yaml b/tests/fixtures/samples/artifaction_location.yaml
similarity index 100%
rename from cli/tests/fixtures/samples/artifaction_location.yaml
rename to tests/fixtures/samples/artifaction_location.yaml
diff --git a/cli/tests/fixtures/samples/condition.yaml b/tests/fixtures/samples/condition.yaml
similarity index 100%
rename from cli/tests/fixtures/samples/condition.yaml
rename to tests/fixtures/samples/condition.yaml
diff --git a/cli/tests/fixtures/samples/image_pull_secret.yaml b/tests/fixtures/samples/image_pull_secret.yaml
similarity index 100%
rename from cli/tests/fixtures/samples/image_pull_secret.yaml
rename to tests/fixtures/samples/image_pull_secret.yaml
diff --git a/cli/tests/fixtures/samples/parallel_join.yaml b/tests/fixtures/samples/parallel_join.yaml
similarity index 100%
rename from cli/tests/fixtures/samples/parallel_join.yaml
rename to tests/fixtures/samples/parallel_join.yaml
diff --git a/cli/tests/fixtures/typing/auto_delayed_validation_with_jinja.yml b/tests/fixtures/typing/auto_delayed_validation_with_jinja.yml
similarity index 100%
rename from cli/tests/fixtures/typing/auto_delayed_validation_with_jinja.yml
rename to tests/fixtures/typing/auto_delayed_validation_with_jinja.yml
diff --git a/cli/tests/fixtures/typing/inputs_delayed_validation.yml b/tests/fixtures/typing/inputs_delayed_validation.yml
similarity index 100%
rename from cli/tests/fixtures/typing/inputs_delayed_validation.yml
rename to tests/fixtures/typing/inputs_delayed_validation.yml
diff --git a/cli/tests/fixtures/typing/matrix_file_with_int_float_types.yml b/tests/fixtures/typing/matrix_file_with_int_float_types.yml
similarity index 100%
rename from cli/tests/fixtures/typing/matrix_file_with_int_float_types.yml
rename to tests/fixtures/typing/matrix_file_with_int_float_types.yml
diff --git a/cli/tests/fixtures/typing/matrix_job_file_with_int_float_types.yml b/tests/fixtures/typing/matrix_job_file_with_int_float_types.yml
similarity index 100%
rename from cli/tests/fixtures/typing/matrix_job_file_with_int_float_types.yml
rename to tests/fixtures/typing/matrix_job_file_with_int_float_types.yml
diff --git a/cli/tests/fixtures/typing/matrix_job_required_inputs_file.yml b/tests/fixtures/typing/matrix_job_required_inputs_file.yml
similarity index 100%
rename from cli/tests/fixtures/typing/matrix_job_required_inputs_file.yml
rename to tests/fixtures/typing/matrix_job_required_inputs_file.yml
diff --git a/cli/tests/fixtures/typing/matrix_job_required_inputs_file_wrong_matrix_type.yml b/tests/fixtures/typing/matrix_job_required_inputs_file_wrong_matrix_type.yml
similarity index 100%
rename from cli/tests/fixtures/typing/matrix_job_required_inputs_file_wrong_matrix_type.yml
rename to tests/fixtures/typing/matrix_job_required_inputs_file_wrong_matrix_type.yml
diff --git a/cli/tests/fixtures/typing/required_inputs.yml b/tests/fixtures/typing/required_inputs.yml
similarity index 100%
rename from cli/tests/fixtures/typing/required_inputs.yml
rename to tests/fixtures/typing/required_inputs.yml
diff --git a/cli/tests/fixtures/typing/required_inputs_with_arg_format.yml b/tests/fixtures/typing/required_inputs_with_arg_format.yml
similarity index 100%
rename from cli/tests/fixtures/typing/required_inputs_with_arg_format.yml
rename to tests/fixtures/typing/required_inputs_with_arg_format.yml
diff --git a/cli/tests/fixtures/typing/required_outputs.yml b/tests/fixtures/typing/required_outputs.yml
similarity index 100%
rename from cli/tests/fixtures/typing/required_outputs.yml
rename to tests/fixtures/typing/required_outputs.yml
diff --git a/cli/tests/fixtures/typing/run_cmd_simple_file.yml b/tests/fixtures/typing/run_cmd_simple_file.yml
similarity index 100%
rename from cli/tests/fixtures/typing/run_cmd_simple_file.yml
rename to tests/fixtures/typing/run_cmd_simple_file.yml
diff --git a/cli/tests/fixtures/typing/run_with_refs.yml b/tests/fixtures/typing/run_with_refs.yml
similarity index 100%
rename from cli/tests/fixtures/typing/run_with_refs.yml
rename to tests/fixtures/typing/run_with_refs.yml
diff --git a/cli/tests/fixtures/typing/untyped_params.yml b/tests/fixtures/typing/untyped_params.yml
similarity index 100%
rename from cli/tests/fixtures/typing/untyped_params.yml
rename to tests/fixtures/typing/untyped_params.yml
diff --git a/cli/tests/fixtures_static/repo.tar.gz b/tests/fixtures_static/repo.tar.gz
similarity index 100%
rename from cli/tests/fixtures_static/repo.tar.gz
rename to tests/fixtures_static/repo.tar.gz
diff --git a/cli/tests/test_agents/__init__.py b/tests/test_agents/__init__.py
similarity index 100%
rename from cli/tests/test_agents/__init__.py
rename to tests/test_agents/__init__.py
diff --git a/cli/tests/test_agents/test_agent.py b/tests/test_agents/test_agent.py
similarity index 100%
rename from cli/tests/test_agents/test_agent.py
rename to tests/test_agents/test_agent.py
diff --git a/cli/tests/test_agents/test_async_spawner.py b/tests/test_agents/test_async_spawner.py
similarity index 100%
rename from cli/tests/test_agents/test_async_spawner.py
rename to tests/test_agents/test_async_spawner.py
diff --git a/cli/tests/test_agents/test_spawner.py b/tests/test_agents/test_spawner.py
similarity index 100%
rename from cli/tests/test_agents/test_spawner.py
rename to tests/test_agents/test_spawner.py
diff --git a/cli/tests/test_api/__init__.py b/tests/test_api/__init__.py
similarity index 100%
rename from cli/tests/test_api/__init__.py
rename to tests/test_api/__init__.py
diff --git a/cli/tests/test_api/test_authentication.py b/tests/test_api/test_authentication.py
similarity index 100%
rename from cli/tests/test_api/test_authentication.py
rename to tests/test_api/test_authentication.py
diff --git a/cli/tests/test_api/test_home.py b/tests/test_api/test_home.py
similarity index 100%
rename from cli/tests/test_api/test_home.py
rename to tests/test_api/test_home.py
diff --git a/cli/tests/test_api/test_log_handler.py b/tests/test_api/test_log_handler.py
similarity index 100%
rename from cli/tests/test_api/test_log_handler.py
rename to tests/test_api/test_log_handler.py
diff --git a/cli/tests/test_api/test_user.py b/tests/test_api/test_user.py
similarity index 100%
rename from cli/tests/test_api/test_user.py
rename to tests/test_api/test_user.py
diff --git a/cli/tests/test_builds/__init__.py b/tests/test_builds/__init__.py
similarity index 100%
rename from cli/tests/test_builds/__init__.py
rename to tests/test_builds/__init__.py
diff --git a/cli/tests/test_builds/test_builder.py b/tests/test_builds/test_builder.py
similarity index 100%
rename from cli/tests/test_builds/test_builder.py
rename to tests/test_builds/test_builder.py
diff --git a/cli/tests/test_builds/test_dockerfile_generator.py b/tests/test_builds/test_dockerfile_generator.py
similarity index 100%
rename from cli/tests/test_builds/test_dockerfile_generator.py
rename to tests/test_builds/test_dockerfile_generator.py
diff --git a/cli/tests/test_cli/__init__.py b/tests/test_cli/__init__.py
similarity index 100%
rename from cli/tests/test_cli/__init__.py
rename to tests/test_cli/__init__.py
diff --git a/cli/tests/test_cli/test_artifacts.py b/tests/test_cli/test_artifacts.py
similarity index 100%
rename from cli/tests/test_cli/test_artifacts.py
rename to tests/test_cli/test_artifacts.py
diff --git a/cli/tests/test_cli/test_auth.py b/tests/test_cli/test_auth.py
similarity index 100%
rename from cli/tests/test_cli/test_auth.py
rename to tests/test_cli/test_auth.py
diff --git a/cli/tests/test_cli/test_check.py b/tests/test_cli/test_check.py
similarity index 100%
rename from cli/tests/test_cli/test_check.py
rename to tests/test_cli/test_check.py
diff --git a/cli/tests/test_cli/test_components.py b/tests/test_cli/test_components.py
similarity index 100%
rename from cli/tests/test_cli/test_components.py
rename to tests/test_cli/test_components.py
diff --git a/cli/tests/test_cli/test_config.py b/tests/test_cli/test_config.py
similarity index 100%
rename from cli/tests/test_cli/test_config.py
rename to tests/test_cli/test_config.py
diff --git a/cli/tests/test_cli/test_docker.py b/tests/test_cli/test_docker.py
similarity index 100%
rename from cli/tests/test_cli/test_docker.py
rename to tests/test_cli/test_docker.py
diff --git a/cli/tests/test_cli/test_models.py b/tests/test_cli/test_models.py
similarity index 100%
rename from cli/tests/test_cli/test_models.py
rename to tests/test_cli/test_models.py
diff --git a/cli/tests/test_cli/test_operations.py b/tests/test_cli/test_operations.py
similarity index 100%
rename from cli/tests/test_cli/test_operations.py
rename to tests/test_cli/test_operations.py
diff --git a/cli/tests/test_cli/test_projects.py b/tests/test_cli/test_projects.py
similarity index 100%
rename from cli/tests/test_cli/test_projects.py
rename to tests/test_cli/test_projects.py
diff --git a/cli/tests/test_cli/test_version.py b/tests/test_cli/test_version.py
similarity index 100%
rename from cli/tests/test_cli/test_version.py
rename to tests/test_cli/test_version.py
diff --git a/cli/tests/test_cli/utils.py b/tests/test_cli/utils.py
similarity index 100%
rename from cli/tests/test_cli/utils.py
rename to tests/test_cli/utils.py
diff --git a/cli/tests/test_client/__init__.py b/tests/test_client/__init__.py
similarity index 100%
rename from cli/tests/test_client/__init__.py
rename to tests/test_client/__init__.py
diff --git a/cli/tests/test_client/test_impersonate.py b/tests/test_client/test_impersonate.py
similarity index 100%
rename from cli/tests/test_client/test_impersonate.py
rename to tests/test_client/test_impersonate.py
diff --git a/cli/tests/test_client/test_polyaxon_client.py b/tests/test_client/test_polyaxon_client.py
similarity index 100%
rename from cli/tests/test_client/test_polyaxon_client.py
rename to tests/test_client/test_polyaxon_client.py
diff --git a/cli/tests/test_client/test_run_client.py b/tests/test_client/test_run_client.py
similarity index 100%
rename from cli/tests/test_client/test_run_client.py
rename to tests/test_client/test_run_client.py
diff --git a/cli/tests/test_client/test_statuses.py b/tests/test_client/test_statuses.py
similarity index 100%
rename from cli/tests/test_client/test_statuses.py
rename to tests/test_client/test_statuses.py
diff --git a/cli/tests/test_config_reader/__init__.py b/tests/test_config_reader/__init__.py
similarity index 100%
rename from cli/tests/test_config_reader/__init__.py
rename to tests/test_config_reader/__init__.py
diff --git a/cli/tests/test_config_reader/test_manager.py b/tests/test_config_reader/test_manager.py
similarity index 100%
rename from cli/tests/test_config_reader/test_manager.py
rename to tests/test_config_reader/test_manager.py
diff --git a/cli/tests/test_config_reader/test_reader.py b/tests/test_config_reader/test_reader.py
similarity index 100%
rename from cli/tests/test_config_reader/test_reader.py
rename to tests/test_config_reader/test_reader.py
diff --git a/cli/tests/test_connections/__init__.py b/tests/test_connections/__init__.py
similarity index 100%
rename from cli/tests/test_connections/__init__.py
rename to tests/test_connections/__init__.py
diff --git a/cli/tests/test_connections/test_aws/__init__.py b/tests/test_connections/test_aws/__init__.py
similarity index 100%
rename from cli/tests/test_connections/test_aws/__init__.py
rename to tests/test_connections/test_aws/__init__.py
diff --git a/cli/tests/test_connections/test_aws/test_aws_client.py b/tests/test_connections/test_aws/test_aws_client.py
similarity index 100%
rename from cli/tests/test_connections/test_aws/test_aws_client.py
rename to tests/test_connections/test_aws/test_aws_client.py
diff --git a/cli/tests/test_connections/test_gcp/__init__.py b/tests/test_connections/test_gcp/__init__.py
similarity index 100%
rename from cli/tests/test_connections/test_gcp/__init__.py
rename to tests/test_connections/test_gcp/__init__.py
diff --git a/cli/tests/test_connections/test_gcp/test_gc_client.py b/tests/test_connections/test_gcp/test_gc_client.py
similarity index 100%
rename from cli/tests/test_connections/test_gcp/test_gc_client.py
rename to tests/test_connections/test_gcp/test_gc_client.py
diff --git a/cli/tests/test_connections/test_polyaxon_store.py b/tests/test_connections/test_polyaxon_store.py
similarity index 100%
rename from cli/tests/test_connections/test_polyaxon_store.py
rename to tests/test_connections/test_polyaxon_store.py
diff --git a/cli/tests/test_connections/test_reader.py b/tests/test_connections/test_reader.py
similarity index 100%
rename from cli/tests/test_connections/test_reader.py
rename to tests/test_connections/test_reader.py
diff --git a/cli/tests/test_connections/test_schemas/__init__.py b/tests/test_connections/test_schemas/__init__.py
similarity index 100%
rename from cli/tests/test_connections/test_schemas/__init__.py
rename to tests/test_connections/test_schemas/__init__.py
diff --git a/cli/tests/test_connections/test_schemas/test_connections.py b/tests/test_connections/test_schemas/test_connections.py
similarity index 100%
rename from cli/tests/test_connections/test_schemas/test_connections.py
rename to tests/test_connections/test_schemas/test_connections.py
diff --git a/cli/tests/test_connections/test_schemas/test_secret_resources.py b/tests/test_connections/test_schemas/test_secret_resources.py
similarity index 100%
rename from cli/tests/test_connections/test_schemas/test_secret_resources.py
rename to tests/test_connections/test_schemas/test_secret_resources.py
diff --git a/cli/tests/test_deploy/__init__.py b/tests/test_deploy/__init__.py
similarity index 100%
rename from cli/tests/test_deploy/__init__.py
rename to tests/test_deploy/__init__.py
diff --git a/cli/tests/test_deploy/test_celery.py b/tests/test_deploy/test_celery.py
similarity index 100%
rename from cli/tests/test_deploy/test_celery.py
rename to tests/test_deploy/test_celery.py
diff --git a/cli/tests/test_deploy/test_deployment.py b/tests/test_deploy/test_deployment.py
similarity index 100%
rename from cli/tests/test_deploy/test_deployment.py
rename to tests/test_deploy/test_deployment.py
diff --git a/cli/tests/test_deploy/test_email.py b/tests/test_deploy/test_email.py
similarity index 100%
rename from cli/tests/test_deploy/test_email.py
rename to tests/test_deploy/test_email.py
diff --git a/cli/tests/test_deploy/test_ingress.py b/tests/test_deploy/test_ingress.py
similarity index 100%
rename from cli/tests/test_deploy/test_ingress.py
rename to tests/test_deploy/test_ingress.py
diff --git a/cli/tests/test_deploy/test_intervals.py b/tests/test_deploy/test_intervals.py
similarity index 100%
rename from cli/tests/test_deploy/test_intervals.py
rename to tests/test_deploy/test_intervals.py
diff --git a/cli/tests/test_deploy/test_rbac.py b/tests/test_deploy/test_rbac.py
similarity index 100%
rename from cli/tests/test_deploy/test_rbac.py
rename to tests/test_deploy/test_rbac.py
diff --git a/cli/tests/test_deploy/test_security_context.py b/tests/test_deploy/test_security_context.py
similarity index 100%
rename from cli/tests/test_deploy/test_security_context.py
rename to tests/test_deploy/test_security_context.py
diff --git a/cli/tests/test_deploy/test_service.py b/tests/test_deploy/test_service.py
similarity index 100%
rename from cli/tests/test_deploy/test_service.py
rename to tests/test_deploy/test_service.py
diff --git a/cli/tests/test_deploy/test_ssl.py b/tests/test_deploy/test_ssl.py
similarity index 100%
rename from cli/tests/test_deploy/test_ssl.py
rename to tests/test_deploy/test_ssl.py
diff --git a/cli/tests/test_deploy/test_user.py b/tests/test_deploy/test_user.py
similarity index 100%
rename from cli/tests/test_deploy/test_user.py
rename to tests/test_deploy/test_user.py
diff --git a/cli/tests/test_fixtures/__init__.py b/tests/test_fixtures/__init__.py
similarity index 100%
rename from cli/tests/test_fixtures/__init__.py
rename to tests/test_fixtures/__init__.py
diff --git a/cli/tests/test_fixtures/test_backfill.py b/tests/test_fixtures/test_backfill.py
similarity index 100%
rename from cli/tests/test_fixtures/test_backfill.py
rename to tests/test_fixtures/test_backfill.py
diff --git a/cli/tests/test_fixtures/test_bo.py b/tests/test_fixtures/test_bo.py
similarity index 100%
rename from cli/tests/test_fixtures/test_bo.py
rename to tests/test_fixtures/test_bo.py
diff --git a/cli/tests/test_fixtures/test_build.py b/tests/test_fixtures/test_build.py
similarity index 100%
rename from cli/tests/test_fixtures/test_build.py
rename to tests/test_fixtures/test_build.py
diff --git a/cli/tests/test_fixtures/test_grid.py b/tests/test_fixtures/test_grid.py
similarity index 100%
rename from cli/tests/test_fixtures/test_grid.py
rename to tests/test_fixtures/test_grid.py
diff --git a/cli/tests/test_fixtures/test_jobs.py b/tests/test_fixtures/test_jobs.py
similarity index 100%
rename from cli/tests/test_fixtures/test_jobs.py
rename to tests/test_fixtures/test_jobs.py
diff --git a/cli/tests/test_fixtures/test_mapping.py b/tests/test_fixtures/test_mapping.py
similarity index 100%
rename from cli/tests/test_fixtures/test_mapping.py
rename to tests/test_fixtures/test_mapping.py
diff --git a/cli/tests/test_fixtures/test_pipelines.py b/tests/test_fixtures/test_pipelines.py
similarity index 100%
rename from cli/tests/test_fixtures/test_pipelines.py
rename to tests/test_fixtures/test_pipelines.py
diff --git a/cli/tests/test_fixtures/test_schedule.py b/tests/test_fixtures/test_schedule.py
similarity index 100%
rename from cli/tests/test_fixtures/test_schedule.py
rename to tests/test_fixtures/test_schedule.py
diff --git a/cli/tests/test_fixtures/test_services.py b/tests/test_fixtures/test_services.py
similarity index 100%
rename from cli/tests/test_fixtures/test_services.py
rename to tests/test_fixtures/test_services.py
diff --git a/cli/tests/test_init/__init__.py b/tests/test_init/__init__.py
similarity index 100%
rename from cli/tests/test_init/__init__.py
rename to tests/test_init/__init__.py
diff --git a/cli/tests/test_init/test_init_auth.py b/tests/test_init/test_init_auth.py
similarity index 100%
rename from cli/tests/test_init/test_init_auth.py
rename to tests/test_init/test_init_auth.py
diff --git a/cli/tests/test_init/test_init_code.py b/tests/test_init/test_init_code.py
similarity index 100%
rename from cli/tests/test_init/test_init_code.py
rename to tests/test_init/test_init_code.py
diff --git a/cli/tests/test_k8s/__init__.py b/tests/test_k8s/__init__.py
similarity index 100%
rename from cli/tests/test_k8s/__init__.py
rename to tests/test_k8s/__init__.py
diff --git a/cli/tests/test_k8s/fixtures.py b/tests/test_k8s/fixtures.py
similarity index 100%
rename from cli/tests/test_k8s/fixtures.py
rename to tests/test_k8s/fixtures.py
diff --git a/cli/tests/test_k8s/test_crd.py b/tests/test_k8s/test_crd.py
similarity index 100%
rename from cli/tests/test_k8s/test_crd.py
rename to tests/test_k8s/test_crd.py
diff --git a/cli/tests/test_k8s/test_monitors.py b/tests/test_k8s/test_monitors.py
similarity index 100%
rename from cli/tests/test_k8s/test_monitors.py
rename to tests/test_k8s/test_monitors.py
diff --git a/cli/tests/test_lifecycles/__init__.py b/tests/test_lifecycles/__init__.py
similarity index 100%
rename from cli/tests/test_lifecycles/__init__.py
rename to tests/test_lifecycles/__init__.py
diff --git a/cli/tests/test_lifecycles/test_lifecycle.py b/tests/test_lifecycles/test_lifecycle.py
similarity index 100%
rename from cli/tests/test_lifecycles/test_lifecycle.py
rename to tests/test_lifecycles/test_lifecycle.py
diff --git a/cli/tests/test_managers/__init__.py b/tests/test_managers/__init__.py
similarity index 100%
rename from cli/tests/test_managers/__init__.py
rename to tests/test_managers/__init__.py
diff --git a/cli/tests/test_managers/test_agent.py b/tests/test_managers/test_agent.py
similarity index 100%
rename from cli/tests/test_managers/test_agent.py
rename to tests/test_managers/test_agent.py
diff --git a/cli/tests/test_managers/test_auth.py b/tests/test_managers/test_auth.py
similarity index 100%
rename from cli/tests/test_managers/test_auth.py
rename to tests/test_managers/test_auth.py
diff --git a/cli/tests/test_managers/test_base.py b/tests/test_managers/test_base.py
similarity index 100%
rename from cli/tests/test_managers/test_base.py
rename to tests/test_managers/test_base.py
diff --git a/cli/tests/test_managers/test_cli.py b/tests/test_managers/test_cli.py
similarity index 100%
rename from cli/tests/test_managers/test_cli.py
rename to tests/test_managers/test_cli.py
diff --git a/cli/tests/test_managers/test_deployment.py b/tests/test_managers/test_deployment.py
similarity index 100%
rename from cli/tests/test_managers/test_deployment.py
rename to tests/test_managers/test_deployment.py
diff --git a/cli/tests/test_managers/test_git.py b/tests/test_managers/test_git.py
similarity index 100%
rename from cli/tests/test_managers/test_git.py
rename to tests/test_managers/test_git.py
diff --git a/cli/tests/test_managers/test_home.py b/tests/test_managers/test_home.py
similarity index 100%
rename from cli/tests/test_managers/test_home.py
rename to tests/test_managers/test_home.py
diff --git a/cli/tests/test_managers/test_ignore.py b/tests/test_managers/test_ignore.py
similarity index 100%
rename from cli/tests/test_managers/test_ignore.py
rename to tests/test_managers/test_ignore.py
diff --git a/cli/tests/test_managers/test_project.py b/tests/test_managers/test_project.py
similarity index 100%
rename from cli/tests/test_managers/test_project.py
rename to tests/test_managers/test_project.py
diff --git a/cli/tests/test_managers/test_run.py b/tests/test_managers/test_run.py
similarity index 100%
rename from cli/tests/test_managers/test_run.py
rename to tests/test_managers/test_run.py
diff --git a/cli/tests/test_managers/test_user.py b/tests/test_managers/test_user.py
similarity index 100%
rename from cli/tests/test_managers/test_user.py
rename to tests/test_managers/test_user.py
diff --git a/cli/tests/test_notifiers/__init__.py b/tests/test_notifiers/__init__.py
similarity index 100%
rename from cli/tests/test_notifiers/__init__.py
rename to tests/test_notifiers/__init__.py
diff --git a/cli/tests/test_notifiers/test_discord_webhook.py b/tests/test_notifiers/test_discord_webhook.py
similarity index 100%
rename from cli/tests/test_notifiers/test_discord_webhook.py
rename to tests/test_notifiers/test_discord_webhook.py
diff --git a/cli/tests/test_notifiers/test_hipchat_webhook.py b/tests/test_notifiers/test_hipchat_webhook.py
similarity index 100%
rename from cli/tests/test_notifiers/test_hipchat_webhook.py
rename to tests/test_notifiers/test_hipchat_webhook.py
diff --git a/cli/tests/test_notifiers/test_mattermost_webhook.py b/tests/test_notifiers/test_mattermost_webhook.py
similarity index 100%
rename from cli/tests/test_notifiers/test_mattermost_webhook.py
rename to tests/test_notifiers/test_mattermost_webhook.py
diff --git a/cli/tests/test_notifiers/test_pagerduty_webhook.py b/tests/test_notifiers/test_pagerduty_webhook.py
similarity index 100%
rename from cli/tests/test_notifiers/test_pagerduty_webhook.py
rename to tests/test_notifiers/test_pagerduty_webhook.py
diff --git a/cli/tests/test_notifiers/test_slack_webhook.py b/tests/test_notifiers/test_slack_webhook.py
similarity index 100%
rename from cli/tests/test_notifiers/test_slack_webhook.py
rename to tests/test_notifiers/test_slack_webhook.py
diff --git a/cli/tests/test_notifiers/test_webhook_notification.py b/tests/test_notifiers/test_webhook_notification.py
similarity index 100%
rename from cli/tests/test_notifiers/test_webhook_notification.py
rename to tests/test_notifiers/test_webhook_notification.py
diff --git a/cli/tests/test_operators/__init__.py b/tests/test_operators/__init__.py
similarity index 100%
rename from cli/tests/test_operators/__init__.py
rename to tests/test_operators/__init__.py
diff --git a/cli/tests/test_operators/test_compose.py b/tests/test_operators/test_compose.py
similarity index 100%
rename from cli/tests/test_operators/test_compose.py
rename to tests/test_operators/test_compose.py
diff --git a/cli/tests/test_operators/test_conda.py b/tests/test_operators/test_conda.py
similarity index 100%
rename from cli/tests/test_operators/test_conda.py
rename to tests/test_operators/test_conda.py
diff --git a/cli/tests/test_operators/test_docker.py b/tests/test_operators/test_docker.py
similarity index 100%
rename from cli/tests/test_operators/test_docker.py
rename to tests/test_operators/test_docker.py
diff --git a/cli/tests/test_operators/test_helm.py b/tests/test_operators/test_helm.py
similarity index 100%
rename from cli/tests/test_operators/test_helm.py
rename to tests/test_operators/test_helm.py
diff --git a/cli/tests/test_operators/test_kubectl.py b/tests/test_operators/test_kubectl.py
similarity index 100%
rename from cli/tests/test_operators/test_kubectl.py
rename to tests/test_operators/test_kubectl.py
diff --git a/cli/tests/test_operators/test_pip.py b/tests/test_operators/test_pip.py
similarity index 100%
rename from cli/tests/test_operators/test_pip.py
rename to tests/test_operators/test_pip.py
diff --git a/cli/tests/test_parser/__init__.py b/tests/test_parser/__init__.py
similarity index 100%
rename from cli/tests/test_parser/__init__.py
rename to tests/test_parser/__init__.py
diff --git a/cli/tests/test_parser/test_parser.py b/tests/test_parser/test_parser.py
similarity index 100%
rename from cli/tests/test_parser/test_parser.py
rename to tests/test_parser/test_parser.py
diff --git a/cli/tests/test_polyaxonfile/__init__.py b/tests/test_polyaxonfile/__init__.py
similarity index 100%
rename from cli/tests/test_polyaxonfile/__init__.py
rename to tests/test_polyaxonfile/__init__.py
diff --git a/cli/tests/test_polyaxonfile/test_default.py b/tests/test_polyaxonfile/test_default.py
similarity index 100%
rename from cli/tests/test_polyaxonfile/test_default.py
rename to tests/test_polyaxonfile/test_default.py
diff --git a/cli/tests/test_polyaxonfile/test_parser.py b/tests/test_polyaxonfile/test_parser.py
similarity index 100%
rename from cli/tests/test_polyaxonfile/test_parser.py
rename to tests/test_polyaxonfile/test_parser.py
diff --git a/cli/tests/test_polyaxonfile/test_patch_specification.py b/tests/test_polyaxonfile/test_patch_specification.py
similarity index 100%
rename from cli/tests/test_polyaxonfile/test_patch_specification.py
rename to tests/test_polyaxonfile/test_patch_specification.py
diff --git a/cli/tests/test_polyaxonfile/test_polyaxonfile.py b/tests/test_polyaxonfile/test_polyaxonfile.py
similarity index 100%
rename from cli/tests/test_polyaxonfile/test_polyaxonfile.py
rename to tests/test_polyaxonfile/test_polyaxonfile.py
diff --git a/cli/tests/test_polyaxonfile/test_polyaxonfile_pipelines.py b/tests/test_polyaxonfile/test_polyaxonfile_pipelines.py
similarity index 100%
rename from cli/tests/test_polyaxonfile/test_polyaxonfile_pipelines.py
rename to tests/test_polyaxonfile/test_polyaxonfile_pipelines.py
diff --git a/cli/tests/test_polyaxonfile/test_polyaxonfile_typing.py b/tests/test_polyaxonfile/test_polyaxonfile_typing.py
similarity index 100%
rename from cli/tests/test_polyaxonfile/test_polyaxonfile_typing.py
rename to tests/test_polyaxonfile/test_polyaxonfile_typing.py
diff --git a/cli/tests/test_polyaxonfile/test_specification.py b/tests/test_polyaxonfile/test_specification.py
similarity index 100%
rename from cli/tests/test_polyaxonfile/test_specification.py
rename to tests/test_polyaxonfile/test_specification.py
diff --git a/cli/tests/test_polyflow/__init__.py b/tests/test_polyflow/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/__init__.py
rename to tests/test_polyflow/__init__.py
diff --git a/cli/tests/test_polyflow/test_builds/__init__.py b/tests/test_polyflow/test_builds/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_builds/__init__.py
rename to tests/test_polyflow/test_builds/__init__.py
diff --git a/cli/tests/test_polyflow/test_builds/test_builds.py b/tests/test_polyflow/test_builds/test_builds.py
similarity index 100%
rename from cli/tests/test_polyflow/test_builds/test_builds.py
rename to tests/test_polyflow/test_builds/test_builds.py
diff --git a/cli/tests/test_polyflow/test_cache/__init__.py b/tests/test_polyflow/test_cache/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_cache/__init__.py
rename to tests/test_polyflow/test_cache/__init__.py
diff --git a/cli/tests/test_polyflow/test_cache/test_cache.py b/tests/test_polyflow/test_cache/test_cache.py
similarity index 100%
rename from cli/tests/test_polyflow/test_cache/test_cache.py
rename to tests/test_polyflow/test_cache/test_cache.py
diff --git a/cli/tests/test_polyflow/test_components/__init__.py b/tests/test_polyflow/test_components/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_components/__init__.py
rename to tests/test_polyflow/test_components/__init__.py
diff --git a/cli/tests/test_polyflow/test_components/test_components.py b/tests/test_polyflow/test_components/test_components.py
similarity index 100%
rename from cli/tests/test_polyflow/test_components/test_components.py
rename to tests/test_polyflow/test_components/test_components.py
diff --git a/cli/tests/test_polyflow/test_container/__init__.py b/tests/test_polyflow/test_container/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_container/__init__.py
rename to tests/test_polyflow/test_container/__init__.py
diff --git a/cli/tests/test_polyflow/test_container/test_container.py b/tests/test_polyflow/test_container/test_container.py
similarity index 100%
rename from cli/tests/test_polyflow/test_container/test_container.py
rename to tests/test_polyflow/test_container/test_container.py
diff --git a/cli/tests/test_polyflow/test_container/test_resources.py b/tests/test_polyflow/test_container/test_resources.py
similarity index 100%
rename from cli/tests/test_polyflow/test_container/test_resources.py
rename to tests/test_polyflow/test_container/test_resources.py
diff --git a/cli/tests/test_polyflow/test_dags.py b/tests/test_polyflow/test_dags.py
similarity index 100%
rename from cli/tests/test_polyflow/test_dags.py
rename to tests/test_polyflow/test_dags.py
diff --git a/cli/tests/test_polyflow/test_environments/__init__.py b/tests/test_polyflow/test_environments/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_environments/__init__.py
rename to tests/test_polyflow/test_environments/__init__.py
diff --git a/cli/tests/test_polyflow/test_environments/test_environments.py b/tests/test_polyflow/test_environments/test_environments.py
similarity index 100%
rename from cli/tests/test_polyflow/test_environments/test_environments.py
rename to tests/test_polyflow/test_environments/test_environments.py
diff --git a/cli/tests/test_polyflow/test_events/__init__.py b/tests/test_polyflow/test_events/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_events/__init__.py
rename to tests/test_polyflow/test_events/__init__.py
diff --git a/cli/tests/test_polyflow/test_events/test_events.py b/tests/test_polyflow/test_events/test_events.py
similarity index 100%
rename from cli/tests/test_polyflow/test_events/test_events.py
rename to tests/test_polyflow/test_events/test_events.py
diff --git a/cli/tests/test_polyflow/test_hooks/__init__.py b/tests/test_polyflow/test_hooks/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_hooks/__init__.py
rename to tests/test_polyflow/test_hooks/__init__.py
diff --git a/cli/tests/test_polyflow/test_hooks/test_hooks.py b/tests/test_polyflow/test_hooks/test_hooks.py
similarity index 100%
rename from cli/tests/test_polyflow/test_hooks/test_hooks.py
rename to tests/test_polyflow/test_hooks/test_hooks.py
diff --git a/cli/tests/test_polyflow/test_image_validation.py b/tests/test_polyflow/test_image_validation.py
similarity index 100%
rename from cli/tests/test_polyflow/test_image_validation.py
rename to tests/test_polyflow/test_image_validation.py
diff --git a/cli/tests/test_polyflow/test_init/__init__.py b/tests/test_polyflow/test_init/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_init/__init__.py
rename to tests/test_polyflow/test_init/__init__.py
diff --git a/cli/tests/test_polyflow/test_init/test_init.py b/tests/test_polyflow/test_init/test_init.py
similarity index 100%
rename from cli/tests/test_polyflow/test_init/test_init.py
rename to tests/test_polyflow/test_init/test_init.py
diff --git a/cli/tests/test_polyflow/test_io/__init__.py b/tests/test_polyflow/test_io/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_io/__init__.py
rename to tests/test_polyflow/test_io/__init__.py
diff --git a/cli/tests/test_polyflow/test_io/test_io.py b/tests/test_polyflow/test_io/test_io.py
similarity index 100%
rename from cli/tests/test_polyflow/test_io/test_io.py
rename to tests/test_polyflow/test_io/test_io.py
diff --git a/cli/tests/test_polyflow/test_io/test_params.py b/tests/test_polyflow/test_io/test_params.py
similarity index 100%
rename from cli/tests/test_polyflow/test_io/test_params.py
rename to tests/test_polyflow/test_io/test_params.py
diff --git a/cli/tests/test_polyflow/test_joins/__init__.py b/tests/test_polyflow/test_joins/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_joins/__init__.py
rename to tests/test_polyflow/test_joins/__init__.py
diff --git a/cli/tests/test_polyflow/test_joins/test_joins.py b/tests/test_polyflow/test_joins/test_joins.py
similarity index 100%
rename from cli/tests/test_polyflow/test_joins/test_joins.py
rename to tests/test_polyflow/test_joins/test_joins.py
diff --git a/cli/tests/test_polyflow/test_mounts/__init__.py b/tests/test_polyflow/test_mounts/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_mounts/__init__.py
rename to tests/test_polyflow/test_mounts/__init__.py
diff --git a/cli/tests/test_polyflow/test_mounts/test_k8s_artifact_mounts.py b/tests/test_polyflow/test_mounts/test_k8s_artifact_mounts.py
similarity index 100%
rename from cli/tests/test_polyflow/test_mounts/test_k8s_artifact_mounts.py
rename to tests/test_polyflow/test_mounts/test_k8s_artifact_mounts.py
diff --git a/cli/tests/test_polyflow/test_notifications/__init__.py b/tests/test_polyflow/test_notifications/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_notifications/__init__.py
rename to tests/test_polyflow/test_notifications/__init__.py
diff --git a/cli/tests/test_polyflow/test_notifications/test_notifications.py b/tests/test_polyflow/test_notifications/test_notifications.py
similarity index 100%
rename from cli/tests/test_polyflow/test_notifications/test_notifications.py
rename to tests/test_polyflow/test_notifications/test_notifications.py
diff --git a/cli/tests/test_polyflow/test_operators.py b/tests/test_polyflow/test_operators.py
similarity index 100%
rename from cli/tests/test_polyflow/test_operators.py
rename to tests/test_polyflow/test_operators.py
diff --git a/cli/tests/test_polyflow/test_ops/__init__.py b/tests/test_polyflow/test_ops/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_ops/__init__.py
rename to tests/test_polyflow/test_ops/__init__.py
diff --git a/cli/tests/test_polyflow/test_ops/test_op_runs.py b/tests/test_polyflow/test_ops/test_op_runs.py
similarity index 100%
rename from cli/tests/test_polyflow/test_ops/test_op_runs.py
rename to tests/test_polyflow/test_ops/test_op_runs.py
diff --git a/cli/tests/test_polyflow/test_ops/test_ops.py b/tests/test_polyflow/test_ops/test_ops.py
similarity index 100%
rename from cli/tests/test_polyflow/test_ops/test_ops.py
rename to tests/test_polyflow/test_ops/test_ops.py
diff --git a/cli/tests/test_polyflow/test_plugins/__init__.py b/tests/test_polyflow/test_plugins/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_plugins/__init__.py
rename to tests/test_polyflow/test_plugins/__init__.py
diff --git a/cli/tests/test_polyflow/test_plugins/test_plugins.py b/tests/test_polyflow/test_plugins/test_plugins.py
similarity index 100%
rename from cli/tests/test_polyflow/test_plugins/test_plugins.py
rename to tests/test_polyflow/test_plugins/test_plugins.py
diff --git a/cli/tests/test_polyflow/test_schedules/__init__.py b/tests/test_polyflow/test_schedules/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_schedules/__init__.py
rename to tests/test_polyflow/test_schedules/__init__.py
diff --git a/cli/tests/test_polyflow/test_schedules/test_schedules.py b/tests/test_polyflow/test_schedules/test_schedules.py
similarity index 100%
rename from cli/tests/test_polyflow/test_schedules/test_schedules.py
rename to tests/test_polyflow/test_schedules/test_schedules.py
diff --git a/cli/tests/test_polyflow/test_sidecars/__init__.py b/tests/test_polyflow/test_sidecars/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_sidecars/__init__.py
rename to tests/test_polyflow/test_sidecars/__init__.py
diff --git a/cli/tests/test_polyflow/test_sidecars/test_sidecars.py b/tests/test_polyflow/test_sidecars/test_sidecars.py
similarity index 100%
rename from cli/tests/test_polyflow/test_sidecars/test_sidecars.py
rename to tests/test_polyflow/test_sidecars/test_sidecars.py
diff --git a/cli/tests/test_polyflow/test_termination/__init__.py b/tests/test_polyflow/test_termination/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_termination/__init__.py
rename to tests/test_polyflow/test_termination/__init__.py
diff --git a/cli/tests/test_polyflow/test_termination/test_termination.py b/tests/test_polyflow/test_termination/test_termination.py
similarity index 100%
rename from cli/tests/test_polyflow/test_termination/test_termination.py
rename to tests/test_polyflow/test_termination/test_termination.py
diff --git a/cli/tests/test_polyflow/test_workflows/__init__.py b/tests/test_polyflow/test_workflows/__init__.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/__init__.py
rename to tests/test_polyflow/test_workflows/__init__.py
diff --git a/cli/tests/test_polyflow/test_workflows/test_bo.py b/tests/test_polyflow/test_workflows/test_bo.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/test_bo.py
rename to tests/test_polyflow/test_workflows/test_bo.py
diff --git a/cli/tests/test_polyflow/test_workflows/test_dags.py b/tests/test_polyflow/test_workflows/test_dags.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/test_dags.py
rename to tests/test_polyflow/test_workflows/test_dags.py
diff --git a/cli/tests/test_polyflow/test_workflows/test_early_stopping.py b/tests/test_polyflow/test_workflows/test_early_stopping.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/test_early_stopping.py
rename to tests/test_polyflow/test_workflows/test_early_stopping.py
diff --git a/cli/tests/test_polyflow/test_workflows/test_grid_search.py b/tests/test_polyflow/test_workflows/test_grid_search.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/test_grid_search.py
rename to tests/test_polyflow/test_workflows/test_grid_search.py
diff --git a/cli/tests/test_polyflow/test_workflows/test_hyperband.py b/tests/test_polyflow/test_workflows/test_hyperband.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/test_hyperband.py
rename to tests/test_polyflow/test_workflows/test_hyperband.py
diff --git a/cli/tests/test_polyflow/test_workflows/test_iterative.py b/tests/test_polyflow/test_workflows/test_iterative.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/test_iterative.py
rename to tests/test_polyflow/test_workflows/test_iterative.py
diff --git a/cli/tests/test_polyflow/test_workflows/test_matrix.py b/tests/test_polyflow/test_workflows/test_matrix.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/test_matrix.py
rename to tests/test_polyflow/test_workflows/test_matrix.py
diff --git a/cli/tests/test_polyflow/test_workflows/test_parallel.py b/tests/test_polyflow/test_workflows/test_parallel.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/test_parallel.py
rename to tests/test_polyflow/test_workflows/test_parallel.py
diff --git a/cli/tests/test_polyflow/test_workflows/test_random_search.py b/tests/test_polyflow/test_workflows/test_random_search.py
similarity index 100%
rename from cli/tests/test_polyflow/test_workflows/test_random_search.py
rename to tests/test_polyflow/test_workflows/test_random_search.py
diff --git a/cli/tests/test_polypod/__init__.py b/tests/test_polypod/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/__init__.py
rename to tests/test_polypod/__init__.py
diff --git a/cli/tests/test_polypod/test_commun/__init__.py b/tests/test_polypod/test_commun/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_commun/__init__.py
rename to tests/test_polypod/test_commun/__init__.py
diff --git a/cli/tests/test_polypod/test_commun/test_accelerators.py b/tests/test_polypod/test_commun/test_accelerators.py
similarity index 100%
rename from cli/tests/test_polypod/test_commun/test_accelerators.py
rename to tests/test_polypod/test_commun/test_accelerators.py
diff --git a/cli/tests/test_polypod/test_commun/test_annotations.py b/tests/test_polypod/test_commun/test_annotations.py
similarity index 100%
rename from cli/tests/test_polypod/test_commun/test_annotations.py
rename to tests/test_polypod/test_commun/test_annotations.py
diff --git a/cli/tests/test_polypod/test_commun/test_container_resources.py b/tests/test_polypod/test_commun/test_container_resources.py
similarity index 100%
rename from cli/tests/test_polypod/test_commun/test_container_resources.py
rename to tests/test_polypod/test_commun/test_container_resources.py
diff --git a/cli/tests/test_polypod/test_commun/test_containers.py b/tests/test_polypod/test_commun/test_containers.py
similarity index 100%
rename from cli/tests/test_polypod/test_commun/test_containers.py
rename to tests/test_polypod/test_commun/test_containers.py
diff --git a/cli/tests/test_polypod/test_commun/test_env_vars.py b/tests/test_polypod/test_commun/test_env_vars.py
similarity index 100%
rename from cli/tests/test_polypod/test_commun/test_env_vars.py
rename to tests/test_polypod/test_commun/test_env_vars.py
diff --git a/cli/tests/test_polypod/test_commun/test_mounts.py b/tests/test_polypod/test_commun/test_mounts.py
similarity index 100%
rename from cli/tests/test_polypod/test_commun/test_mounts.py
rename to tests/test_polypod/test_commun/test_mounts.py
diff --git a/cli/tests/test_polypod/test_commun/test_volumes.py b/tests/test_polypod/test_commun/test_volumes.py
similarity index 100%
rename from cli/tests/test_polypod/test_commun/test_volumes.py
rename to tests/test_polypod/test_commun/test_volumes.py
diff --git a/cli/tests/test_polypod/test_contexts.py b/tests/test_polypod/test_contexts.py
similarity index 100%
rename from cli/tests/test_polypod/test_contexts.py
rename to tests/test_polypod/test_contexts.py
diff --git a/cli/tests/test_polypod/test_converters/__init__.py b/tests/test_polypod/test_converters/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_converters/__init__.py
rename to tests/test_polypod/test_converters/__init__.py
diff --git a/cli/tests/test_polypod/test_converters/test_converter.py b/tests/test_polypod/test_converters/test_converter.py
similarity index 100%
rename from cli/tests/test_polypod/test_converters/test_converter.py
rename to tests/test_polypod/test_converters/test_converter.py
diff --git a/cli/tests/test_polypod/test_converters/test_platform_converter.py b/tests/test_polypod/test_converters/test_platform_converter.py
similarity index 100%
rename from cli/tests/test_polypod/test_converters/test_platform_converter.py
rename to tests/test_polypod/test_converters/test_platform_converter.py
diff --git a/cli/tests/test_polypod/test_converters/test_platform_job_converter.py b/tests/test_polypod/test_converters/test_platform_job_converter.py
similarity index 100%
rename from cli/tests/test_polypod/test_converters/test_platform_job_converter.py
rename to tests/test_polypod/test_converters/test_platform_job_converter.py
diff --git a/cli/tests/test_polypod/test_custom_resources/__init__.py b/tests/test_polypod/test_custom_resources/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/__init__.py
rename to tests/test_polypod/test_custom_resources/__init__.py
diff --git a/cli/tests/test_polypod/test_custom_resources/base_kubeflow.py b/tests/test_polypod/test_custom_resources/base_kubeflow.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/base_kubeflow.py
rename to tests/test_polypod/test_custom_resources/base_kubeflow.py
diff --git a/cli/tests/test_polypod/test_custom_resources/test_job_crd.py b/tests/test_polypod/test_custom_resources/test_job_crd.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/test_job_crd.py
rename to tests/test_polypod/test_custom_resources/test_job_crd.py
diff --git a/cli/tests/test_polypod/test_custom_resources/test_mpi_job_crd.py b/tests/test_polypod/test_custom_resources/test_mpi_job_crd.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/test_mpi_job_crd.py
rename to tests/test_polypod/test_custom_resources/test_mpi_job_crd.py
diff --git a/cli/tests/test_polypod/test_custom_resources/test_mx_job_crd.py b/tests/test_polypod/test_custom_resources/test_mx_job_crd.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/test_mx_job_crd.py
rename to tests/test_polypod/test_custom_resources/test_mx_job_crd.py
diff --git a/cli/tests/test_polypod/test_custom_resources/test_paddle_job_crd.py b/tests/test_polypod/test_custom_resources/test_paddle_job_crd.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/test_paddle_job_crd.py
rename to tests/test_polypod/test_custom_resources/test_paddle_job_crd.py
diff --git a/cli/tests/test_polypod/test_custom_resources/test_pytorch_job_crd.py b/tests/test_polypod/test_custom_resources/test_pytorch_job_crd.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/test_pytorch_job_crd.py
rename to tests/test_polypod/test_custom_resources/test_pytorch_job_crd.py
diff --git a/cli/tests/test_polypod/test_custom_resources/test_service_crd.py b/tests/test_polypod/test_custom_resources/test_service_crd.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/test_service_crd.py
rename to tests/test_polypod/test_custom_resources/test_service_crd.py
diff --git a/cli/tests/test_polypod/test_custom_resources/test_tf_job_crd.py b/tests/test_polypod/test_custom_resources/test_tf_job_crd.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/test_tf_job_crd.py
rename to tests/test_polypod/test_custom_resources/test_tf_job_crd.py
diff --git a/cli/tests/test_polypod/test_custom_resources/test_xgboost_job_crd.py b/tests/test_polypod/test_custom_resources/test_xgboost_job_crd.py
similarity index 100%
rename from cli/tests/test_polypod/test_custom_resources/test_xgboost_job_crd.py
rename to tests/test_polypod/test_custom_resources/test_xgboost_job_crd.py
diff --git a/cli/tests/test_polypod/test_init/__init__.py b/tests/test_polypod/test_init/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_init/__init__.py
rename to tests/test_polypod/test_init/__init__.py
diff --git a/cli/tests/test_polypod/test_init/test_init_auth.py b/tests/test_polypod/test_init/test_init_auth.py
similarity index 100%
rename from cli/tests/test_polypod/test_init/test_init_auth.py
rename to tests/test_polypod/test_init/test_init_auth.py
diff --git a/cli/tests/test_polypod/test_init/test_init_dockerfile.py b/tests/test_polypod/test_init/test_init_dockerfile.py
similarity index 100%
rename from cli/tests/test_polypod/test_init/test_init_dockerfile.py
rename to tests/test_polypod/test_init/test_init_dockerfile.py
diff --git a/cli/tests/test_polypod/test_init/test_init_file.py b/tests/test_polypod/test_init/test_init_file.py
similarity index 100%
rename from cli/tests/test_polypod/test_init/test_init_file.py
rename to tests/test_polypod/test_init/test_init_file.py
diff --git a/cli/tests/test_polypod/test_init/test_init_git.py b/tests/test_polypod/test_init/test_init_git.py
similarity index 100%
rename from cli/tests/test_polypod/test_init/test_init_git.py
rename to tests/test_polypod/test_init/test_init_git.py
diff --git a/cli/tests/test_polypod/test_init/test_init_outputs.py b/tests/test_polypod/test_init/test_init_outputs.py
similarity index 100%
rename from cli/tests/test_polypod/test_init/test_init_outputs.py
rename to tests/test_polypod/test_init/test_init_outputs.py
diff --git a/cli/tests/test_polypod/test_init/test_init_store.py b/tests/test_polypod/test_init/test_init_store.py
similarity index 100%
rename from cli/tests/test_polypod/test_init/test_init_store.py
rename to tests/test_polypod/test_init/test_init_store.py
diff --git a/cli/tests/test_polypod/test_init/test_init_tensorboard.py b/tests/test_polypod/test_init/test_init_tensorboard.py
similarity index 100%
rename from cli/tests/test_polypod/test_init/test_init_tensorboard.py
rename to tests/test_polypod/test_init/test_init_tensorboard.py
diff --git a/cli/tests/test_polypod/test_init/test_init_utils.py b/tests/test_polypod/test_init/test_init_utils.py
similarity index 100%
rename from cli/tests/test_polypod/test_init/test_init_utils.py
rename to tests/test_polypod/test_init/test_init_utils.py
diff --git a/cli/tests/test_polypod/test_lineage/__init__.py b/tests/test_polypod/test_lineage/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_lineage/__init__.py
rename to tests/test_polypod/test_lineage/__init__.py
diff --git a/cli/tests/test_polypod/test_lineage/test_lineage_resolver.py b/tests/test_polypod/test_lineage/test_lineage_resolver.py
similarity index 100%
rename from cli/tests/test_polypod/test_lineage/test_lineage_resolver.py
rename to tests/test_polypod/test_lineage/test_lineage_resolver.py
diff --git a/cli/tests/test_polypod/test_main/__init__.py b/tests/test_polypod/test_main/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_main/__init__.py
rename to tests/test_polypod/test_main/__init__.py
diff --git a/cli/tests/test_polypod/test_main/test_main_container.py b/tests/test_polypod/test_main/test_main_container.py
similarity index 100%
rename from cli/tests/test_polypod/test_main/test_main_container.py
rename to tests/test_polypod/test_main/test_main_container.py
diff --git a/cli/tests/test_polypod/test_main/test_main_env_vars.py b/tests/test_polypod/test_main/test_main_env_vars.py
similarity index 100%
rename from cli/tests/test_polypod/test_main/test_main_env_vars.py
rename to tests/test_polypod/test_main/test_main_env_vars.py
diff --git a/cli/tests/test_polypod/test_main/test_main_mounts.py b/tests/test_polypod/test_main/test_main_mounts.py
similarity index 100%
rename from cli/tests/test_polypod/test_main/test_main_mounts.py
rename to tests/test_polypod/test_main/test_main_mounts.py
diff --git a/cli/tests/test_polypod/test_main/test_main_secrets.py b/tests/test_polypod/test_main/test_main_secrets.py
similarity index 100%
rename from cli/tests/test_polypod/test_main/test_main_secrets.py
rename to tests/test_polypod/test_main/test_main_secrets.py
diff --git a/cli/tests/test_polypod/test_pods/__init__.py b/tests/test_polypod/test_pods/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_pods/__init__.py
rename to tests/test_polypod/test_pods/__init__.py
diff --git a/cli/tests/test_polypod/test_pods/test_pod_spec.py b/tests/test_polypod/test_pods/test_pod_spec.py
similarity index 100%
rename from cli/tests/test_polypod/test_pods/test_pod_spec.py
rename to tests/test_polypod/test_pods/test_pod_spec.py
diff --git a/cli/tests/test_polypod/test_pods/test_volumes.py b/tests/test_polypod/test_pods/test_volumes.py
similarity index 100%
rename from cli/tests/test_polypod/test_pods/test_volumes.py
rename to tests/test_polypod/test_pods/test_volumes.py
diff --git a/cli/tests/test_polypod/test_resolvers/__init__.py b/tests/test_polypod/test_resolvers/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_resolvers/__init__.py
rename to tests/test_polypod/test_resolvers/__init__.py
diff --git a/cli/tests/test_polypod/test_resolvers/test_core_resolver.py b/tests/test_polypod/test_resolvers/test_core_resolver.py
similarity index 100%
rename from cli/tests/test_polypod/test_resolvers/test_core_resolver.py
rename to tests/test_polypod/test_resolvers/test_core_resolver.py
diff --git a/cli/tests/test_polypod/test_sidecar/__init__.py b/tests/test_polypod/test_sidecar/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_sidecar/__init__.py
rename to tests/test_polypod/test_sidecar/__init__.py
diff --git a/cli/tests/test_polypod/test_sidecar/test_sidecar_container.py b/tests/test_polypod/test_sidecar/test_sidecar_container.py
similarity index 100%
rename from cli/tests/test_polypod/test_sidecar/test_sidecar_container.py
rename to tests/test_polypod/test_sidecar/test_sidecar_container.py
diff --git a/cli/tests/test_polypod/test_sidecar/test_sidecar_utils.py b/tests/test_polypod/test_sidecar/test_sidecar_utils.py
similarity index 100%
rename from cli/tests/test_polypod/test_sidecar/test_sidecar_utils.py
rename to tests/test_polypod/test_sidecar/test_sidecar_utils.py
diff --git a/cli/tests/test_polypod/test_specs/__init__.py b/tests/test_polypod/test_specs/__init__.py
similarity index 100%
rename from cli/tests/test_polypod/test_specs/__init__.py
rename to tests/test_polypod/test_specs/__init__.py
diff --git a/cli/tests/test_polypod/test_specs/test_contexts_spec.py b/tests/test_polypod/test_specs/test_contexts_spec.py
similarity index 100%
rename from cli/tests/test_polypod/test_specs/test_contexts_spec.py
rename to tests/test_polypod/test_specs/test_contexts_spec.py
diff --git a/cli/tests/test_pql/__init__.py b/tests/test_pql/__init__.py
similarity index 100%
rename from cli/tests/test_pql/__init__.py
rename to tests/test_pql/__init__.py
diff --git a/cli/tests/test_pql/test_parser.py b/tests/test_pql/test_parser.py
similarity index 100%
rename from cli/tests/test_pql/test_parser.py
rename to tests/test_pql/test_parser.py
diff --git a/cli/tests/test_schemas/__init__.py b/tests/test_schemas/__init__.py
similarity index 100%
rename from cli/tests/test_schemas/__init__.py
rename to tests/test_schemas/__init__.py
diff --git a/cli/tests/test_schemas/test_cli/__init__.py b/tests/test_schemas/test_cli/__init__.py
similarity index 100%
rename from cli/tests/test_schemas/test_cli/__init__.py
rename to tests/test_schemas/test_cli/__init__.py
diff --git a/cli/tests/test_schemas/test_cli/test_agent_config.py b/tests/test_schemas/test_cli/test_agent_config.py
similarity index 100%
rename from cli/tests/test_schemas/test_cli/test_agent_config.py
rename to tests/test_schemas/test_cli/test_agent_config.py
diff --git a/cli/tests/test_schemas/test_cli/test_checks_config.py b/tests/test_schemas/test_cli/test_checks_config.py
similarity index 100%
rename from cli/tests/test_schemas/test_cli/test_checks_config.py
rename to tests/test_schemas/test_cli/test_checks_config.py
diff --git a/cli/tests/test_schemas/test_cli/test_cli_config.py b/tests/test_schemas/test_cli/test_cli_config.py
similarity index 100%
rename from cli/tests/test_schemas/test_cli/test_cli_config.py
rename to tests/test_schemas/test_cli/test_cli_config.py
diff --git a/cli/tests/test_schemas/test_cli/test_client_config.py b/tests/test_schemas/test_cli/test_client_config.py
similarity index 100%
rename from cli/tests/test_schemas/test_cli/test_client_config.py
rename to tests/test_schemas/test_cli/test_client_config.py
diff --git a/cli/tests/test_schemas/test_types/__init__.py b/tests/test_schemas/test_types/__init__.py
similarity index 100%
rename from cli/tests/test_schemas/test_types/__init__.py
rename to tests/test_schemas/test_types/__init__.py
diff --git a/cli/tests/test_schemas/test_types/test_connections.py b/tests/test_schemas/test_types/test_connections.py
similarity index 100%
rename from cli/tests/test_schemas/test_types/test_connections.py
rename to tests/test_schemas/test_types/test_connections.py
diff --git a/cli/tests/test_schemas/test_types/test_dockerfile.py b/tests/test_schemas/test_types/test_dockerfile.py
similarity index 100%
rename from cli/tests/test_schemas/test_types/test_dockerfile.py
rename to tests/test_schemas/test_types/test_dockerfile.py
diff --git a/cli/tests/test_schemas/test_types/test_file.py b/tests/test_schemas/test_types/test_file.py
similarity index 100%
rename from cli/tests/test_schemas/test_types/test_file.py
rename to tests/test_schemas/test_types/test_file.py
diff --git a/cli/tests/test_schemas/test_types/test_secret_resources.py b/tests/test_schemas/test_types/test_secret_resources.py
similarity index 100%
rename from cli/tests/test_schemas/test_types/test_secret_resources.py
rename to tests/test_schemas/test_types/test_secret_resources.py
diff --git a/cli/tests/test_schemas/test_types/test_tensorboard.py b/tests/test_schemas/test_types/test_tensorboard.py
similarity index 100%
rename from cli/tests/test_schemas/test_types/test_tensorboard.py
rename to tests/test_schemas/test_types/test_tensorboard.py
diff --git a/cli/tests/test_sidecar/__init__.py b/tests/test_sidecar/__init__.py
similarity index 100%
rename from cli/tests/test_sidecar/__init__.py
rename to tests/test_sidecar/__init__.py
diff --git a/cli/tests/test_sidecar/test_interval.py b/tests/test_sidecar/test_interval.py
similarity index 100%
rename from cli/tests/test_sidecar/test_interval.py
rename to tests/test_sidecar/test_interval.py
diff --git a/cli/tests/test_sidecar/test_monitor.py b/tests/test_sidecar/test_monitor.py
similarity index 100%
rename from cli/tests/test_sidecar/test_monitor.py
rename to tests/test_sidecar/test_monitor.py
diff --git a/cli/tests/test_stores/__init__.py b/tests/test_stores/__init__.py
similarity index 100%
rename from cli/tests/test_stores/__init__.py
rename to tests/test_stores/__init__.py
diff --git a/cli/tests/test_stores/test_stores_manager.py b/tests/test_stores/test_stores_manager.py
similarity index 100%
rename from cli/tests/test_stores/test_stores_manager.py
rename to tests/test_stores/test_stores_manager.py
diff --git a/cli/tests/test_transports/__init__.py b/tests/test_transports/__init__.py
similarity index 100%
rename from cli/tests/test_transports/__init__.py
rename to tests/test_transports/__init__.py
diff --git a/cli/tests/test_transports/test_http_transport.py b/tests/test_transports/test_http_transport.py
similarity index 100%
rename from cli/tests/test_transports/test_http_transport.py
rename to tests/test_transports/test_http_transport.py
diff --git a/cli/tests/test_transports/test_periodic_transport.py b/tests/test_transports/test_periodic_transport.py
similarity index 100%
rename from cli/tests/test_transports/test_periodic_transport.py
rename to tests/test_transports/test_periodic_transport.py
diff --git a/cli/tests/test_transports/test_threaded_transport.py b/tests/test_transports/test_threaded_transport.py
similarity index 100%
rename from cli/tests/test_transports/test_threaded_transport.py
rename to tests/test_transports/test_threaded_transport.py
diff --git a/cli/tests/test_transports/test_transport.py b/tests/test_transports/test_transport.py
similarity index 100%
rename from cli/tests/test_transports/test_transport.py
rename to tests/test_transports/test_transport.py
diff --git a/cli/tests/test_transports/utils.py b/tests/test_transports/utils.py
similarity index 100%
rename from cli/tests/test_transports/utils.py
rename to tests/test_transports/utils.py
diff --git a/cli/tests/test_utils/__init__.py b/tests/test_utils/__init__.py
similarity index 100%
rename from cli/tests/test_utils/__init__.py
rename to tests/test_utils/__init__.py
diff --git a/cli/tests/test_utils/test_fqn.py b/tests/test_utils/test_fqn.py
similarity index 100%
rename from cli/tests/test_utils/test_fqn.py
rename to tests/test_utils/test_fqn.py
diff --git a/cli/tests/test_utils/test_urls_utils.py b/tests/test_utils/test_urls_utils.py
similarity index 100%
rename from cli/tests/test_utils/test_urls_utils.py
rename to tests/test_utils/test_urls_utils.py
diff --git a/cli/tests/tests_env_vars/__init__.py b/tests/tests_env_vars/__init__.py
similarity index 100%
rename from cli/tests/tests_env_vars/__init__.py
rename to tests/tests_env_vars/__init__.py
diff --git a/cli/tests/tests_env_vars/test_agent.py b/tests/tests_env_vars/test_agent.py
similarity index 100%
rename from cli/tests/tests_env_vars/test_agent.py
rename to tests/tests_env_vars/test_agent.py
diff --git a/cli/tests/tests_env_vars/test_owner.py b/tests/tests_env_vars/test_owner.py
similarity index 100%
rename from cli/tests/tests_env_vars/test_owner.py
rename to tests/tests_env_vars/test_owner.py
diff --git a/cli/tests/tests_env_vars/test_project.py b/tests/tests_env_vars/test_project.py
similarity index 100%
rename from cli/tests/tests_env_vars/test_project.py
rename to tests/tests_env_vars/test_project.py
diff --git a/cli/tests/tests_env_vars/test_queue.py b/tests/tests_env_vars/test_queue.py
similarity index 100%
rename from cli/tests/tests_env_vars/test_queue.py
rename to tests/tests_env_vars/test_queue.py
diff --git a/cli/tests/tests_env_vars/test_run.py b/tests/tests_env_vars/test_run.py
similarity index 100%
rename from cli/tests/tests_env_vars/test_run.py
rename to tests/tests_env_vars/test_run.py
diff --git a/cli/tests/tests_env_vars/test_versioned_entity.py b/tests/tests_env_vars/test_versioned_entity.py
similarity index 100%
rename from cli/tests/tests_env_vars/test_versioned_entity.py
rename to tests/tests_env_vars/test_versioned_entity.py