diff --git a/buildfiles/neko/bin/neko-linux b/buildfiles/neko/bin/neko-linux
deleted file mode 100644
index 02039e1d2..000000000
Binary files a/buildfiles/neko/bin/neko-linux and /dev/null differ
diff --git a/buildfiles/neko/bin/neko-linux64 b/buildfiles/neko/bin/neko-linux64
deleted file mode 100644
index 042729a3c..000000000
Binary files a/buildfiles/neko/bin/neko-linux64 and /dev/null differ
diff --git a/buildfiles/neko/bin/neko-mac b/buildfiles/neko/bin/neko-mac
deleted file mode 100644
index fff2acee5..000000000
Binary files a/buildfiles/neko/bin/neko-mac and /dev/null differ
diff --git a/buildfiles/neko/bin/neko-windows b/buildfiles/neko/bin/neko-windows
deleted file mode 100644
index 2755e6557..000000000
Binary files a/buildfiles/neko/bin/neko-windows and /dev/null differ
diff --git a/include.xml b/include.xml
index 9c5cbf557..9cb4fa05d 100644
--- a/include.xml
+++ b/include.xml
@@ -29,6 +29,6 @@
-
+
diff --git a/buildfiles/android/MainActivity.java b/templates/android/MainActivity.java
similarity index 100%
rename from buildfiles/android/MainActivity.java
rename to templates/android/MainActivity.java
diff --git a/buildfiles/android/hxml/debug.hxml b/templates/android/hxml/debug.hxml
similarity index 100%
rename from buildfiles/android/hxml/debug.hxml
rename to templates/android/hxml/debug.hxml
diff --git a/buildfiles/android/hxml/release.hxml b/templates/android/hxml/release.hxml
similarity index 100%
rename from buildfiles/android/hxml/release.hxml
rename to templates/android/hxml/release.hxml
diff --git a/buildfiles/android/template/AndroidManifest.xml b/templates/android/template/AndroidManifest.xml
similarity index 100%
rename from buildfiles/android/template/AndroidManifest.xml
rename to templates/android/template/AndroidManifest.xml
diff --git a/buildfiles/android/template/build.xml b/templates/android/template/build.xml
similarity index 100%
rename from buildfiles/android/template/build.xml
rename to templates/android/template/build.xml
diff --git a/buildfiles/android/template/libs/armeabi/readme.txt b/templates/android/template/libs/armeabi/readme.txt
similarity index 100%
rename from buildfiles/android/template/libs/armeabi/readme.txt
rename to templates/android/template/libs/armeabi/readme.txt
diff --git a/buildfiles/android/template/project.properties b/templates/android/template/project.properties
similarity index 100%
rename from buildfiles/android/template/project.properties
rename to templates/android/template/project.properties
diff --git a/buildfiles/android/template/src/org/haxe/lime/GameActivity.java b/templates/android/template/src/org/haxe/lime/GameActivity.java
similarity index 100%
rename from buildfiles/android/template/src/org/haxe/lime/GameActivity.java
rename to templates/android/template/src/org/haxe/lime/GameActivity.java
diff --git a/buildfiles/android/template/src/org/haxe/lime/MainView.java b/templates/android/template/src/org/haxe/lime/MainView.java
similarity index 100%
rename from buildfiles/android/template/src/org/haxe/lime/MainView.java
rename to templates/android/template/src/org/haxe/lime/MainView.java
diff --git a/buildfiles/android/template/src/org/haxe/lime/Sound.java b/templates/android/template/src/org/haxe/lime/Sound.java
similarity index 100%
rename from buildfiles/android/template/src/org/haxe/lime/Sound.java
rename to templates/android/template/src/org/haxe/lime/Sound.java
diff --git a/buildfiles/blackberry/hxml/debug.hxml b/templates/blackberry/hxml/debug.hxml
similarity index 100%
rename from buildfiles/blackberry/hxml/debug.hxml
rename to templates/blackberry/hxml/debug.hxml
diff --git a/buildfiles/blackberry/hxml/release.hxml b/templates/blackberry/hxml/release.hxml
similarity index 100%
rename from buildfiles/blackberry/hxml/release.hxml
rename to templates/blackberry/hxml/release.hxml
diff --git a/buildfiles/blackberry/template/bar-descriptor.xml b/templates/blackberry/template/bar-descriptor.xml
similarity index 100%
rename from buildfiles/blackberry/template/bar-descriptor.xml
rename to templates/blackberry/template/bar-descriptor.xml
diff --git a/buildfiles/blackberry/template/config.xml b/templates/blackberry/template/config.xml
similarity index 100%
rename from buildfiles/blackberry/template/config.xml
rename to templates/blackberry/template/config.xml
diff --git a/buildfiles/cpp/hxml/debug.hxml b/templates/cpp/hxml/debug.hxml
similarity index 100%
rename from buildfiles/cpp/hxml/debug.hxml
rename to templates/cpp/hxml/debug.hxml
diff --git a/buildfiles/cpp/hxml/release.hxml b/templates/cpp/hxml/release.hxml
similarity index 100%
rename from buildfiles/cpp/hxml/release.hxml
rename to templates/cpp/hxml/release.hxml
diff --git a/buildfiles/emscripten/cpp/Main.cpp b/templates/emscripten/cpp/Main.cpp
similarity index 100%
rename from buildfiles/emscripten/cpp/Main.cpp
rename to templates/emscripten/cpp/Main.cpp
diff --git a/buildfiles/emscripten/hxml/debug.hxml b/templates/emscripten/hxml/debug.hxml
similarity index 100%
rename from buildfiles/emscripten/hxml/debug.hxml
rename to templates/emscripten/hxml/debug.hxml
diff --git a/buildfiles/emscripten/hxml/release.hxml b/templates/emscripten/hxml/release.hxml
similarity index 100%
rename from buildfiles/emscripten/hxml/release.hxml
rename to templates/emscripten/hxml/release.hxml
diff --git a/buildfiles/emscripten/template/decompress.js b/templates/emscripten/template/decompress.js
similarity index 100%
rename from buildfiles/emscripten/template/decompress.js
rename to templates/emscripten/template/decompress.js
diff --git a/buildfiles/emscripten/template/index.html b/templates/emscripten/template/index.html
similarity index 100%
rename from buildfiles/emscripten/template/index.html
rename to templates/emscripten/template/index.html
diff --git a/buildfiles/emscripten/template/webgl-debug.js b/templates/emscripten/template/webgl-debug.js
similarity index 100%
rename from buildfiles/emscripten/template/webgl-debug.js
rename to templates/emscripten/template/webgl-debug.js
diff --git a/buildfiles/haxe/ApplicationMain.hx b/templates/haxe/ApplicationMain.hx
similarity index 100%
rename from buildfiles/haxe/ApplicationMain.hx
rename to templates/haxe/ApplicationMain.hx
diff --git a/buildfiles/haxe/lime/AssetData.hx b/templates/haxe/lime/AssetData.hx
similarity index 100%
rename from buildfiles/haxe/lime/AssetData.hx
rename to templates/haxe/lime/AssetData.hx
diff --git a/buildfiles/haxe/limePreloader.hx b/templates/haxe/limePreloader.hx
similarity index 100%
rename from buildfiles/haxe/limePreloader.hx
rename to templates/haxe/limePreloader.hx
diff --git a/buildfiles/html5/haxe/ApplicationMain.hx b/templates/html5/haxe/ApplicationMain.hx
similarity index 100%
rename from buildfiles/html5/haxe/ApplicationMain.hx
rename to templates/html5/haxe/ApplicationMain.hx
diff --git a/buildfiles/html5/haxe/NMEPreloader.hx b/templates/html5/haxe/NMEPreloader.hx
similarity index 100%
rename from buildfiles/html5/haxe/NMEPreloader.hx
rename to templates/html5/haxe/NMEPreloader.hx
diff --git a/buildfiles/html5/haxe/lime/AssetData.hx b/templates/html5/haxe/lime/AssetData.hx
similarity index 100%
rename from buildfiles/html5/haxe/lime/AssetData.hx
rename to templates/html5/haxe/lime/AssetData.hx
diff --git a/buildfiles/html5/hxml/debug.hxml b/templates/html5/hxml/debug.hxml
similarity index 100%
rename from buildfiles/html5/hxml/debug.hxml
rename to templates/html5/hxml/debug.hxml
diff --git a/buildfiles/html5/hxml/release.hxml b/templates/html5/hxml/release.hxml
similarity index 100%
rename from buildfiles/html5/hxml/release.hxml
rename to templates/html5/hxml/release.hxml
diff --git a/buildfiles/html5/hxswfml.n b/templates/html5/hxswfml.n
similarity index 100%
rename from buildfiles/html5/hxswfml.n
rename to templates/html5/hxswfml.n
diff --git a/buildfiles/html5/template/index.html b/templates/html5/template/index.html
similarity index 100%
rename from buildfiles/html5/template/index.html
rename to templates/html5/template/index.html
diff --git a/buildfiles/iphone/PROJ.xcodeproj/project.pbxproj b/templates/iphone/PROJ.xcodeproj/project.pbxproj
similarity index 100%
rename from buildfiles/iphone/PROJ.xcodeproj/project.pbxproj
rename to templates/iphone/PROJ.xcodeproj/project.pbxproj
diff --git a/buildfiles/iphone/PROJ/Classes/Main.mm b/templates/iphone/PROJ/Classes/Main.mm
similarity index 100%
rename from buildfiles/iphone/PROJ/Classes/Main.mm
rename to templates/iphone/PROJ/Classes/Main.mm
diff --git a/buildfiles/iphone/PROJ/PROJ-Entitlements.plist b/templates/iphone/PROJ/PROJ-Entitlements.plist
similarity index 100%
rename from buildfiles/iphone/PROJ/PROJ-Entitlements.plist
rename to templates/iphone/PROJ/PROJ-Entitlements.plist
diff --git a/buildfiles/iphone/PROJ/PROJ-Info.plist b/templates/iphone/PROJ/PROJ-Info.plist
similarity index 100%
rename from buildfiles/iphone/PROJ/PROJ-Info.plist
rename to templates/iphone/PROJ/PROJ-Info.plist
diff --git a/buildfiles/iphone/PROJ/PROJ-Prefix.pch b/templates/iphone/PROJ/PROJ-Prefix.pch
similarity index 100%
rename from buildfiles/iphone/PROJ/PROJ-Prefix.pch
rename to templates/iphone/PROJ/PROJ-Prefix.pch
diff --git a/buildfiles/iphone/PROJ/haxe/Build.hxml b/templates/iphone/PROJ/haxe/Build.hxml
similarity index 100%
rename from buildfiles/iphone/PROJ/haxe/Build.hxml
rename to templates/iphone/PROJ/haxe/Build.hxml
diff --git a/buildfiles/iphone/PROJ/haxe/makefile b/templates/iphone/PROJ/haxe/makefile
similarity index 100%
rename from buildfiles/iphone/PROJ/haxe/makefile
rename to templates/iphone/PROJ/haxe/makefile
diff --git a/buildfiles/mac/Entitlements.plist b/templates/mac/Entitlements.plist
similarity index 100%
rename from buildfiles/mac/Entitlements.plist
rename to templates/mac/Entitlements.plist
diff --git a/buildfiles/mac/Info.plist b/templates/mac/Info.plist
similarity index 100%
rename from buildfiles/mac/Info.plist
rename to templates/mac/Info.plist
diff --git a/buildfiles/neko/hxml/debug.hxml b/templates/neko/hxml/debug.hxml
similarity index 100%
rename from buildfiles/neko/hxml/debug.hxml
rename to templates/neko/hxml/debug.hxml
diff --git a/buildfiles/neko/hxml/release.hxml b/templates/neko/hxml/release.hxml
similarity index 100%
rename from buildfiles/neko/hxml/release.hxml
rename to templates/neko/hxml/release.hxml
diff --git a/buildfiles/neko/ndll/linux/libneko.so b/templates/neko/ndll/linux/libneko.so
similarity index 100%
rename from buildfiles/neko/ndll/linux/libneko.so
rename to templates/neko/ndll/linux/libneko.so
diff --git a/buildfiles/neko/ndll/linux64/libneko.so b/templates/neko/ndll/linux64/libneko.so
similarity index 100%
rename from buildfiles/neko/ndll/linux64/libneko.so
rename to templates/neko/ndll/linux64/libneko.so
diff --git a/buildfiles/neko/ndll/mac/libneko.dylib b/templates/neko/ndll/mac/libneko.dylib
similarity index 100%
rename from buildfiles/neko/ndll/mac/libneko.dylib
rename to templates/neko/ndll/mac/libneko.dylib
diff --git a/buildfiles/neko/ndll/mac/regexp.ndll b/templates/neko/ndll/mac/regexp.ndll
similarity index 100%
rename from buildfiles/neko/ndll/mac/regexp.ndll
rename to templates/neko/ndll/mac/regexp.ndll
diff --git a/buildfiles/neko/ndll/mac/sqlite.ndll b/templates/neko/ndll/mac/sqlite.ndll
similarity index 100%
rename from buildfiles/neko/ndll/mac/sqlite.ndll
rename to templates/neko/ndll/mac/sqlite.ndll
diff --git a/buildfiles/neko/ndll/mac/std.ndll b/templates/neko/ndll/mac/std.ndll
similarity index 100%
rename from buildfiles/neko/ndll/mac/std.ndll
rename to templates/neko/ndll/mac/std.ndll
diff --git a/buildfiles/neko/ndll/mac/zlib.ndll b/templates/neko/ndll/mac/zlib.ndll
similarity index 100%
rename from buildfiles/neko/ndll/mac/zlib.ndll
rename to templates/neko/ndll/mac/zlib.ndll
diff --git a/buildfiles/neko/ndll/mac64/libneko.dylib b/templates/neko/ndll/mac64/libneko.dylib
similarity index 100%
rename from buildfiles/neko/ndll/mac64/libneko.dylib
rename to templates/neko/ndll/mac64/libneko.dylib
diff --git a/buildfiles/neko/ndll/mac64/regexp.ndll b/templates/neko/ndll/mac64/regexp.ndll
similarity index 100%
rename from buildfiles/neko/ndll/mac64/regexp.ndll
rename to templates/neko/ndll/mac64/regexp.ndll
diff --git a/buildfiles/neko/ndll/mac64/sqlite.ndll b/templates/neko/ndll/mac64/sqlite.ndll
similarity index 100%
rename from buildfiles/neko/ndll/mac64/sqlite.ndll
rename to templates/neko/ndll/mac64/sqlite.ndll
diff --git a/buildfiles/neko/ndll/mac64/std.ndll b/templates/neko/ndll/mac64/std.ndll
similarity index 100%
rename from buildfiles/neko/ndll/mac64/std.ndll
rename to templates/neko/ndll/mac64/std.ndll
diff --git a/buildfiles/neko/ndll/mac64/zlib.ndll b/templates/neko/ndll/mac64/zlib.ndll
similarity index 100%
rename from buildfiles/neko/ndll/mac64/zlib.ndll
rename to templates/neko/ndll/mac64/zlib.ndll
diff --git a/buildfiles/neko/ndll/windows/gc.dll b/templates/neko/ndll/windows/gc.dll
similarity index 100%
rename from buildfiles/neko/ndll/windows/gc.dll
rename to templates/neko/ndll/windows/gc.dll
diff --git a/buildfiles/neko/ndll/windows/neko.dll b/templates/neko/ndll/windows/neko.dll
similarity index 100%
rename from buildfiles/neko/ndll/windows/neko.dll
rename to templates/neko/ndll/windows/neko.dll
diff --git a/buildfiles/tizen/hxml/debug.hxml b/templates/tizen/hxml/debug.hxml
similarity index 100%
rename from buildfiles/tizen/hxml/debug.hxml
rename to templates/tizen/hxml/debug.hxml
diff --git a/buildfiles/tizen/hxml/release.hxml b/templates/tizen/hxml/release.hxml
similarity index 100%
rename from buildfiles/tizen/hxml/release.hxml
rename to templates/tizen/hxml/release.hxml
diff --git a/buildfiles/tizen/template/CommandLineBuild/build_data b/templates/tizen/template/CommandLineBuild/build_data
similarity index 100%
rename from buildfiles/tizen/template/CommandLineBuild/build_data
rename to templates/tizen/template/CommandLineBuild/build_data
diff --git a/buildfiles/tizen/template/manifest.xml b/templates/tizen/template/manifest.xml
similarity index 100%
rename from buildfiles/tizen/template/manifest.xml
rename to templates/tizen/template/manifest.xml
diff --git a/buildfiles/webos/hxml/debug.hxml b/templates/webos/hxml/debug.hxml
similarity index 100%
rename from buildfiles/webos/hxml/debug.hxml
rename to templates/webos/hxml/debug.hxml
diff --git a/buildfiles/webos/hxml/release.hxml b/templates/webos/hxml/release.hxml
similarity index 100%
rename from buildfiles/webos/hxml/release.hxml
rename to templates/webos/hxml/release.hxml
diff --git a/buildfiles/webos/template/appinfo.json b/templates/webos/template/appinfo.json
similarity index 100%
rename from buildfiles/webos/template/appinfo.json
rename to templates/webos/template/appinfo.json
diff --git a/buildfiles/webos/template/package.properties b/templates/webos/template/package.properties
similarity index 100%
rename from buildfiles/webos/template/package.properties
rename to templates/webos/template/package.properties