diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..60ddf3d2
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ext/nanovg"]
+	path = ext/nanovg
+	url = https://github.com/memononen/nanovg.git
diff --git a/Makefile b/Makefile
index b6a253c5..e97f572c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,18 @@
 ARCH ?= linux
 CFLAGS = -MMD -g -Wall -O2
 CXXFLAGS = -MMD -g -Wall -std=c++11 -O3 -ffast-math -fno-exceptions \
-	-I./lib -I./include
+	-I./ext -I./include
 LDFLAGS =
 
 SOURCES = $(wildcard src/*.cpp src/*/*.cpp) \
-	lib/nanovg/src/nanovg.c
+	ext/nanovg/src/nanovg.c
 
 
 # Linux
 ifeq ($(ARCH), linux)
 CC = gcc
 CXX = g++
-SOURCES += lib/noc/noc_file_dialog.c
+SOURCES += ext/noc/noc_file_dialog.c
 CFLAGS += -DNOC_FILE_DIALOG_GTK $(shell pkg-config --cflags gtk+-2.0)
 CXXFLAGS += -DLINUX
 LDFLAGS += -rdynamic -lpthread -lGL -lGLEW -lglfw -ldl -ljansson -lportaudio -lportmidi -lsamplerate \
@@ -24,7 +24,7 @@ endif
 ifeq ($(ARCH), apple)
 CC = clang
 CXX = clang++
-SOURCES += lib/noc/noc_file_dialog.m
+SOURCES += ext/noc/noc_file_dialog.m
 CFLAGS += -DNOC_FILE_DIALOG_OSX
 CXXFLAGS += -DAPPLE -stdlib=libc++ -I$(HOME)/local/include
 LDFLAGS += -stdlib=libc++ -L$(HOME)/local/lib -lpthread -lglew -lglfw3 -framework Cocoa -framework OpenGL -framework IOKit -framework CoreVideo -ldl -ljansson -lportaudio -lportmidi -lsamplerate
@@ -38,7 +38,7 @@ endif
 ifeq ($(ARCH), windows)
 CC = x86_64-w64-mingw32-gcc
 CXX = x86_64-w64-mingw32-g++
-SOURCES += lib/noc/noc_file_dialog.c
+SOURCES += ext/noc/noc_file_dialog.c
 CFLAGS += -DNOC_FILE_DIALOG_WIN32
 CXXFLAGS += -DWINDOWS -D_USE_MATH_DEFINES -DGLEW_STATIC \
 	-I$(HOME)/pkg/portaudio-r1891-build/include
diff --git a/ext/nanovg b/ext/nanovg
new file mode 160000
index 00000000..8feae63a
--- /dev/null
+++ b/ext/nanovg
@@ -0,0 +1 @@
+Subproject commit 8feae63a46fdf8ed83613b6a46da25d44adde07f
diff --git a/include/widgets.hpp b/include/widgets.hpp
index f5189a08..b02b561f 100644
--- a/include/widgets.hpp
+++ b/include/widgets.hpp
@@ -8,8 +8,8 @@
 
 #include <jansson.h>
 
-#include "../lib/nanovg/src/nanovg.h"
-#include "../lib/oui/blendish.h"
+#include "../ext/nanovg/src/nanovg.h"
+#include "../ext/oui/blendish.h"
 
 #include "util.hpp"
 
diff --git a/src/gui.cpp b/src/gui.cpp
index fea68a12..b52e3010 100644
--- a/src/gui.cpp
+++ b/src/gui.cpp
@@ -6,14 +6,14 @@
 
 // #define NANOVG_GLEW
 #define NANOVG_IMPLEMENTATION
-#include "../lib/nanovg/src/nanovg.h"
+#include "../ext/nanovg/src/nanovg.h"
 #define NANOVG_GL2_IMPLEMENTATION
-#include "../lib/nanovg/src/nanovg_gl.h"
+#include "../ext/nanovg/src/nanovg_gl.h"
 #define BLENDISH_IMPLEMENTATION
-#include "../lib/oui/blendish.h"
+#include "../ext/oui/blendish.h"
 
 extern "C" {
-	#include "../lib/noc/noc_file_dialog.h"
+	#include "../ext/noc/noc_file_dialog.h"
 }