diff --git a/templates/lv2/make/Makefile b/templates/lv2-make/Makefile
similarity index 100%
rename from templates/lv2/make/Makefile
rename to templates/lv2-make/Makefile
diff --git a/templates/lv2-make/tibia-index.js b/templates/lv2-make/tibia-index.js
new file mode 100644
index 0000000..53d79fb
--- /dev/null
+++ b/templates/lv2-make/tibia-index.js
@@ -0,0 +1,4 @@
+module.exports = function (data, api) {
+	api.copyFile(`Makefile`, `Makefile`);
+	api.generateFileFromTemplateFile(`vars.mk`, `vars.mk`, data);
+};
diff --git a/templates/lv2/make/vars.mk b/templates/lv2-make/vars.mk
similarity index 100%
rename from templates/lv2/make/vars.mk
rename to templates/lv2-make/vars.mk
diff --git a/templates/lv2/tibia-index.js b/templates/lv2/tibia-index.js
index 0aa3527..bc7a0b8 100644
--- a/templates/lv2/tibia-index.js
+++ b/templates/lv2/tibia-index.js
@@ -68,6 +68,4 @@ module.exports = function (data, api) {
 	api.copyFile(`src${sep}lv2.c`, `src${sep}lv2.c`);
 	api.generateFileFromTemplateFile(`src${sep}data.h`, `src${sep}data.h`, data);
 	api.copyFileIfNotExists(`src${sep}plugin.h`, `src${sep}plugin.h`);
-	api.copyFile(`make${sep}Makefile`, `Makefile`);
-	api.generateFileFromTemplateFile(`make${sep}vars.mk`, `vars.mk`, data);
 };
diff --git a/templates/vst3/make/Makefile b/templates/vst3-make/Makefile
similarity index 100%
rename from templates/vst3/make/Makefile
rename to templates/vst3-make/Makefile
diff --git a/templates/vst3-make/tibia-index.js b/templates/vst3-make/tibia-index.js
new file mode 100644
index 0000000..53d79fb
--- /dev/null
+++ b/templates/vst3-make/tibia-index.js
@@ -0,0 +1,4 @@
+module.exports = function (data, api) {
+	api.copyFile(`Makefile`, `Makefile`);
+	api.generateFileFromTemplateFile(`vars.mk`, `vars.mk`, data);
+};
diff --git a/templates/vst3/make/vars.mk b/templates/vst3-make/vars.mk
similarity index 52%
rename from templates/vst3/make/vars.mk
rename to templates/vst3-make/vars.mk
index 57f38f8..0826cc2 100644
--- a/templates/vst3/make/vars.mk
+++ b/templates/vst3-make/vars.mk
@@ -1,2 +1,2 @@
 BUNDLE_NAME := {{=it.product.bundleName}}
-VST3_C_API_DIR := ../../vst3_c_api
+VST3_C_API_DIR := ../../../vst3_c_api
diff --git a/templates/vst3/tibia-index.js b/templates/vst3/tibia-index.js
index a1beabb..0ed422e 100644
--- a/templates/vst3/tibia-index.js
+++ b/templates/vst3/tibia-index.js
@@ -6,6 +6,4 @@ module.exports = function (data, api) {
 	api.copyFile(`src${sep}vst3.c`, `src${sep}vst3.c`);
 	api.generateFileFromTemplateFile(`src${sep}data.h`, `src${sep}data.h`, data);
 	api.copyFileIfNotExists(`src${sep}plugin.h`, `src${sep}plugin.h`);
-	api.copyFile(`make${sep}Makefile`, `Makefile`);
-	api.generateFileFromTemplateFile(`make${sep}vars.mk`, `vars.mk`, data);
 };
diff --git a/test/run.sh b/test/run.sh
index d42387b..f82e9a1 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -2,6 +2,8 @@
 
 dir=`dirname $0`
 $dir/../tibia $dir/product.json,$dir/company.json,$dir/vst3.json $dir/../templates/vst3 $dir/../out/vst3
+$dir/../tibia $dir/product.json,$dir/company.json,$dir/vst3.json $dir/../templates/vst3-make $dir/../out/vst3
 cp $dir/plugin.h $dir/../out/vst3/src
 $dir/../tibia $dir/product.json,$dir/company.json,$dir/lv2.json $dir/../templates/lv2 $dir/../out/lv2
+$dir/../tibia $dir/product.json,$dir/company.json,$dir/lv2.json $dir/../templates/lv2-make $dir/../out/lv2
 cp $dir/plugin.h $dir/../out/lv2/src