diff --git a/recipes/pcat/Makefile b/recipes/pcat/Makefile
index d1467ec..0181aab 100644
--- a/recipes/pcat/Makefile
+++ b/recipes/pcat/Makefile
@@ -1,7 +1,7 @@
 TARGET = disk.bin
 BASEDIR = ../..
-EDIR = $(BASEDIR)/emul
-STAGE = $(EDIR)/stage
+CDIR = $(BASEDIR)/cvm
+STAGE = $(CDIR)/stage
 
 .PHONY: all
 all: $(TARGET) 
@@ -13,10 +13,10 @@ os.bin: xcomp.fs $(STAGE)
 
 disk.bin: mbr.bin os.bin
 	cat mbr.bin os.bin > $@
-	dd if=$(EDIR)/blkfs of=$@ bs=512 seek=16
+	dd if=$(CDIR)/blkfs of=$@ bs=512 seek=16
 
 $(STAGE):
-	$(MAKE) -C $(EDIR) stage
+	$(MAKE) -C $(CDIR) stage
 
 .PHONY: emul
 emul: $(TARGET)
diff --git a/recipes/rc2014/Makefile b/recipes/rc2014/Makefile
index 3e7ccda..472ae2d 100644
--- a/recipes/rc2014/Makefile
+++ b/recipes/rc2014/Makefile
@@ -1,9 +1,8 @@
 TARGET = os.bin
 BASEDIR = ../..
-FDIR = $(BASEDIR)/forth
 EDIR = $(BASEDIR)/emul
-STAGE = $(EDIR)/stage
-EMUL = $(BASEDIR)/emul/hw/rc2014/classic
+STAGE = $(BASEDIR)/cvm/stage
+EMUL = $(EDIR)/hw/rc2014/classic
 
 .PHONY: all
 all: $(TARGET) 
diff --git a/recipes/sms/Makefile b/recipes/sms/Makefile
index 2adb2e5..28b1fbb 100644
--- a/recipes/sms/Makefile
+++ b/recipes/sms/Makefile
@@ -1,7 +1,7 @@
 TARGET = os.bin
-EDIR = ../../emul
-STAGE = $(EDIR)/stage
-EMUL = $(EDIR)/hw/sms/sms
+BASE = ../../
+STAGE = $(BASE)/cvm/stage
+EMUL = $(BASE)/emul/hw/sms/sms
 
 .PHONY: all
 all: $(TARGET) 
@@ -9,7 +9,7 @@ $(TARGET): xcomp.fs $(STAGE)
 	cat xcomp.fs | $(STAGE) > $@
 
 $(STAGE):
-	$(MAKE) -C $(EDIR) stage
+	$(MAKE) -C $(BASE)/cvm stage
 
 os.sms: $(TARGET) $(STAGE)
 	dd if=$(TARGET) bs=32752 conv=sync | cat - sega.bin > $@
diff --git a/recipes/ti84/Makefile b/recipes/ti84/Makefile
index 30c0bc5..858e637 100644
--- a/recipes/ti84/Makefile
+++ b/recipes/ti84/Makefile
@@ -1,9 +1,8 @@
 TARGET = os.bin
 BASEDIR = ../..
-FDIR = $(BASEDIR)/forth
-EDIR = $(BASEDIR)/emul
-STAGE = $(EDIR)/stage
-EMUL = $(EDIR)/hw/ti/ti84
+CDIR = $(BASEDIR)/cvm
+STAGE = $(CDIR)/stage
+EMUL = $(BASEDIR)/emul/hw/ti/ti84
 MKTIUPGRADE = mktiupgrade
 
 .PHONY: all
@@ -12,7 +11,7 @@ $(TARGET): xcomp.fs $(STAGE)
 	cat xcomp.fs | $(STAGE) > $@
 
 $(STAGE):
-	$(MAKE) -C $(EDIR) stage
+	$(MAKE) -C $(CDIR) stage
 
 $(EMUL):
 	$(MAKE) -C ${@:%/ti84=%}
diff --git a/recipes/trs80/Makefile b/recipes/trs80/Makefile
index 0ddcd85..d9d358d 100644
--- a/recipes/trs80/Makefile
+++ b/recipes/trs80/Makefile
@@ -1,6 +1,6 @@
 TARGET = os.bin
-EDIR = ../../emul
-STAGE = $(EDIR)/stage
+CDIR = ../../cvm
+STAGE = $(CDIR)/stage
 
 .PHONY: all
 all: $(TARGET) 
@@ -8,4 +8,4 @@ $(TARGET): xcomp.fs $(STAGE)
 	cat xcomp.fs | $(STAGE) > $@
 
 $(STAGE):
-	$(MAKE) -C $(EDIR) stage
+	$(MAKE) -C $(CDIR) stage
diff --git a/recipes/z80mbc2/Makefile b/recipes/z80mbc2/Makefile
index c9e602e..8e4ee11 100644
--- a/recipes/z80mbc2/Makefile
+++ b/recipes/z80mbc2/Makefile
@@ -1,7 +1,7 @@
 TARGET = os.bin
 BASEDIR = ../..
-EDIR = $(BASEDIR)/emul
-STAGE = $(EDIR)/stage
+CDIR = $(BASEDIR)/cvm
+STAGE = $(CDIR)/stage
 
 .PHONY: all
 all: $(TARGET) 
@@ -9,5 +9,5 @@ $(TARGET): xcomp.fs $(STAGE)
 	cat xcomp.fs | $(STAGE) > $@
 
 $(STAGE):
-	$(MAKE) -C $(EDIR) stage
+	$(MAKE) -C $(CDIR) stage