fixup! WIP: Refactor the code structure

packaging/Makefile

@@ -6,9 +6,7 @@ debian-package: debian-package-resources debian-package-code
 debian-package-code:
 	rm -fr ./aleph-vm/opt/aleph-vm
 	mkdir -p ./aleph-vm/opt/aleph-vm
-	cp -r ../vm_supervisor ./aleph-vm/opt/aleph-vm/
-	cp -r ../guest_api ./aleph-vm/opt/aleph-vm/
-	cp -r ../firecracker ./aleph-vm/opt/aleph-vm/
+	cp -r ../src/aleph ./aleph-vm/opt/aleph-vm/
 
 	# Fake data for diagnostic and benchmarks
 	mkdir -p ./aleph-vm/opt/aleph-vm/examples/
@@ -49,7 +47,7 @@ download-ipfs-kubo: target-dir build-dir
 
 version:
 	python3 ./version_from_git.py --inplace deb aleph-vm/DEBIAN/control
-	python3 ./version_from_git.py --inplace __version__ ../vm_supervisor/version.py
+	python3 ./version_from_git.py --inplace __version__ ../aleph/vm/orchestrator/version.py
 
 build-dir:
 	mkdir -p target

packaging/aleph-vm/etc/systemd/system/aleph-vm-supervisor.service

@@ -10,7 +10,7 @@ WorkingDirectory=/opt/aleph-vm
 Environment=PYTHONPATH=/opt/aleph-vm/:$PYTHONPATH
 Environment=PYTHONDONTWRITEBYTECODE="enabled"
 EnvironmentFile=/etc/aleph-vm/supervisor.env
-ExecStart=python3 -m vm_supervisor --print-settings --very-verbose
+ExecStart=python3 -m aleph.vm.orchestrator --print-settings --very-verbose
 Restart=always
 RestartSec=10s
 

packaging/debian-11.dockerfile

@@ -9,9 +9,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt
-COPY ../src/aleph/vm/orchestrator ./vm_supervisor
-COPY ../src/aleph/vm/guest_api ./guest_api
-COPY ../src/aleph/vm/hypervisors/firecracker ./firecracker
+COPY ../src/aleph/ ./aleph
 COPY ../packaging ./packaging
 COPY ../kernels ./kernels
 

packaging/debian-12.dockerfile

@@ -9,9 +9,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt
-COPY ../src/aleph/vm/orchestrator ./vm_supervisor
-COPY ../src/aleph/vm/guest_api ./guest_api
-COPY ../src/aleph/vm/hypervisors/firecracker ./firecracker
+COPY ../src/aleph ./aleph
 COPY ../packaging ./packaging
 COPY ../kernels ./kernels
 

packaging/ubuntu-22.04.dockerfile

@@ -9,9 +9,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt
-COPY ../src/aleph/vm/orchestrator ./vm_supervisor
-COPY ../src/aleph/vm/guest_api ./guest_api
-COPY ../src/aleph/vm/hypervisors/firecracker ./firecracker
+COPY ../src/aleph ./aleph
 COPY ../packaging ./packaging
 COPY ../kernels ./kernels