diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLAssetService.java b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLAssetService.java
index 3c752fa39..333e93b06 100644
--- a/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLAssetService.java
+++ b/HMCL/src/main/java/org/jackhuang/hmcl/util/HMCLAssetService.java
@@ -33,7 +33,7 @@ public class HMCLAssetService extends MinecraftAssetService {
     }
     
     private boolean useSelf(String assetId) {
-        return new File(service.baseDirectory(), "assets/indexes/" + assetId + ",json").exists() || ((HMCLMinecraftService) service).p.isNoCommon();
+        return new File(service.baseDirectory(), "assets/indexes/" + assetId + ".json").exists() || ((HMCLMinecraftService) service).p.isNoCommon();
     }
 
     @Override
diff --git a/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/Icon9Factory.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/Icon9Factory.java
similarity index 100%
rename from HMCLaF/src/main/java/org/jackhuang/hmcl/laf/Icon9Factory.java
rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/Icon9Factory.java
diff --git a/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/IconFactory.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/IconFactory.java
similarity index 100%
rename from HMCLaF/src/main/java/org/jackhuang/hmcl/laf/IconFactory.java
rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/IconFactory.java
diff --git a/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/MySwingUtilities2.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/MySwingUtilities2.java
similarity index 100%
rename from HMCLaF/src/main/java/org/jackhuang/hmcl/laf/MySwingUtilities2.java
rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/MySwingUtilities2.java
diff --git a/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/NinePatchHelper.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/NinePatchHelper.java
similarity index 100%
rename from HMCLaF/src/main/java/org/jackhuang/hmcl/laf/NinePatchHelper.java
rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/NinePatchHelper.java
diff --git a/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/UI.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/UI.java
similarity index 100%
rename from HMCLaF/src/main/java/org/jackhuang/hmcl/laf/UI.java
rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/UI.java
diff --git a/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/WinUtils.java b/HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/WinUtils.java
similarity index 100%
rename from HMCLaF/src/main/java/org/jackhuang/hmcl/laf/WinUtils.java
rename to HMCLaF/src/main/java/org/jackhuang/hmcl/laf/utils/WinUtils.java