diff --git a/AssetStudio/CubismMoc.cs b/AssetStudio/Addons/CubismLive2D/CubismMoc.cs
similarity index 99%
rename from AssetStudio/CubismMoc.cs
rename to AssetStudio/Addons/CubismLive2D/CubismMoc.cs
index 12e5d18..e9eda11 100644
--- a/AssetStudio/CubismMoc.cs
+++ b/AssetStudio/Addons/CubismLive2D/CubismMoc.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace AssetStudio
+namespace AssetStudio.Addons.CubismLive2D
 {
     public enum CubismSDKVersion : byte
     {
diff --git a/AssetStudio/CubismModel.cs b/AssetStudio/Addons/CubismLive2D/CubismModel.cs
similarity index 96%
rename from AssetStudio/CubismModel.cs
rename to AssetStudio/Addons/CubismLive2D/CubismModel.cs
index d94386e..9970b8f 100644
--- a/AssetStudio/CubismModel.cs
+++ b/AssetStudio/Addons/CubismLive2D/CubismModel.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace AssetStudio
+namespace AssetStudio.Addons.CubismLive2D
 {
     public class CubismModel
     {
diff --git a/AssetStudio/AssetsManager.cs b/AssetStudio/AssetsManager.cs
index 2fde233..e1b6b68 100644
--- a/AssetStudio/AssetsManager.cs
+++ b/AssetStudio/AssetsManager.cs
@@ -1,3 +1,6 @@
+using AssetStudio.Addons.CubismLive2D;
+using AssetStudio.CustomOptions;
+using AssetStudio.CustomOptions.Asmo;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -5,10 +8,8 @@ using System.IO;
 using System.IO.Compression;
 using System.Linq;
 using System.Text;
-using System.Text.Json.Serialization;
 using System.Text.Json;
-using AssetStudio.CustomOptions;
-using AssetStudio.CustomOptions.Asmo;
+using System.Text.Json.Serialization;
 using static AssetStudio.ImportHelper;
 
 namespace AssetStudio
diff --git a/AssetStudio/Classes/GameObject.cs b/AssetStudio/Classes/GameObject.cs
index 23eb4d5..a382413 100644
--- a/AssetStudio/Classes/GameObject.cs
+++ b/AssetStudio/Classes/GameObject.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using AssetStudio.Addons.CubismLive2D;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace AssetStudio
diff --git a/AssetStudioCLI/Studio.cs b/AssetStudioCLI/Studio.cs
index 9bb0a11..ae4e255 100644
--- a/AssetStudioCLI/Studio.cs
+++ b/AssetStudioCLI/Studio.cs
@@ -1,4 +1,5 @@
 using AssetStudio;
+using AssetStudio.Addons.CubismLive2D;
 using AssetStudioCLI.Options;
 using CubismLive2DExtractor;
 using System;
diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs
index 793ac36..b52ece9 100644
--- a/AssetStudioGUI/AssetStudioGUIForm.cs
+++ b/AssetStudioGUI/AssetStudioGUIForm.cs
@@ -1243,7 +1243,7 @@ namespace AssetStudioGUI
 
         private void PreviewMoc(AssetItem assetItem, MonoBehaviour m_MonoBehaviour)
         {
-            using (var cubismMoc = new CubismMoc(m_MonoBehaviour))
+            using (var cubismMoc = new AssetStudio.Addons.CubismLive2D.CubismMoc(m_MonoBehaviour))
             {
                 var sb = new StringBuilder();
                 if (Studio.l2dModelDict.TryGetValue(m_MonoBehaviour, out var model) && model != null)
diff --git a/AssetStudioGUI/Studio.cs b/AssetStudioGUI/Studio.cs
index c6da6e8..83726e4 100644
--- a/AssetStudioGUI/Studio.cs
+++ b/AssetStudioGUI/Studio.cs
@@ -1,4 +1,5 @@
 using AssetStudio;
+using AssetStudio.Addons.CubismLive2D;
 using CubismLive2DExtractor;
 using System;
 using System.Collections.Concurrent;
diff --git a/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs b/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs
index 2c1dca1..e653c86 100644
--- a/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs
+++ b/AssetStudioUtility/CubismLive2DExtractor/Live2DExtractor.cs
@@ -3,6 +3,11 @@
 // https://github.com/Perfare/UnityLive2DExtractor
 ////
 
+using AssetStudio;
+using AssetStudio.Addons.CubismLive2D;
+using CubismLive2DExtractor.CubismUnityClasses;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -11,10 +16,6 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using AssetStudio;
-using CubismLive2DExtractor.CubismUnityClasses;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using static CubismLive2DExtractor.CubismParsers;
 using Object = AssetStudio.Object;