diff --git a/Makefile b/Makefile
index 6fabe98..481f174 100644
--- a/Makefile
+++ b/Makefile
@@ -24,20 +24,20 @@ PROGRAMS = m16vm m16as
 
 all: $(PROGRAMS)
 
-m16vm : src/vm.o src/cpu.o src/mm.o src/instr_decode.o src/syscall.o src/program.o
+m16vm : vm/vm.o vm/cpu.o vm/mm.o vm/instr_decode.o vm/syscall.o vm/program.o
 	$(LD) $(LDFLAGS) -o $@ $^
 
-m16as : src/as/as.o src/as/parser.o src/as/lexer.o \
-	src/as/codegen.o src/as/error.o src/as/symtab.o \
-	src/as/ast.o lib/libm16.a
+m16as : as/as.o as/parser.o as/lexer.o \
+	as/codegen.o as/error.o as/symtab.o \
+	as/ast.o lib/libm16.a
 	$(LD) $(LDFLAGS) -o $@ $^
 
 lib/libm16.a : lib/vector.o
 	$(AR) rcs $@ $^
 
 clean :
-	$(RM) src/*.o
-	$(RM) src/as/*.o
+	$(RM) as/*.o
+	$(RM) vm/*.o
 	$(RM) lib/*.o
 	$(RM) lib/*.a
 
diff --git a/src/as/as.c b/as/as.c
similarity index 100%
rename from src/as/as.c
rename to as/as.c
diff --git a/src/as/ast.c b/as/ast.c
similarity index 100%
rename from src/as/ast.c
rename to as/ast.c
diff --git a/src/as/ast.h b/as/ast.h
similarity index 100%
rename from src/as/ast.h
rename to as/ast.h
diff --git a/src/as/codegen.c b/as/codegen.c
similarity index 100%
rename from src/as/codegen.c
rename to as/codegen.c
diff --git a/src/as/codegen.h b/as/codegen.h
similarity index 100%
rename from src/as/codegen.h
rename to as/codegen.h
diff --git a/src/as/error.c b/as/error.c
similarity index 100%
rename from src/as/error.c
rename to as/error.c
diff --git a/src/as/error.h b/as/error.h
similarity index 100%
rename from src/as/error.h
rename to as/error.h
diff --git a/src/as/lexer.c b/as/lexer.c
similarity index 100%
rename from src/as/lexer.c
rename to as/lexer.c
diff --git a/src/as/lexer.h b/as/lexer.h
similarity index 100%
rename from src/as/lexer.h
rename to as/lexer.h
diff --git a/src/as/parser.c b/as/parser.c
similarity index 100%
rename from src/as/parser.c
rename to as/parser.c
diff --git a/src/as/parser.h b/as/parser.h
similarity index 100%
rename from src/as/parser.h
rename to as/parser.h
diff --git a/src/as/symtab.c b/as/symtab.c
similarity index 100%
rename from src/as/symtab.c
rename to as/symtab.c
diff --git a/src/as/symtab.h b/as/symtab.h
similarity index 100%
rename from src/as/symtab.h
rename to as/symtab.h
diff --git a/src/cpu.c b/vm/cpu.c
similarity index 100%
rename from src/cpu.c
rename to vm/cpu.c
diff --git a/src/cpu.h b/vm/cpu.h
similarity index 100%
rename from src/cpu.h
rename to vm/cpu.h
diff --git a/src/instr_decode.c b/vm/instr_decode.c
similarity index 100%
rename from src/instr_decode.c
rename to vm/instr_decode.c
diff --git a/src/instr_decode.h b/vm/instr_decode.h
similarity index 100%
rename from src/instr_decode.h
rename to vm/instr_decode.h
diff --git a/src/mm.c b/vm/mm.c
similarity index 100%
rename from src/mm.c
rename to vm/mm.c
diff --git a/src/mm.h b/vm/mm.h
similarity index 100%
rename from src/mm.h
rename to vm/mm.h
diff --git a/src/program.c b/vm/program.c
similarity index 100%
rename from src/program.c
rename to vm/program.c
diff --git a/src/program.h b/vm/program.h
similarity index 100%
rename from src/program.h
rename to vm/program.h
diff --git a/src/syscall.c b/vm/syscall.c
similarity index 100%
rename from src/syscall.c
rename to vm/syscall.c
diff --git a/src/syscall.h b/vm/syscall.h
similarity index 100%
rename from src/syscall.h
rename to vm/syscall.h
diff --git a/src/vm.c b/vm/vm.c
similarity index 100%
rename from src/vm.c
rename to vm/vm.c