diff --git a/.gitignore b/.gitignore
index 82f95e27..c7dc1b30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ build/current
 build/gba
 build/*-release
 build/*-debug
+dist
 tags
 nostalgia.gba
 nostalgia.sav
diff --git a/Makefile b/Makefile
index e0c20f6e..103d3070 100644
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ shell:
 
 release:
 	${ENV_RUN} rm -rf build/${HOST_ENV}-release
-	${ENV_RUN} ./scripts/setup_build ${HOST_ENV}
+	${ENV_RUN} ./scripts/setup_build ${HOST_ENV} release
 	${ENV_RUN} rm -f build/current
 	${ENV_RUN} ln -s ${HOST_ENV}-release build/current
 
diff --git a/scripts/setup_build b/scripts/setup_build
index 444eead3..09bf9ef4 100755
--- a/scripts/setup_build
+++ b/scripts/setup_build
@@ -15,15 +15,17 @@ fi
 
 if [[ $BUILD_TYPE == debug ]]; then
 	buildTypeArgs="-DUSE_ASAN=ON -DCMAKE_BUILD_TYPE=Debug"
-	buildDir="build/${TARGET}-debug"
-else
+elif [[ $BUILD_TYPE == release ]]; then
 	buildTypeArgs="-DCMAKE_BUILD_TYPE=Release"
-	buildDir="build/${TARGET}-release"
 fi
 
+buildDir="build/${TARGET}-${BUILD_TYPE}"
+distDir="../../dist/${TARGET}-${BUILD_TYPE}"
+
 mkdir -p $buildDir
 pushd $buildDir
 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+      -DCMAKE_INSTALL_PREFIX="$distDir" \
       $buildTypeArgs \
       $toolchain \
       $project
diff --git a/src/nostalgia/studio/lib/CMakeLists.txt b/src/nostalgia/studio/lib/CMakeLists.txt
index 5f03e42f..4c392b46 100644
--- a/src/nostalgia/studio/lib/CMakeLists.txt
+++ b/src/nostalgia/studio/lib/CMakeLists.txt
@@ -11,6 +11,7 @@ add_library(
 		json_write.cpp
 		wizard.cpp
 		oxfstreeview.cpp
+		plugin.cpp
 		project.cpp
 )
 
@@ -35,8 +36,9 @@ install(
 		json_err.hpp
 		json_read.hpp
 		json_write.hpp
-		newwizard.hpp
+		wizard.hpp
 		oxfstreeview.hpp
+		plugin.hpp
 		project.hpp
 	DESTINATION
 		include/nostalgia/studio/lib