diff --git a/infrastructure_new/bare-metal/install.sh b/infrastructure/bare-metal/install.sh
similarity index 100%
rename from infrastructure_new/bare-metal/install.sh
rename to infrastructure/bare-metal/install.sh
diff --git a/infrastructure_new/bare-metal/org-agent.service b/infrastructure/bare-metal/org-agent.service
similarity index 100%
rename from infrastructure_new/bare-metal/org-agent.service
rename to infrastructure/bare-metal/org-agent.service
diff --git a/infrastructure_legacy/docker/Dockerfile b/infrastructure/docker/Dockerfile
similarity index 100%
rename from infrastructure_legacy/docker/Dockerfile
rename to infrastructure/docker/Dockerfile
diff --git a/infrastructure_legacy/docker/docker-compose.yml b/infrastructure/docker/docker-compose.yml
similarity index 100%
rename from infrastructure_legacy/docker/docker-compose.yml
rename to infrastructure/docker/docker-compose.yml
diff --git a/infrastructure_new/guix/manifest.scm b/infrastructure/guix/manifest.scm
similarity index 100%
rename from infrastructure_new/guix/manifest.scm
rename to infrastructure/guix/manifest.scm
diff --git a/infrastructure_new/lxc/setup.org b/infrastructure/lxc/setup.org
similarity index 100%
rename from infrastructure_new/lxc/setup.org
rename to infrastructure/lxc/setup.org
diff --git a/infrastructure_new/vms/debian/Vagrantfile b/infrastructure/vms/debian/Vagrantfile
similarity index 100%
rename from infrastructure_new/vms/debian/Vagrantfile
rename to infrastructure/vms/debian/Vagrantfile
diff --git a/infrastructure_new/vms/fedora/Vagrantfile b/infrastructure/vms/fedora/Vagrantfile
similarity index 100%
rename from infrastructure_new/vms/fedora/Vagrantfile
rename to infrastructure/vms/fedora/Vagrantfile
diff --git a/infrastructure_new/docker/Dockerfile b/infrastructure_new/docker/Dockerfile
deleted file mode 100644
index eae7fd9..0000000
--- a/infrastructure_new/docker/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM debian:bullseye-slim
-
-ENV DEBIAN_FRONTEND=noninteractive
-
-RUN apt-get update && apt-get install -y \
-    sbcl \
-    emacs-nox \
-    curl \
-    git \
-    socat \
-    netcat-openbsd \
-    libssl-dev \
-    libncurses5-dev \
-    libffi-dev \
-    zlib1g-dev \
-    libsqlite3-dev \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install Quicklisp
-RUN curl -O https://beta.quicklisp.org/quicklisp.lisp \
-    && sbcl --non-interactive --load quicklisp.lisp --eval "(quicklisp-quickstart:install)" --eval "(ql-util:without-prompting (ql:add-to-init-file))" \
-    && rm quicklisp.lisp
-
-WORKDIR /app
-COPY . .
-
-# Initialize system in non-interactive mode
-RUN mkdir -p /root/memex && ./opencortex.sh setup --non-interactive
-
-EXPOSE 9105
-
-CMD ["./opencortex.sh", "boot"]
diff --git a/infrastructure_new/docker/docker-compose.yml b/infrastructure_new/docker/docker-compose.yml
deleted file mode 100644
index f52d92a..0000000
--- a/infrastructure_new/docker/docker-compose.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-services:
-  opencortex:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    container_name: opencortex
-    env_file: .env
-    volumes:
-      # Mount the entire memex directory (2 levels up from projects/opencortex)
-      - ../..:/memex
-      # Ensure signal-cli state is preserved
-      - signal-state:/root/.local/share/signal-cli
-    ports:
-      - "${ORG_AGENT_DAEMON_PORT:-9105}:9105"
-      - "${ORG_AGENT_WEB_PORT:-8080}:8080"
-    restart: unless-stopped
-
-volumes:
-  signal-state: