diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java
index 9bf42bb84..4da083579 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Launcher.java
@@ -30,7 +30,7 @@ import org.jackhuang.hellominecraft.C;
 import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.utils.StrUtils;
 import org.jackhuang.hellominecraft.views.LogWindow;
-import org.jackhuang.hellominecraft.launcher.core.MinecraftCrashAdvicer;
+import org.jackhuang.hellominecraft.launcher.utils.MinecraftCrashAdvicer;
 import org.jackhuang.hellominecraft.utils.DoubleOutputStream;
 import org.jackhuang.hellominecraft.utils.LauncherPrintStream;
 import org.jackhuang.hellominecraft.utils.MathUtils;
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java
index c0c5c0ef9..33c4a32e9 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/api/PluginManager.java
@@ -18,7 +18,7 @@
 package org.jackhuang.hellominecraft.launcher.api;
 
 import org.jackhuang.hellominecraft.HMCLog;
-import org.jackhuang.hellominecraft.launcher.core.DefaultPlugin;
+import org.jackhuang.hellominecraft.launcher.settings.DefaultPlugin;
 
 /**
  *
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftAssetService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/MinecraftAssetService.java
similarity index 97%
rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftAssetService.java
rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/MinecraftAssetService.java
index a8d5cddfe..ed66245c3 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftAssetService.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/assets/MinecraftAssetService.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.version;
+package org.jackhuang.hellominecraft.launcher.core.assets;
 
 import com.google.gson.JsonSyntaxException;
 import java.io.File;
@@ -26,6 +26,7 @@ import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.assets.AssetsIndex;
 import org.jackhuang.hellominecraft.launcher.core.assets.AssetsObject;
 import org.jackhuang.hellominecraft.launcher.core.assets.IAssetsHandler;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.tasks.Task;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftDownloadService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java
similarity index 96%
rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftDownloadService.java
rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java
index 250e015ae..1258aefc0 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftDownloadService.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftDownloadService.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core.version;
+package org.jackhuang.hellominecraft.launcher.core.download;
 
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftDownloadService;
 import com.google.gson.JsonSyntaxException;
@@ -27,6 +27,8 @@ import org.jackhuang.hellominecraft.HMCLog;
 import org.jackhuang.hellominecraft.launcher.core.GameException;
 import org.jackhuang.hellominecraft.launcher.core.launch.GameLauncher;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
+import org.jackhuang.hellominecraft.launcher.core.version.IMinecraftLibrary;
+import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersion;
 import org.jackhuang.hellominecraft.tasks.TaskWindow;
 import org.jackhuang.hellominecraft.tasks.download.FileDownloadTask;
 import org.jackhuang.hellominecraft.utils.NetUtils;
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultMinecraftService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/DefaultMinecraftService.java
similarity index 90%
rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultMinecraftService.java
rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/DefaultMinecraftService.java
index 1e522698d..2939abac4 100644
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultMinecraftService.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/service/DefaultMinecraftService.java
@@ -15,8 +15,9 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core;
+package org.jackhuang.hellominecraft.launcher.core.service;
 
+import org.jackhuang.hellominecraft.launcher.core.Profile;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftDownloadService;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftInstallerService;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftProvider;
@@ -24,8 +25,8 @@ import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftAssetService;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftModService;
 import org.jackhuang.hellominecraft.launcher.core.installers.MinecraftInstallerService;
-import org.jackhuang.hellominecraft.launcher.core.version.MinecraftAssetService;
-import org.jackhuang.hellominecraft.launcher.core.version.MinecraftDownloadService;
+import org.jackhuang.hellominecraft.launcher.core.assets.MinecraftAssetService;
+import org.jackhuang.hellominecraft.launcher.core.download.MinecraftDownloadService;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftModService;
 import org.jackhuang.hellominecraft.launcher.core.version.MinecraftVersionManager;
 
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultPlugin.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/DefaultPlugin.java
similarity index 94%
rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultPlugin.java
rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/DefaultPlugin.java
index b0ab97227..de2d69319 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/DefaultPlugin.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/settings/DefaultPlugin.java
@@ -15,10 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core;
+package org.jackhuang.hellominecraft.launcher.settings;
 
+import org.jackhuang.hellominecraft.launcher.core.service.DefaultMinecraftService;
 import org.jackhuang.hellominecraft.launcher.core.service.IMinecraftService;
 import org.jackhuang.hellominecraft.launcher.api.IPlugin;
+import org.jackhuang.hellominecraft.launcher.core.Profile;
 import org.jackhuang.hellominecraft.launcher.settings.Settings;
 import org.jackhuang.hellominecraft.launcher.core.auth.IAuthenticator;
 import org.jackhuang.hellominecraft.launcher.core.auth.OfflineAuthenticator;
diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MinecraftCrashAdvicer.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MinecraftCrashAdvicer.java
similarity index 97%
rename from HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MinecraftCrashAdvicer.java
rename to HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MinecraftCrashAdvicer.java
index 63b8fb381..7bf3bfa54 100755
--- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/MinecraftCrashAdvicer.java
+++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/utils/MinecraftCrashAdvicer.java
@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see {http://www.gnu.org/licenses/}.
  */
-package org.jackhuang.hellominecraft.launcher.core;
+package org.jackhuang.hellominecraft.launcher.utils;
 
 import org.jackhuang.hellominecraft.C;