diff --git a/Scripts/Editor/VRMTest.cs b/Scripts/Editor/VRMTest.cs
index a0b02d8f3..dae5e318c 100644
--- a/Scripts/Editor/VRMTest.cs
+++ b/Scripts/Editor/VRMTest.cs
@@ -61,8 +61,7 @@ public class VRMTest
                 // import
                 context.ParseJson(gltf.ToJson(), new SimpleStorage());
                 //Debug.LogFormat("{0}", context.Json);
-                gltfImporter.Load(context);
-
+                context.Load();
                 AssertAreEqual(go.transform, context.Root.transform);
             }
         }
diff --git a/Scripts/Format/VRMImporter.cs b/Scripts/Format/VRMImporter.cs
index cd0d94418..0eadd40bc 100644
--- a/Scripts/Format/VRMImporter.cs
+++ b/Scripts/Format/VRMImporter.cs
@@ -37,15 +37,11 @@ namespace VRM
         public static void LoadFromBytes(VRMImporterContext context)
         {
             context.MaterialImporter = new VRMMaterialImporter(context, glTF_VRM_Material.Parse(context.Json));
-
-            gltfImporter.Load(context);
-
+            context.Load();
             OnLoadModel(context);
-
             context.ShowMeshes();
         }
 
-
         #region OnLoad
         public static Unit OnLoadModel(VRMImporterContext context)
         {
@@ -299,7 +295,7 @@ namespace VRM
             for (int i = 0; i < context.GLTF.meshes.Count; ++i)
             {
                 var meshContext = meshImporter.ReadMesh(context, i);
-                var meshWithMaterials = gltfImporter.BuildMesh(context, meshContext);
+                var meshWithMaterials = MeshImporter.BuildMesh(context, meshContext);
                 var mesh = meshWithMaterials.Mesh;
                 if (string.IsNullOrEmpty(mesh.name))
                 {
@@ -315,7 +311,7 @@ namespace VRM
         {
             foreach (var x in context.GLTF.nodes)
             {
-                context.Nodes.Add(gltfImporter.ImportNode(x).transform);
+                context.Nodes.Add(NodeImporter.ImportNode(x).transform);
             }
 
             yield return null;
@@ -323,18 +319,18 @@ namespace VRM
 
         static IEnumerator BuildHierarchy(VRMImporterContext context)
         {
-            var nodes = new List<gltfImporter.TransformWithSkin>();
+            var nodes = new List<NodeImporter.TransformWithSkin>();
             for (int i = 0; i < context.Nodes.Count; ++i)
             {
-                nodes.Add(gltfImporter.BuildHierarchy(context, i));
+                nodes.Add(NodeImporter.BuildHierarchy(context, i));
             }
 
-            gltfImporter.FixCoordinate(context, nodes);
+            NodeImporter.FixCoordinate(context, nodes);
 
             // skinning
             for (int i = 0; i < nodes.Count; ++i)
             {
-                gltfImporter.SetupSkinning(context, nodes, i);
+                NodeImporter.SetupSkinning(context, nodes, i);
             }
 
             // connect root
@@ -460,7 +456,7 @@ namespace VRM
                         {
                             using (ctx.MeasureTime("BuildMesh"))
                             {
-                                return gltfImporter.BuildMesh(ctx, x);
+                                return MeshImporter.BuildMesh(ctx, x);
                             }
                         })
                         .ContinueWith(Scheduler.ThreadPool, x => ctx.Meshes.Add(x))
diff --git a/UniGLTF b/UniGLTF
index 2d708472e..ae46109ba 160000
--- a/UniGLTF
+++ b/UniGLTF
@@ -1 +1 @@
-Subproject commit 2d708472ef2c9bc04a268b453be6a6197e026076
+Subproject commit ae46109baa389213ed8f8b61754a78f48fc0a0c2