diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..97b2b40
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "ext/cglm"]
+	path = ext/cglm
+	url = https://github.com/recp/cglm
+[submodule "ext/glfw"]
+	path = ext/glfw
+	url = https://github.com/glfw/glfw
diff --git a/doc/DESIGN.ms b/DESIGN.ms
similarity index 100%
rename from doc/DESIGN.ms
rename to DESIGN.ms
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ff49357
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,43 @@
+LIBGLFW=./libglfw.so
+
+BIN = ./manigraph
+OBJ = \
+	src/window.o \
+	src/matrix.o \
+	src/shader.o \
+	src/color.o \
+	src/mesh.o \
+	src/main.o 
+
+LIB = \
+	$(LIBGLFW)
+
+DOC = \
+	DESIGN.pdf
+
+CFLAGS=  \
+	-I./ext/cglm/include  \
+	-I./ext/glfw/include  \
+	-Wall -Wno-unused-function -std=c89 
+
+all: $(DOC) $(BIN) $(LIB)
+
+$(BIN): $(OBJ) $(LIB)
+	$(CC) -lGL -lglfw -L.  -o $(BIN) $(OBJ)
+
+$(LIBGLFW):
+	$(CC) -fPIC -shared -D_GLFW_X11 -D_GLFW_BUILD_DLL ./ext/glfw/src/*.c -o $@ 
+
+run:
+	LD_LIBRARY_PATH=. $(BIN)
+
+clean:
+	rm $(OBJ) $(DOC) $(LIB) $(BIN)
+
+.SUFFIXES: .ms .pdf .c .o
+
+.ms.pdf:
+	cat $< | sed -e "s/^\s*//g" -e "/^$$/d" | groff -Tpdf -fC -ms > $@
+
+.c.o:
+	$(CC) $(CFLAGS) $< -c -o $@
diff --git a/doc/Makefile b/doc/Makefile
deleted file mode 100644
index 95d820b..0000000
--- a/doc/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-OBJ = \
-	DESIGN.pdf
-
-all: $(OBJ)
-
-clean:
-	rm $(OBJ)
-
-.SUFFIXES: .ms .pdf 
-
-.ms.pdf:
-	cat $< | sed -e "s/^\s*//g" -e "/^$$/d" | groff -Tpdf -fC -ms > $@
-
-
diff --git a/ext/cglm b/ext/cglm
new file mode 160000
index 0000000..c12f318
--- /dev/null
+++ b/ext/cglm
@@ -0,0 +1 @@
+Subproject commit c12f318fabf14853174419f3892654612186c5c7
diff --git a/ext/glfw b/ext/glfw
new file mode 160000
index 0000000..b35641f
--- /dev/null
+++ b/ext/glfw
@@ -0,0 +1 @@
+Subproject commit b35641f4a3c62aa86a0b3c983d163bc0fe36026d
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index f0d74bb..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-BIN = ./manigraph
-LIBGLFW=./libglfw.so
-
-LIB= $(LIBGLFW)
-
-OBJ = \
-	window.o \
-	matrix.o \
-	shader.o \
-	color.o \
-	mesh.o \
-	main.o 
-
-CFLAGS=  \
-	-I../ext/cglm/include  \
-	-I../ext/glfw/include  \
-	-Wall -Wno-unused-function -std=c89 
-
-
-$(BIN): $(OBJ) $(LIB)
-	$(CC) -lGL -lglfw -L.  -o $(BIN) $(OBJ)
-
-
-$(LIBGLFW):
-	$(CC) -fPIC -shared -D_GLFW_X11 -D_GLFW_BUILD_DLL ../ext/glfw/src/*.c -o $@ 
-
-run:
-	LD_LIBRARY_PATH=. $(BIN)
-
-clean:
-	rm $(BIN) $(OBJ) $(LIB)