diff --git a/Bundled/envmap/World.hdr b/Bundled/data/World.hdr
similarity index 100%
rename from Bundled/envmap/World.hdr
rename to Bundled/data/World.hdr
diff --git a/Bundled/envmap/World_irradiance.arm b/Bundled/data/World_irradiance.arm
similarity index 100%
rename from Bundled/envmap/World_irradiance.arm
rename to Bundled/data/World_irradiance.arm
diff --git a/Bundled/envmap/World_radiance.hdr b/Bundled/data/World_radiance.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance.hdr
rename to Bundled/data/World_radiance.hdr
diff --git a/Bundled/envmap/World_radiance_0.hdr b/Bundled/data/World_radiance_0.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_0.hdr
rename to Bundled/data/World_radiance_0.hdr
diff --git a/Bundled/envmap/World_radiance_1.hdr b/Bundled/data/World_radiance_1.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_1.hdr
rename to Bundled/data/World_radiance_1.hdr
diff --git a/Bundled/envmap/World_radiance_2.hdr b/Bundled/data/World_radiance_2.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_2.hdr
rename to Bundled/data/World_radiance_2.hdr
diff --git a/Bundled/envmap/World_radiance_3.hdr b/Bundled/data/World_radiance_3.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_3.hdr
rename to Bundled/data/World_radiance_3.hdr
diff --git a/Bundled/envmap/World_radiance_4.hdr b/Bundled/data/World_radiance_4.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_4.hdr
rename to Bundled/data/World_radiance_4.hdr
diff --git a/Bundled/envmap/World_radiance_5.hdr b/Bundled/data/World_radiance_5.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_5.hdr
rename to Bundled/data/World_radiance_5.hdr
diff --git a/Bundled/envmap/World_radiance_6.hdr b/Bundled/data/World_radiance_6.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_6.hdr
rename to Bundled/data/World_radiance_6.hdr
diff --git a/Bundled/envmap/World_radiance_7.hdr b/Bundled/data/World_radiance_7.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_7.hdr
rename to Bundled/data/World_radiance_7.hdr
diff --git a/Bundled/envmap/World_radiance_8.hdr b/Bundled/data/World_radiance_8.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_8.hdr
rename to Bundled/data/World_radiance_8.hdr
diff --git a/Bundled/envmap/World_radiance_9.hdr b/Bundled/data/World_radiance_9.hdr
similarity index 100%
rename from Bundled/envmap/World_radiance_9.hdr
rename to Bundled/data/World_radiance_9.hdr
diff --git a/Bundled/color_wheel.png b/Bundled/data/color_wheel.png
similarity index 100%
rename from Bundled/color_wheel.png
rename to Bundled/data/color_wheel.png
diff --git a/Bundled/config.arm b/Bundled/data/config.arm
similarity index 95%
rename from Bundled/config.arm
rename to Bundled/data/config.arm
index 9bdd403b..d4e79a86 100644
--- a/Bundled/config.arm
+++ b/Bundled/data/config.arm
@@ -1,19 +1,19 @@
-{
-    "rp_bloom": false,
-    "rp_gi": false,
-    "rp_motionblur": false,
-    "rp_shadowmap_cube": 0,
-    "rp_shadowmap_cascade": 0,
-    "rp_ssgi": true,
-    "rp_ssr": false,
-    "rp_supersample": 1.0,
-    "window_h": 900,
-    "window_maximizable": true,
-    "window_minimizable": true,
-    "window_mode": 0,
-    "window_msaa": 1,
-    "window_resizable": true,
-    "window_scale": 1.0,
-    "window_vsync": true,
-    "window_w": 1600
-}
+{
+    "rp_bloom": false,
+    "rp_gi": false,
+    "rp_motionblur": false,
+    "rp_shadowmap_cube": 0,
+    "rp_shadowmap_cascade": 0,
+    "rp_ssgi": true,
+    "rp_ssr": false,
+    "rp_supersample": 1.0,
+    "window_h": 900,
+    "window_maximizable": true,
+    "window_minimizable": true,
+    "window_mode": 0,
+    "window_msaa": 1,
+    "window_resizable": true,
+    "window_scale": 1.0,
+    "window_vsync": true,
+    "window_w": 1600
+}
diff --git a/Bundled/cursor.png b/Bundled/data/cursor.png
similarity index 100%
rename from Bundled/cursor.png
rename to Bundled/data/cursor.png
diff --git a/Bundled/font13.bin b/Bundled/data/font13.bin
similarity index 100%
rename from Bundled/font13.bin
rename to Bundled/data/font13.bin
diff --git a/Bundled/icons.png b/Bundled/data/icons.png
similarity index 100%
rename from Bundled/icons.png
rename to Bundled/data/icons.png
diff --git a/Bundled/icons2x.png b/Bundled/data/icons2x.png
similarity index 100%
rename from Bundled/icons2x.png
rename to Bundled/data/icons2x.png
diff --git a/Bundled/cmft/license_cmft.md b/Bundled/licenses/license_cmft.md
similarity index 98%
rename from Bundled/cmft/license_cmft.md
rename to Bundled/licenses/license_cmft.md
index 5c1d0271..98970a16 100644
--- a/Bundled/cmft/license_cmft.md
+++ b/Bundled/licenses/license_cmft.md
@@ -1,26 +1,26 @@
-Copyright 2014-2015 Dario Manesku. All rights reserved.
-
-https://github.com/dariomanesku/cmft
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-   1. Redistributions of source code must retain the above copyright notice, this
-      list of conditions and the following disclaimer.
-
-   2. Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-https://github.com/dariomanesku/cmft/blob/master/LICENSE
+Copyright 2014-2015 Dario Manesku. All rights reserved.
+
+https://github.com/dariomanesku/cmft
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY COPYRIGHT HOLDER ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+SHALL COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
+
+https://github.com/dariomanesku/cmft/blob/master/LICENSE
diff --git a/Sources/arm/App.hx b/Sources/arm/App.hx
index eb7546e8..9fb42759 100644
--- a/Sources/arm/App.hx
+++ b/Sources/arm/App.hx
@@ -80,7 +80,7 @@ class App extends iron.Trait {
 		});
 
 		iron.data.Data.getFont("font_default.ttf", function(f:kha.Font) {
-			iron.data.Data.getBlob("theme_dark.arm", function(b:kha.Blob) {
+			iron.data.Data.getBlob("themes/theme_dark.arm", function(b:kha.Blob) {
 				iron.data.Data.getImage('color_wheel.png', function(image:kha.Image) {
 					font = f;
 
diff --git a/Sources/arm/ui/UINodes.hx b/Sources/arm/ui/UINodes.hx
index 597a33e4..a0cf59bd 100644
--- a/Sources/arm/ui/UINodes.hx
+++ b/Sources/arm/ui/UINodes.hx
@@ -64,9 +64,9 @@ class UINodes extends iron.Trait {
 
 		// Cycles.arm_export_tangents = false;
 
-		iron.data.Data.getBlob('default_material.json', function(b1:kha.Blob) {
-			iron.data.Data.getBlob('default_brush.json', function(b2:kha.Blob) {
-				// iron.data.Data.getBlob('default_logic.json', function(b3:kha.Blob) {
+		iron.data.Data.getBlob('defaults/default_material.json', function(b1:kha.Blob) {
+			iron.data.Data.getBlob('defaults/default_brush.json', function(b2:kha.Blob) {
+				// iron.data.Data.getBlob('defaults/default_logic.json', function(b3:kha.Blob) {
 					// iron.data.Data.getBlob('logic_nodes.json', function(bnodes:kha.Blob) {
 
 						canvasBlob = b1.toString();
diff --git a/Sources/arm/ui/UITrait.hx b/Sources/arm/ui/UITrait.hx
index 2a65925e..d1da43e7 100644
--- a/Sources/arm/ui/UITrait.hx
+++ b/Sources/arm/ui/UITrait.hx
@@ -408,7 +408,7 @@ class UITrait extends iron.Trait {
 		Plugin.keep();
 		if (App.C.plugins != null) {
 			for (plugin in App.C.plugins) {
-				iron.data.Data.getBlob(plugin, function(blob:kha.Blob) {
+				iron.data.Data.getBlob("plugins/" + plugin, function(blob:kha.Blob) {
 					#if js
 					untyped __js__("(1, eval)({0})", blob.toString());
 					#end
@@ -1784,7 +1784,7 @@ class UITrait extends iron.Trait {
 				var themes = ["Dark", "Light"];
 				ui.combo(themeHandle, themes, "Theme", true);
 				if (themeHandle.changed) {
-					iron.data.Data.getBlob("theme_" + themes[themeHandle.position].toLowerCase() + ".arm", function(b:kha.Blob) {
+					iron.data.Data.getBlob("themes/theme_" + themes[themeHandle.position].toLowerCase() + ".arm", function(b:kha.Blob) {
 						arm.App.parseTheme(b);
 						ui.t = arm.App.theme;
 						// UINodes.inst.applyTheme();
diff --git a/khafile.js b/khafile.js
index 394b2e2c..fdc5c775 100644
--- a/khafile.js
+++ b/khafile.js
@@ -9,7 +9,12 @@ project.addShaders("compiled/Shaders/*.glsl", { noembed: false});
 project.addShaders("compiled/Hlsl/*.glsl", { noprocessing: true, noembed: false });
 project.addAssets("compiled/Assets/**", { notinlist: true , destination: "data/{name}" });
 project.addAssets("compiled/Shaders/*.arm", { notinlist: true , destination: "data/{name}" });
-project.addAssets("Bundled/**", { notinlist: true , destination: "data/{name}" });
+project.addAssets("Bundled/data/**", { notinlist: true , destination: "data/{name}" });
+project.addAssets("Bundled/defaults/**", { notinlist: true , destination: "data/defaults/{name}" });
+project.addAssets("Bundled/licenses/**", { notinlist: true , destination: "data/licenses/{name}" });
+project.addAssets("Bundled/plugins/**", { notinlist: true , destination: "data/plugins/{name}" });
+project.addAssets("Bundled/themes/**", { notinlist: true , destination: "data/themes/{name}" });
+project.addAssets("Bundled/readme.txt", { notinlist: true , destination: "{name}" });
 project.addAssets("Libraries/armory/Assets/brdf.png", { notinlist: true , destination: "data/{name}" });
 project.addAssets("Libraries/armory/Assets/noise256.png", { notinlist: true , destination: "data/{name}" });
 project.addAssets("Libraries/armory/Assets/smaa_area.png", { notinlist: true , destination: "data/{name}" });
@@ -49,4 +54,14 @@ project.addDefine('arm_data_dir');
 project.addParameter('--macro include("arm.brushnode")');
 project.addParameter('-dce full');
 
+if (platform === Platform.Windows) {
+	project.addAssets("Bundled/cmft/cmft.exe", { notinlist: true , destination: "data/{name}" });
+}
+else if (platform === Platform.Linux) {
+	project.addAssets("Bundled/cmft/cmft-linux64", { notinlist: true , destination: "data/{name}" });
+}
+else if (platform === Platform.OSX) {
+	project.addAssets("Bundled/cmft/cmft-osx", { notinlist: true , destination: "data/{name}" });
+}
+
 resolve(project);