diff --git a/Makefile b/Makefile
index 72d62bd..b96f9c4 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ check-env:
 update-dev: ## Update development environment (git pull + restart)
 	@echo "🔄 Updating development environment..."
 	@echo "📥 Pulling latest development changes..."
-	@ssh root@info.ourworld.tf 'cd /root/code/git.ourworld.tf/tfgrid_research/dev/threefold-marketplace && git checkout development && git pull'
+	@ssh root@info.ourworld.tf 'cd /root/code/git.ourworld.tf/tfgrid/dev/projectmycelium && git checkout development && git pull'
 	@echo "🔄 Restarting development service..."
 	@ssh root@info.ourworld.tf 'zinit restart projectmycelium-dev'
 	@echo "✅ Development update complete!"
@@ -50,7 +50,7 @@ update-dev: ## Update development environment (git pull + restart)
 update-prod: ## Update production environment (git pull + restart)
 	@echo "🔄 Updating production environment..."
 	@echo "📥 Pulling latest main changes..."
-	@ssh root@info.ourworld.tf 'cd /root/code/git.ourworld.tf/tfgrid_research/prod/threefold-marketplace && git checkout main && git pull'
+	@ssh root@info.ourworld.tf 'cd /root/code/git.ourworld.tf/tfgrid/prod/projectmycelium && git checkout main && git pull'
 	@echo "🔄 Restarting production service..."
 	@ssh root@info.ourworld.tf 'zinit restart projectmycelium-prod'
 	@echo "✅ Production update complete!"
@@ -58,26 +58,26 @@ update-prod: ## Update production environment (git pull + restart)
 rm-dev: ## Remove development repo directory on server (DANGEROUS)
 	@echo "🧨 Removing development repo on server..."
 	@ssh root@info.ourworld.tf 'zinit stop projectmycelium-dev || true'
-	@ssh root@info.ourworld.tf 'rm -rf /root/code/git.ourworld.tf/tfgrid_research/dev/threefold-marketplace'
-	@ssh root@info.ourworld.tf 'test ! -d /root/code/git.ourworld.tf/tfgrid_research/dev/threefold-marketplace && echo "✅ Dev repo removed" || (echo "❌ Failed to remove dev repo" && exit 1)'
+	@ssh root@info.ourworld.tf 'rm -rf /root/code/git.ourworld.tf/tfgrid/dev/projectmycelium'
+	@ssh root@info.ourworld.tf 'test ! -d /root/code/git.ourworld.tf/tfgrid/dev/projectmycelium && echo "✅ Dev repo removed" || (echo "❌ Failed to remove dev repo" && exit 1)'
 
 rm-prod: ## Remove production repo directory on server (DANGEROUS)
 	@echo "🧨 Removing production repo on server..."
 	@ssh root@info.ourworld.tf 'zinit stop projectmycelium-prod || true'
-	@ssh root@info.ourworld.tf 'rm -rf /root/code/git.ourworld.tf/tfgrid_research/prod/threefold-marketplace'
-	@ssh root@info.ourworld.tf 'test ! -d /root/code/git.ourworld.tf/tfgrid_research/prod/threefold-marketplace && echo "✅ Prod repo removed" || (echo "❌ Failed to remove prod repo" && exit 1)'
+	@ssh root@info.ourworld.tf 'rm -rf /root/code/git.ourworld.tf/tfgrid/prod/projectmycelium'
+	@ssh root@info.ourworld.tf 'test ! -d /root/code/git.ourworld.tf/tfgrid/prod/projectmycelium && echo "✅ Prod repo removed" || (echo "❌ Failed to remove prod repo" && exit 1)'
 
 clone-dev: ## Clone development repo on server and start service
 	@echo "📥 Cloning development repository on server..."
-	@ssh root@info.ourworld.tf 'mkdir -p /root/code/git.ourworld.tf/tfgrid_research/dev && cd /root/code/git.ourworld.tf/tfgrid_research/dev && if [ -d threefold-marketplace ]; then echo "Repo already exists. Skipping clone."; else git clone https://git.ourworld.tf/tfgrid_research/threefold-marketplace.git; fi'
-	@ssh root@info.ourworld.tf 'cd /root/code/git.ourworld.tf/tfgrid_research/dev/threefold-marketplace && git checkout development || echo "Branch development not found, using default."'
+	@ssh root@info.ourworld.tf 'mkdir -p /root/code/git.ourworld.tf/tfgrid/dev && cd /root/code/git.ourworld.tf/tfgrid/dev && if [ -d projectmycelium ]; then echo "Repo already exists. Skipping clone."; else git clone https://git.ourworld.tf/tfgrid/projectmycelium.git; fi'
+	@ssh root@info.ourworld.tf 'cd /root/code/git.ourworld.tf/tfgrid/dev/projectmycelium && git checkout development || echo "Branch development not found, using default."'
 	@echo "🚀 Starting development service..."
 	@ssh root@info.ourworld.tf 'zinit start projectmycelium-dev'
 
 clone-prod: ## Clone production repo on server and start service
 	@echo "📥 Cloning production repository on server..."
-	@ssh root@info.ourworld.tf 'mkdir -p /root/code/git.ourworld.tf/tfgrid_research/prod && cd /root/code/git.ourworld.tf/tfgrid_research/prod && if [ -d threefold-marketplace ]; then echo "Repo already exists. Skipping clone."; else git clone https://git.ourworld.tf/tfgrid_research/threefold-marketplace.git; fi'
-	@ssh root@info.ourworld.tf 'cd /root/code/git.ourworld.tf/tfgrid_research/prod/threefold-marketplace && git checkout main || echo "Branch main not found, using default."'
+	@ssh root@info.ourworld.tf 'mkdir -p /root/code/git.ourworld.tf/tfgrid/prod && cd /root/code/git.ourworld.tf/tfgrid/prod && if [ -d projectmycelium ]; then echo "Repo already exists. Skipping clone."; else git clone https://git.ourworld.tf/tfgrid/projectmycelium.git; fi'
+	@ssh root@info.ourworld.tf 'cd /root/code/git.ourworld.tf/tfgrid/prod/projectmycelium && git checkout main || echo "Branch main not found, using default."'
 	@echo "🚀 Starting production service..."
 	@ssh root@info.ourworld.tf 'zinit start projectmycelium-prod'