diff --git a/_server/editor.js b/_server/editor.js
index ab9abb3b..c33b633f 100644
--- a/_server/editor.js
+++ b/_server/editor.js
@@ -149,7 +149,7 @@ editor.prototype.init = function (callback) {
     var useCompress = main.useCompress;
     main.useCompress = false;
     editor.airwallImg = new Image();
-    editor.airwallImg.src = './project/images/airwall.png';
+    editor.airwallImg.src = './project/materials/airwall.png';
 
     main.init('editor', function () {
         editor.config = new editor_config();
diff --git a/libs/core.js b/libs/core.js
index 09c5d5f4..6b5d45ec 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -190,9 +190,9 @@ function core() {
         },
         "globalAttribute": {
             'equipName': main.equipName || [],
-            "statusLeftBackground": main.statusLeftBackground || "url(project/images/ground.png) repeat",
-            "statusTopBackground": main.statusTopBackground || "url(project/images/ground.png) repeat",
-            "toolsBackground": main.toolsBackground || "url(project/images/ground.png) repeat",
+            "statusLeftBackground": main.statusLeftBackground || "url(project/materials/ground.png) repeat",
+            "statusTopBackground": main.statusTopBackground || "url(project/materials/ground.png) repeat",
+            "toolsBackground": main.toolsBackground || "url(project/images/materials.png) repeat",
             "borderColor": main.borderColor || "white",
             "statusBarColor": main.statusBarColor || "white",
             "hardLabelColor": main.hardLabelColor || "red",
@@ -374,8 +374,8 @@ core.prototype._init_others = function () {
     core.material.groundCanvas.canvas.width = core.material.groundCanvas.canvas.height = 32;
     core.material.groundPattern = core.material.groundCanvas.createPattern(core.material.groundCanvas.canvas, 'repeat');
     core.bigmap.tempCanvas = document.createElement('canvas').getContext('2d');
-    core.loadImage('fog', function (name, img) { core.animateFrame.weather.fog = img; });
-    core.loadImage('keyboard', function (name, img) {core.material.images.keyboard = img; });
+    core.loadImage("materials", 'fog', function (name, img) { core.animateFrame.weather.fog = img; });
+    core.loadImage("materials", 'keyboard', function (name, img) {core.material.images.keyboard = img; });
     // 记录存档编号
     core.saves.saveIndex = core.getLocalStorage('saveIndex', 1);
     core.control.getSaveIndexes(function (indexes) { core.saves.ids = indexes; });
diff --git a/libs/loader.js b/libs/loader.js
index 88b92b02..8f4ea8f6 100644
--- a/libs/loader.js
+++ b/libs/loader.js
@@ -39,7 +39,7 @@ loader.prototype._load = function (callback) {
 }
 
 loader.prototype._loadIcons = function () {
-    this.loadImage("icons.png", function (id, image) {
+    this.loadImage("materials", "icons.png", function (id, image) {
         var images = core.splitImage(image);
         for (var key in core.statusBar.icons) {
             if (typeof core.statusBar.icons[key] == 'number') {
@@ -54,9 +54,9 @@ loader.prototype._loadIcons = function () {
 loader.prototype._loadMaterialImages = function (callback) {
     this._setStartLoadTipText("正在加载资源文件...");
     if (main.useCompress) {
-        this.loadImagesFromZip('project/images/materials.h5data', core.materials, core.material.images, callback);
+        this.loadImagesFromZip('project/materials/materials.h5data', core.materials, core.material.images, callback);
     } else {
-        this.loadImages(core.materials, core.material.images, callback);
+        this.loadImages("materials", core.materials, core.material.images, callback);
     }
 }
 
@@ -64,8 +64,6 @@ loader.prototype._loadExtraImages = function (callback) {
     core.material.images.images = {};
 
     var images = core.clone(core.images);
-    if (images.indexOf("hero.png") < 0)
-        images.push("hero.png");
 
     this._setStartLoadTipText("正在加载图片文件...");
     if (main.useCompress) {
@@ -79,14 +77,14 @@ loader.prototype._loadExtraImages = function (callback) {
 
         this.loadImagesFromZip('project/images/images.h5data', images, core.material.images.images, callback);
         gifs.forEach(function (gif) {
-            this.loadImage(gif, function (id, image) {
+            this.loadImage("images", gif, function (id, image) {
                 if (image != null) {
                     core.material.images.images[gif] = image;
                 }
             });
         }, this);
     } else {
-        this.loadImages(images, core.material.images.images, callback);
+        this.loadImages("images", images, core.material.images.images, callback);
     }
 }
 
@@ -107,9 +105,9 @@ loader.prototype._loadAutotiles = function (callback) {
     }
     this._setStartLoadTipText("正在加载自动元件...");
     if (main.useCompress) {
-        this.loadImagesFromZip('project/images/autotiles.h5data', keys, autotiles, _callback);
+        this.loadImagesFromZip('project/autotiles/autotiles.h5data', keys, autotiles, _callback);
     } else {
-        this.loadImages(keys, autotiles, _callback);
+        this.loadImages("autotiles", keys, autotiles, _callback);
     }
 }
 
@@ -131,20 +129,20 @@ loader.prototype._loadTilesets = function (callback) {
     }
     this._setStartLoadTipText("正在加载额外素材...");
     if (main.useCompress) {
-        this.loadImagesFromZip('project/images/tilesets.h5data', core.tilesets, core.material.images.tilesets, _callback);
+        this.loadImagesFromZip('project/tilesets/tilesets.h5data', core.tilesets, core.material.images.tilesets, _callback);
     } else {
-        this.loadImages(core.tilesets, core.material.images.tilesets, _callback);
+        this.loadImages("tilesets", core.tilesets, core.material.images.tilesets, _callback);
     }
 }
 
-loader.prototype.loadImages = function (names, toSave, callback) {
+loader.prototype.loadImages = function (dir, names, toSave, callback) {
     if (!names || names.length == 0) {
         if (callback) callback();
         return;
     }
     var items = 0;
     for (var i = 0; i < names.length; i++) {
-        this.loadImage(names[i], function (id, image) {
+        this.loadImage(dir, names[i], function (id, image) {
             core.loader._setStartLoadTipText('正在加载图片 ' + id + "...");
             if (toSave[id] !== undefined) {
                 if (image != null)
@@ -192,7 +190,7 @@ loader.prototype.loadImagesFromZip = function (url, names, toSave, callback) {
     });
 }
 
-loader.prototype.loadImage = function (imgName, callback) {
+loader.prototype.loadImage = function (dir, imgName, callback) {
     try {
         var name = imgName;
         if (name.indexOf(".") < 0)
@@ -204,7 +202,7 @@ loader.prototype.loadImage = function (imgName, callback) {
         image.onerror = function () {
             callback(imgName, null);
         }
-        image.src = 'project/images/' + name + "?v=" + main.version;
+        image.src = 'project/' + dir + '/' + name + "?v=" + main.version;
         if (name.endsWith('.gif'))
             callback(imgName, null);
     }
@@ -313,7 +311,7 @@ loader.prototype.loadOneMusic = function (name) {
     var music = new Audio();
     music.preload = 'none';
     if (main.bgmRemote) music.src = main.bgmRemoteRoot + core.firstData.name + '/' + name;
-    else music.src = 'project/sounds/' + name;
+    else music.src = 'project/bgms/' + name;
     music.loop = 'loop';
     core.material.bgms[name] = music;
 }
diff --git a/project/images/autotile.png b/project/autotiles/autotile.png
similarity index 100%
rename from project/images/autotile.png
rename to project/autotiles/autotile.png
diff --git a/project/images/autotile1.png b/project/autotiles/autotile1.png
similarity index 100%
rename from project/images/autotile1.png
rename to project/autotiles/autotile1.png
diff --git a/project/images/autotile2.png b/project/autotiles/autotile2.png
similarity index 100%
rename from project/images/autotile2.png
rename to project/autotiles/autotile2.png
diff --git a/project/images/autotile3.png b/project/autotiles/autotile3.png
similarity index 100%
rename from project/images/autotile3.png
rename to project/autotiles/autotile3.png
diff --git a/project/sounds/bgm.mp3 b/project/bgms/bgm.mp3
similarity index 100%
rename from project/sounds/bgm.mp3
rename to project/bgms/bgm.mp3
diff --git a/project/data.js b/project/data.js
index 49445eab..2c6ff1de 100644
--- a/project/data.js
+++ b/project/data.js
@@ -65,8 +65,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d =
 		],
 		"startBgm": null,
 		"statusLeftBackground": null,
-		"statusTopBackground": "url(project/images/ground.png) repeat",
-		"toolsBackground": "url(project/images/ground.png) repeat",
+		"statusTopBackground": "url(project/materials/ground.png) repeat",
+		"toolsBackground": "url(project/materials/ground.png) repeat",
 		"borderColor": "#CCCCCC",
 		"statusBarColor": "white",
 		"hardLabelColor": "red",
diff --git a/project/images/airwall.png b/project/materials/airwall.png
similarity index 100%
rename from project/images/airwall.png
rename to project/materials/airwall.png
diff --git a/project/images/animates.png b/project/materials/animates.png
similarity index 100%
rename from project/images/animates.png
rename to project/materials/animates.png
diff --git a/project/images/enemy48.png b/project/materials/enemy48.png
similarity index 100%
rename from project/images/enemy48.png
rename to project/materials/enemy48.png
diff --git a/project/images/enemys.png b/project/materials/enemys.png
similarity index 100%
rename from project/images/enemys.png
rename to project/materials/enemys.png
diff --git a/project/images/fog.png b/project/materials/fog.png
similarity index 100%
rename from project/images/fog.png
rename to project/materials/fog.png
diff --git a/project/images/ground.png b/project/materials/ground.png
similarity index 100%
rename from project/images/ground.png
rename to project/materials/ground.png
diff --git a/project/images/hero.png b/project/materials/hero.png
similarity index 100%
rename from project/images/hero.png
rename to project/materials/hero.png
diff --git a/project/images/icons.png b/project/materials/icons.png
similarity index 100%
rename from project/images/icons.png
rename to project/materials/icons.png
diff --git a/project/images/items.png b/project/materials/items.png
similarity index 100%
rename from project/images/items.png
rename to project/materials/items.png
diff --git a/project/images/keyboard.png b/project/materials/keyboard.png
similarity index 100%
rename from project/images/keyboard.png
rename to project/materials/keyboard.png
diff --git a/project/images/npc48.png b/project/materials/npc48.png
similarity index 100%
rename from project/images/npc48.png
rename to project/materials/npc48.png
diff --git a/project/images/npcs.png b/project/materials/npcs.png
similarity index 100%
rename from project/images/npcs.png
rename to project/materials/npcs.png
diff --git a/project/images/terrains.png b/project/materials/terrains.png
similarity index 100%
rename from project/images/terrains.png
rename to project/materials/terrains.png
diff --git a/project/images/magictower.png b/project/tilesets/magictower.png
similarity index 100%
rename from project/images/magictower.png
rename to project/tilesets/magictower.png
diff --git a/styles.css b/styles.css
index dec14381..d981dfdf 100644
--- a/styles.css
+++ b/styles.css
@@ -198,7 +198,7 @@
     box-sizing: border-box;
     -moz-box-sizing: border-box;
     -webkit-box-sizing: border-box;
-    background: url(project/images/ground.png) repeat;
+    background: url(project/materials/ground.png) repeat;
     z-index: 185;
     display: none;
     top: 0;
@@ -232,7 +232,7 @@
 }
 #toolBar {
     position: absolute;
-    background: url(project/images/ground.png) repeat;
+    background: url(project/materials/ground.png) repeat;
     z-index: 210;
     box-sizing: border-box;
     -moz-box-sizing: border-box;
diff --git a/常用工具/JS代码压缩工具.exe b/常用工具/JS代码压缩工具.exe
index c5f5e89c..4300e128 100644
Binary files a/常用工具/JS代码压缩工具.exe and b/常用工具/JS代码压缩工具.exe differ