diff --git a/ci/README.md b/ci/README.md
new file mode 100644
index 00000000000..192243d598b
--- /dev/null
+++ b/ci/README.md
@@ -0,0 +1 @@
+Note: This directory is under active development for CI improvements and is not currently in use within the scope of the existing CI pipeline.
diff --git a/ci_v2/docker/fasttest/Dockerfile b/ci/docker/fasttest/Dockerfile
similarity index 100%
rename from ci_v2/docker/fasttest/Dockerfile
rename to ci/docker/fasttest/Dockerfile
diff --git a/ci_v2/docker/fasttest/requirements.txt b/ci/docker/fasttest/requirements.txt
similarity index 100%
rename from ci_v2/docker/fasttest/requirements.txt
rename to ci/docker/fasttest/requirements.txt
diff --git a/ci_v2/docker/style-test/Dockerfile b/ci/docker/style-test/Dockerfile
similarity index 100%
rename from ci_v2/docker/style-test/Dockerfile
rename to ci/docker/style-test/Dockerfile
diff --git a/ci_v2/docker/style-test/requirements.txt b/ci/docker/style-test/requirements.txt
similarity index 100%
rename from ci_v2/docker/style-test/requirements.txt
rename to ci/docker/style-test/requirements.txt
diff --git a/ci_v2/jobs/check_style.py b/ci/jobs/check_style.py
similarity index 100%
rename from ci_v2/jobs/check_style.py
rename to ci/jobs/check_style.py
diff --git a/ci_v2/jobs/fast_test.py b/ci/jobs/fast_test.py
similarity index 100%
rename from ci_v2/jobs/fast_test.py
rename to ci/jobs/fast_test.py
diff --git a/ci_v2/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt b/ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt
similarity index 100%
rename from ci_v2/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt
rename to ci/jobs/scripts/check_style/aspell-ignore/en/aspell-dict.txt
diff --git a/ci_v2/jobs/scripts/check_style/check_aspell.sh b/ci/jobs/scripts/check_style/check_aspell.sh
similarity index 100%
rename from ci_v2/jobs/scripts/check_style/check_aspell.sh
rename to ci/jobs/scripts/check_style/check_aspell.sh
diff --git a/ci_v2/jobs/scripts/check_style/check_cpp.sh b/ci/jobs/scripts/check_style/check_cpp.sh
similarity index 100%
rename from ci_v2/jobs/scripts/check_style/check_cpp.sh
rename to ci/jobs/scripts/check_style/check_cpp.sh
diff --git a/ci_v2/jobs/scripts/check_style/check_submodules.sh b/ci/jobs/scripts/check_style/check_submodules.sh
similarity index 100%
rename from ci_v2/jobs/scripts/check_style/check_submodules.sh
rename to ci/jobs/scripts/check_style/check_submodules.sh
diff --git a/ci_v2/jobs/scripts/check_style/check_typos.sh b/ci/jobs/scripts/check_style/check_typos.sh
similarity index 100%
rename from ci_v2/jobs/scripts/check_style/check_typos.sh
rename to ci/jobs/scripts/check_style/check_typos.sh
diff --git a/ci_v2/jobs/scripts/check_style/checks_to_refactor.sh b/ci/jobs/scripts/check_style/checks_to_refactor.sh
similarity index 100%
rename from ci_v2/jobs/scripts/check_style/checks_to_refactor.sh
rename to ci/jobs/scripts/check_style/checks_to_refactor.sh
diff --git a/ci_v2/jobs/scripts/check_style/double_whitespaces.pl b/ci/jobs/scripts/check_style/double_whitespaces.pl
similarity index 100%
rename from ci_v2/jobs/scripts/check_style/double_whitespaces.pl
rename to ci/jobs/scripts/check_style/double_whitespaces.pl
diff --git a/ci_v2/jobs/scripts/functional_tests_results.py b/ci/jobs/scripts/functional_tests_results.py
similarity index 100%
rename from ci_v2/jobs/scripts/functional_tests_results.py
rename to ci/jobs/scripts/functional_tests_results.py
diff --git a/praktika/__init__.py b/ci/praktika/__init__.py
similarity index 100%
rename from praktika/__init__.py
rename to ci/praktika/__init__.py
diff --git a/praktika/__main__.py b/ci/praktika/__main__.py
similarity index 100%
rename from praktika/__main__.py
rename to ci/praktika/__main__.py
diff --git a/praktika/_environment.py b/ci/praktika/_environment.py
similarity index 100%
rename from praktika/_environment.py
rename to ci/praktika/_environment.py
diff --git a/praktika/_settings.py b/ci/praktika/_settings.py
similarity index 100%
rename from praktika/_settings.py
rename to ci/praktika/_settings.py
diff --git a/praktika/artifact.py b/ci/praktika/artifact.py
similarity index 100%
rename from praktika/artifact.py
rename to ci/praktika/artifact.py
diff --git a/praktika/cache.py b/ci/praktika/cache.py
similarity index 100%
rename from praktika/cache.py
rename to ci/praktika/cache.py
diff --git a/praktika/cidb.py b/ci/praktika/cidb.py
similarity index 100%
rename from praktika/cidb.py
rename to ci/praktika/cidb.py
diff --git a/praktika/digest.py b/ci/praktika/digest.py
similarity index 100%
rename from praktika/digest.py
rename to ci/praktika/digest.py
diff --git a/praktika/docker.py b/ci/praktika/docker.py
similarity index 100%
rename from praktika/docker.py
rename to ci/praktika/docker.py
diff --git a/praktika/environment.py b/ci/praktika/environment.py
similarity index 100%
rename from praktika/environment.py
rename to ci/praktika/environment.py
diff --git a/praktika/execution/__init__.py b/ci/praktika/execution/__init__.py
similarity index 100%
rename from praktika/execution/__init__.py
rename to ci/praktika/execution/__init__.py
diff --git a/praktika/execution/__main__.py b/ci/praktika/execution/__main__.py
similarity index 100%
rename from praktika/execution/__main__.py
rename to ci/praktika/execution/__main__.py
diff --git a/praktika/execution/execution_settings.py b/ci/praktika/execution/execution_settings.py
similarity index 100%
rename from praktika/execution/execution_settings.py
rename to ci/praktika/execution/execution_settings.py
diff --git a/praktika/execution/machine_init.py b/ci/praktika/execution/machine_init.py
similarity index 100%
rename from praktika/execution/machine_init.py
rename to ci/praktika/execution/machine_init.py
diff --git a/praktika/favicon/lambda_function.py b/ci/praktika/favicon/lambda_function.py
similarity index 100%
rename from praktika/favicon/lambda_function.py
rename to ci/praktika/favicon/lambda_function.py
diff --git a/praktika/gh.py b/ci/praktika/gh.py
similarity index 100%
rename from praktika/gh.py
rename to ci/praktika/gh.py
diff --git a/praktika/gh_auth.py b/ci/praktika/gh_auth.py
similarity index 100%
rename from praktika/gh_auth.py
rename to ci/praktika/gh_auth.py
diff --git a/praktika/hook_cache.py b/ci/praktika/hook_cache.py
similarity index 100%
rename from praktika/hook_cache.py
rename to ci/praktika/hook_cache.py
diff --git a/praktika/hook_html.py b/ci/praktika/hook_html.py
similarity index 100%
rename from praktika/hook_html.py
rename to ci/praktika/hook_html.py
diff --git a/praktika/hook_interface.py b/ci/praktika/hook_interface.py
similarity index 100%
rename from praktika/hook_interface.py
rename to ci/praktika/hook_interface.py
diff --git a/praktika/html_prepare.py b/ci/praktika/html_prepare.py
similarity index 100%
rename from praktika/html_prepare.py
rename to ci/praktika/html_prepare.py
diff --git a/praktika/job.py b/ci/praktika/job.py
similarity index 100%
rename from praktika/job.py
rename to ci/praktika/job.py
diff --git a/praktika/json.html b/ci/praktika/json.html
similarity index 100%
rename from praktika/json.html
rename to ci/praktika/json.html
diff --git a/praktika/mangle.py b/ci/praktika/mangle.py
similarity index 100%
rename from praktika/mangle.py
rename to ci/praktika/mangle.py
diff --git a/praktika/native_jobs.py b/ci/praktika/native_jobs.py
similarity index 100%
rename from praktika/native_jobs.py
rename to ci/praktika/native_jobs.py
diff --git a/praktika/parser.py b/ci/praktika/parser.py
similarity index 100%
rename from praktika/parser.py
rename to ci/praktika/parser.py
diff --git a/praktika/result.py b/ci/praktika/result.py
similarity index 100%
rename from praktika/result.py
rename to ci/praktika/result.py
diff --git a/praktika/runner.py b/ci/praktika/runner.py
similarity index 100%
rename from praktika/runner.py
rename to ci/praktika/runner.py
diff --git a/praktika/runtime.py b/ci/praktika/runtime.py
similarity index 100%
rename from praktika/runtime.py
rename to ci/praktika/runtime.py
diff --git a/praktika/s3.py b/ci/praktika/s3.py
similarity index 100%
rename from praktika/s3.py
rename to ci/praktika/s3.py
diff --git a/praktika/secret.py b/ci/praktika/secret.py
similarity index 100%
rename from praktika/secret.py
rename to ci/praktika/secret.py
diff --git a/praktika/settings.py b/ci/praktika/settings.py
similarity index 100%
rename from praktika/settings.py
rename to ci/praktika/settings.py
diff --git a/praktika/utils.py b/ci/praktika/utils.py
similarity index 100%
rename from praktika/utils.py
rename to ci/praktika/utils.py
diff --git a/praktika/validator.py b/ci/praktika/validator.py
similarity index 100%
rename from praktika/validator.py
rename to ci/praktika/validator.py
diff --git a/praktika/version.py b/ci/praktika/version.py
similarity index 100%
rename from praktika/version.py
rename to ci/praktika/version.py
diff --git a/praktika/workflow.py b/ci/praktika/workflow.py
similarity index 100%
rename from praktika/workflow.py
rename to ci/praktika/workflow.py
diff --git a/praktika/yaml_generator.py b/ci/praktika/yaml_generator.py
similarity index 100%
rename from praktika/yaml_generator.py
rename to ci/praktika/yaml_generator.py
diff --git a/ci_v2/settings/definitions.py b/ci/settings/definitions.py
similarity index 100%
rename from ci_v2/settings/definitions.py
rename to ci/settings/definitions.py
diff --git a/ci_v2/settings/settings.py b/ci/settings/settings.py
similarity index 100%
rename from ci_v2/settings/settings.py
rename to ci/settings/settings.py
diff --git a/ci_v2/workflows/pull_request.py b/ci/workflows/pull_request.py
similarity index 100%
rename from ci_v2/workflows/pull_request.py
rename to ci/workflows/pull_request.py