diff --git a/podman/environment-minimal.yml b/podman/configs/environment-minimal.yml
similarity index 100%
rename from podman/environment-minimal.yml
rename to podman/configs/environment-minimal.yml
diff --git a/podman/environment.yml b/podman/configs/environment.yml
similarity index 100%
rename from podman/environment.yml
rename to podman/configs/environment.yml
diff --git a/podman/security_policy.json b/podman/configs/security_policy.json
similarity index 100%
rename from podman/security_policy.json
rename to podman/configs/security_policy.json
diff --git a/podman/hermetic.dockerfile b/podman/containers/hermetic.dockerfile
similarity index 100%
rename from podman/hermetic.dockerfile
rename to podman/containers/hermetic.dockerfile
diff --git a/podman/ml-tools-runner.podfile b/podman/containers/ml-tools-runner.podfile
similarity index 100%
rename from podman/ml-tools-runner.podfile
rename to podman/containers/ml-tools-runner.podfile
diff --git a/podman/optimized-ml-runner.podfile b/podman/containers/optimized-ml-runner.podfile
similarity index 100%
rename from podman/optimized-ml-runner.podfile
rename to podman/containers/optimized-ml-runner.podfile
diff --git a/podman/secure-ml-runner.podfile b/podman/containers/secure-ml-runner.podfile
similarity index 100%
rename from podman/secure-ml-runner.podfile
rename to podman/containers/secure-ml-runner.podfile
diff --git a/podman/ML_TOOLS_GUIDE.md b/podman/docs/ML_TOOLS_GUIDE.md
similarity index 100%
rename from podman/ML_TOOLS_GUIDE.md
rename to podman/docs/ML_TOOLS_GUIDE.md
diff --git a/podman/jupyter_workflow.md b/podman/docs/jupyter_workflow.md
similarity index 100%
rename from podman/jupyter_workflow.md
rename to podman/docs/jupyter_workflow.md
diff --git a/podman/jupyter_runtime/runtime/jupyter_cookie_secret b/podman/jupyter/jupyter_cookie_secret
similarity index 100%
rename from podman/jupyter_runtime/runtime/jupyter_cookie_secret
rename to podman/jupyter/jupyter_cookie_secret
diff --git a/podman/cli_integration.py b/podman/scripts/cli_integration.py
similarity index 100%
rename from podman/cli_integration.py
rename to podman/scripts/cli_integration.py
diff --git a/podman/jupyter_launcher.sh b/podman/scripts/jupyter_launcher.sh
similarity index 100%
rename from podman/jupyter_launcher.sh
rename to podman/scripts/jupyter_launcher.sh
diff --git a/podman/secure_runner.py b/podman/scripts/secure_runner.py
similarity index 100%
rename from podman/secure_runner.py
rename to podman/scripts/secure_runner.py
diff --git a/podman/test_ml_tools.py b/podman/scripts/test_ml_tools.py
similarity index 100%
rename from podman/test_ml_tools.py
rename to podman/scripts/test_ml_tools.py
diff --git a/podman/workspace/cli_integration.py b/podman/workspace/cli_integration.py
deleted file mode 100644
index 6f0be64..0000000
--- a/podman/workspace/cli_integration.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# CLI-Jupyter Integration Helper
-import subprocess
-import os
-def sync_project(project_path):
-    """Sync project using CLI"""
-    cmd = ["../cli/zig-out/bin/ml", "sync", project_path, "--queue"]
-    result = subprocess.run(cmd, capture_output=True, text=True)
-    return result.returncode == 0
diff --git a/podman/workspace/mlflow.db b/podman/workspace/mlflow.db
deleted file mode 100644
index ce18f33..0000000
Binary files a/podman/workspace/mlflow.db and /dev/null differ