diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0cd389c
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "buildtools"]
+	path = buildtools
+	url = git://github.com/Steveice10/buildtools
diff --git a/Makefile b/Makefile
index bc89d11..3f1538e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,48 @@
-ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPRO")
+# TARGET #
+
+TARGET := 3DS
+LIBRARY := 0
+
+ifeq ($(TARGET),3DS)
+	ifeq ($(strip $(DEVKITPRO)),)
+		$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro")
+	endif
+
+	ifeq ($(strip $(DEVKITARM)),)
+		$(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
+	endif
 endif
 
-#---------------------------------------------------------------------------------
-# BUILD_FLAGS: List of extra build flags to add.
-# ENABLE_EXCEPTIONS: Enable C++ exceptions.
-# NO_CITRUS: Do not include citrus.
-#---------------------------------------------------------------------------------
-BUILD_FLAGS := -DVERSION_STRING="\"`git describe --tags --abbrev=0`\""
+# COMMON CONFIGURATION #
 
-include $(DEVKITPRO)/citrus/tools/make_base
+NAME := FBI
+
+BUILD_DIR := build
+OUTPUT_DIR := output
+INCLUDE_DIRS := include
+SOURCE_DIRS := source
+
+LIBRARY_DIRS := $(DEVKITPRO)/citrus $(DEVKITPRO)/libctru
+LIBRARIES := citrus ctru m
+
+BUILD_FLAGS := -DVERSION_STRING="\"`git describe --tags --abbrev=0`\""
+RUN_FLAGS :=
+
+# 3DS CONFIGURATION #
+
+DESCRIPTION := Open source CIA installer.
+AUTHOR := Steveice10
+PRODUCT_CODE := CTR-P-CFBI
+UNIQUE_ID := 0x1930
+
+SYSTEM_MODE := 64MB
+SYSTEM_MODE_EXT := Legacy
+
+ROMFS_DIR :=
+BANNER_AUDIO := meta/audio.wav
+BANNER_IMAGE := meta/banner.png
+ICON := meta/icon.png
+
+# INTERNAL #
+
+include buildtools/make_base
diff --git a/buildtools b/buildtools
new file mode 160000
index 0000000..1d304f5
--- /dev/null
+++ b/buildtools
@@ -0,0 +1 @@
+Subproject commit 1d304f54dcdd590c66ba8124a9e362d2d3153827
diff --git a/resources/audio.wav b/meta/audio.wav
similarity index 100%
rename from resources/audio.wav
rename to meta/audio.wav
diff --git a/resources/banner.png b/meta/banner.png
similarity index 100%
rename from resources/banner.png
rename to meta/banner.png
diff --git a/resources/icon.png b/meta/icon.png
similarity index 100%
rename from resources/icon.png
rename to meta/icon.png
diff --git a/resources/AppInfo b/resources/AppInfo
deleted file mode 100644
index 92f1674..0000000
--- a/resources/AppInfo
+++ /dev/null
@@ -1,5 +0,0 @@
-APP_TITLE = FBI
-APP_DESCRIPTION = Open source CIA installer.
-APP_AUTHOR = Steveice10
-APP_PRODUCT_CODE = CTR-P-CFBI
-APP_UNIQUE_ID = 0x1930
\ No newline at end of file