diff --git a/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs b/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs
index ab805258..75cef526 100644
--- a/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs
+++ b/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/AvatarProcessor.cs
@@ -1,4 +1,4 @@
-using Suzuryg.FaceEmo.Components.MA;
+using Suzuryg.FaceEmo.Components.AV3;
 using System;
 using UnityEngine;
 using VRC.SDKBase.Editor.BuildPipeline;
diff --git a/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs b/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs
index 20f0e7a0..c898148a 100644
--- a/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs
+++ b/Packages/jp.suzuryg.face-emo/Editor/Detail/AV3/FxGenerator.cs
@@ -2,8 +2,8 @@
 using AnimatorAsCode.V0.Extensions.VRChat;
 using Suzuryg.FaceEmo.Domain;
 using Suzuryg.FaceEmo.UseCase;
+using Suzuryg.FaceEmo.Components.AV3;
 using Suzuryg.FaceEmo.Components.Settings;
-using Suzuryg.FaceEmo.Components.MA;
 using Suzuryg.FaceEmo.Detail.Drawing;
 using Suzuryg.FaceEmo.External.Hai.ComboGestureIntegrator;
 using System;
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3.meta
similarity index 100%
rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA.meta
rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3.meta
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs
similarity index 90%
rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs
rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs
index dfc75df4..3e7f8c9a 100644
--- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs
+++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace Suzuryg.FaceEmo.Components.MA
+namespace Suzuryg.FaceEmo.Components.AV3
 {
     [DisallowMultipleComponent]
     public class BlinkDisabler : RunBeforeModularAvatar
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs.meta
similarity index 100%
rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/BlinkDisabler.cs.meta
rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/BlinkDisabler.cs.meta
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs
similarity index 88%
rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs
rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs
index d4f126e0..b89c6e3b 100644
--- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs
+++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs
@@ -5,14 +5,10 @@
 using nadena.dev.modular_avatar.core;
 #endif
 
-namespace Suzuryg.FaceEmo.Components.MA
+namespace Suzuryg.FaceEmo.Components.AV3
 {
     [DefaultExecutionOrder(-20000)] // run before modular avatar
-#if USE_MODULAR_AVATAR
-    public abstract class RunBeforeModularAvatar : AvatarTagComponent // Inherit AvatarTagComponent to register in VRChat whitelist
-#else
-    public abstract class RunBeforeModularAvatar : MonoBehaviour
-#endif
+    public abstract class RunBeforeModularAvatar : MonoBehaviour , VRC.SDKBase.IEditorOnly // Inherit IEditorOnly to register in VRChat whitelist
     {
 #if UNITY_EDITOR
         private static bool isPlaying => UnityEditor.EditorApplication.isPlayingOrWillChangePlaymode;
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs.meta
similarity index 100%
rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/RunBeforeModularAvatar.cs.meta
rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/RunBeforeModularAvatar.cs.meta
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs
similarity index 99%
rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs
rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs
index 9e337902..e39b5465 100644
--- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs
+++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs
@@ -11,7 +11,7 @@
 using UnityEditor.Animations;
 #endif
 
-namespace Suzuryg.FaceEmo.Components.MA
+namespace Suzuryg.FaceEmo.Components.AV3
 {
     [DisallowMultipleComponent]
     public class TrackingControlDisabler : RunBeforeModularAvatar
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs.meta
similarity index 100%
rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/TrackingControlDisabler.cs.meta
rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/TrackingControlDisabler.cs.meta
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef
new file mode 100644
index 00000000..7de35cc3
--- /dev/null
+++ b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef
@@ -0,0 +1,18 @@
+{
+    "name": "jp.suzuryg.face-emo.components.av3.Runtime",
+    "references": [
+        "GUID:ad29c40ce7d8264468d6c7634e6a3a40"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "VRCSDKBase.dll",
+        "VRCSDK3A.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
\ No newline at end of file
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef.meta b/Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef.meta
similarity index 100%
rename from Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef.meta
rename to Packages/jp.suzuryg.face-emo/Runtime/Components/AV3/jp.suzuryg.face-emo.components.av3.Runtime.asmdef.meta
diff --git a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef b/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef
deleted file mode 100644
index 4d92ce43..00000000
--- a/Packages/jp.suzuryg.face-emo/Runtime/Components/MA/jp.suzuryg.face-emo.components.ma.Runtime.asmdef
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "name": "jp.suzuryg.face-emo.components.ma.Runtime",
-    "references": [
-        "GUID:ad29c40ce7d8264468d6c7634e6a3a40",
-        "GUID:fc900867c0f47cd49b6e2ae4ef907300"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": true,
-    "precompiledReferences": [
-        "VRCSDKBase.dll",
-        "VRCSDK3A.dll"
-    ],
-    "autoReferenced": false,
-    "defineConstraints": [],
-    "versionDefines": [
-        {
-            "name": "nadena.dev.modular-avatar",
-            "expression": "",
-            "define": "USE_MODULAR_AVATAR"
-        }
-    ],
-    "noEngineReferences": false
-}
\ No newline at end of file