refactor

src/Console/AutoCompleter.cs

@@ -4,10 +4,10 @@ using System.Linq;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
-#if CPP
-#endif
+using UnityExplorer.UI;
+using UnityExplorer.UI.PageModel;
 
-namespace UnityExplorer.UI.Main.Console
+namespace UnityExplorer.Console
 {
     public class AutoCompleter
     {
@@ -17,7 +17,7 @@ namespace UnityExplorer.UI.Main.Console
         private const int UPDATES_PER_BATCH = 100;
 
         public static GameObject m_mainObj;
-        private static RectTransform m_thisRect;
+        //private static RectTransform m_thisRect;
 
         private static readonly List<GameObject> m_suggestionButtons = new List<GameObject>();
         private static readonly List<Text> m_suggestionTexts = new List<Text>();
@@ -259,7 +259,7 @@ namespace UnityExplorer.UI.Main.Console
             m_mainObj = obj;
 
             var mainRect = obj.GetComponent<RectTransform>();
-            m_thisRect = mainRect;
+            //m_thisRect = mainRect;
             mainRect.pivot = new Vector2(0f, 1f);
             mainRect.anchorMin = new Vector2(0.45f, 0.45f);
             mainRect.anchorMax = new Vector2(0.65f, 0.6f);

src/Console/CSharpLexer.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Text;
-using UnityExplorer.UI.Main.Console.Lexer;
+using UnityExplorer.Console.Lexer;
 using UnityEngine;
 
-namespace UnityExplorer.UI.Main.Console
+namespace UnityExplorer.Console
 {
     public static class CSharpLexer
     {

src/Console/CodeEditor.cs

@@ -2,13 +2,15 @@
 using System.Linq;
 using System.Text;
 using UnityExplorer.Input;
-using UnityExplorer.UI.Main.Console.Lexer;
+using UnityExplorer.Console.Lexer;
 using TMPro;
 using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using UnityExplorer.UI;
+using UnityExplorer.UI.PageModel;
 
-namespace UnityExplorer.UI.Main.Console
+namespace UnityExplorer.Console
 {
     public class CodeEditor
     {

src/Console/Lexer/CommentMatch.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.Main.Console.Lexer
+namespace UnityExplorer.Console.Lexer
 {
     public sealed class CommentMatch : Matcher
     {

src/Console/Lexer/InputLexer.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace UnityExplorer.UI.Main.Console.Lexer
+namespace UnityExplorer.Console.Lexer
 {
     public struct LexerMatchInfo
     {

src/Console/Lexer/KeywordMatch.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.Main.Console.Lexer
+namespace UnityExplorer.Console.Lexer
 {
     public sealed class KeywordMatch : Matcher
     {

src/Console/Lexer/Matcher.cs

@@ -2,7 +2,7 @@
 using UnityExplorer.Unstrip.ColorUtility;
 using UnityEngine;
 
-namespace UnityExplorer.UI.Main.Console.Lexer
+namespace UnityExplorer.Console.Lexer
 {
     public abstract class Matcher
     {

src/Console/Lexer/NumberMatch.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace UnityExplorer.UI.Main.Console.Lexer
+namespace UnityExplorer.Console.Lexer
 {
     public sealed class NumberMatch : Matcher
     {

src/Console/Lexer/StringMatch.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.Main.Console.Lexer
+namespace UnityExplorer.Console.Lexer
 {
     public sealed class StringMatch : Matcher
     {

src/Console/Lexer/SymbolMatch.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace UnityExplorer.UI.Main.Console.Lexer
+namespace UnityExplorer.Console.Lexer
 {
     public sealed class SymbolMatch : Matcher
     {

src/Console/ScriptEvaluator.cs

@@ -6,7 +6,7 @@ using Mono.CSharp;
 
 // Thanks to ManlyMarco for this
 
-namespace UnityExplorer.UI.Main.Console
+namespace UnityExplorer.Console
 {
     public class ScriptEvaluator : Evaluator, IDisposable
     {

src/Console/ScriptInteraction.cs

@@ -1,7 +1,10 @@
 using System;
 using Mono.CSharp;
+using UnityExplorer.UI;
+using UnityExplorer.UI.PageModel;
+using UnityExplorer.Inspectors;
 
-namespace UnityExplorer.UI.Main.Console
+namespace UnityExplorer.Console
 {
     public class ScriptInteraction : InteractiveBase
     {

src/Console/Suggestion.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using UnityEngine;
+using UnityExplorer.Helpers;
 
-namespace UnityExplorer.UI.Main.Console
+namespace UnityExplorer.Console
 {
     public struct Suggestion
     {

src/ExplorerBepInPlugin.cs

@@ -7,6 +7,7 @@ using BepInEx.Logging;
 using HarmonyLib;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using UnityEngine.UI;
 #if CPP
 using UnhollowerRuntimeLib;
 using BepInEx.IL2CPP;
@@ -14,57 +15,25 @@ using BepInEx.IL2CPP;
 
 namespace UnityExplorer
 {
+#if MONO
     [BepInPlugin(ExplorerCore.GUID, "UnityExplorer", ExplorerCore.VERSION)]
-#if CPP
-    public class ExplorerBepInPlugin : BasePlugin
-#else
     public class ExplorerBepInPlugin : BaseUnityPlugin
-#endif
     {
         public static ExplorerBepInPlugin Instance;
 
-        public static ManualLogSource Logging =>
-#if CPP
-                                        Instance?.Log;
-#else
-                                        Instance?.Logger;
-#endif
+        public static ManualLogSource Logging => Instance?.Logger;
 
         public static readonly Harmony HarmonyInstance = new Harmony(ExplorerCore.GUID);
 
-#if CPP
-        // temporary for Il2Cpp until scene change delegate works
-        private static string lastSceneName;
-#endif
-
-        // Init
-#if CPP
-        public override void Load()
-        {
-#else
         internal void Awake()
         {
-#endif
             Instance = this;
 
-#if CPP
-            ClassInjector.RegisterTypeInIl2Cpp<ExplorerBehaviour>();
-
-            var obj = new GameObject(
-                "ExplorerBehaviour",
-                new Il2CppSystem.Type[]
-                {
-                    Il2CppType.Of<ExplorerBehaviour>()
-                }
-            );
-            GameObject.DontDestroyOnLoad(obj);
-#else
             SceneManager.activeSceneChanged += DoSceneChange;
-#endif
 
             new ExplorerCore();
 
-            // HarmonyInstance.PatchAll();
+            HarmonyInstance.PatchAll();
         }
 
         internal static void DoSceneChange(Scene arg0, Scene arg1)
@@ -72,7 +41,54 @@ namespace UnityExplorer
             ExplorerCore.OnSceneChange();
         }
 
-#if CPP // BepInEx Il2Cpp mod class doesn't have monobehaviour methods yet, so wrap them in a dummy.
+        internal void Update()
+        {
+            ExplorerCore.Update();
+        }
+
+    }
+#endif
+
+#if CPP
+    [BepInPlugin(ExplorerCore.GUID, "UnityExplorer", ExplorerCore.VERSION)]
+    public class ExplorerBepInPlugin : BasePlugin
+    {
+        public static ExplorerBepInPlugin Instance;
+
+        public static ManualLogSource Logging => Instance?.Log;
+
+        public static readonly Harmony HarmonyInstance = new Harmony(ExplorerCore.GUID);
+
+        // temporary for Il2Cpp until scene change delegate works
+        private static string lastSceneName;
+
+        // Init
+        public override void Load()
+        {
+            Instance = this;
+
+            ClassInjector.RegisterTypeInIl2Cpp<ExplorerBehaviour>();
+
+            var obj = new GameObject(
+                "ExplorerBehaviour",
+                new Il2CppSystem.Type[]
+                {
+                        Il2CppType.Of<ExplorerBehaviour>()
+                }
+            );
+            GameObject.DontDestroyOnLoad(obj);
+
+            new ExplorerCore();
+
+            HarmonyInstance.PatchAll();
+        }
+
+        internal static void DoSceneChange(Scene arg0, Scene arg1)
+        {
+            ExplorerCore.OnSceneChange();
+        }
+
+        // BepInEx Il2Cpp mod class doesn't have monobehaviour methods yet, so wrap them in a dummy.
         public class ExplorerBehaviour : MonoBehaviour
         {
             public ExplorerBehaviour(IntPtr ptr) : base(ptr) { }
@@ -82,23 +98,20 @@ namespace UnityExplorer
                 Logging.LogMessage("ExplorerBehaviour.Awake");
             }
 
-#endif
             internal void Update()
             {
                 ExplorerCore.Update();
 
-#if CPP
                 var scene = SceneManager.GetActiveScene();
                 if (scene.name != lastSceneName)
                 {
                     lastSceneName = scene.name;
                     DoSceneChange(scene, scene);
                 }
-#endif
+
             }
-#if CPP
         }
-#endif
     }
+#endif
 }
 #endif

src/ExplorerCore.cs

@@ -2,7 +2,7 @@
 using UnityExplorer.Config;
 using UnityExplorer.Input;
 using UnityExplorer.UI;
-using UnityExplorer.UI.Main;
+using UnityExplorer.UI.PageModel;
 using UnityEngine;
 
 namespace UnityExplorer

src/Extensions/ReflectionExtensions.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using UnityExplorer.Helpers;
-
-namespace UnityExplorer
-{
-    public static class ReflectionExtensions
-    {
-#if CPP
-        public static object Il2CppCast(this object obj, Type castTo)
-        {
-            return ReflectionHelpers.Il2CppCast(obj, castTo);
-        }
-#endif
-
-        public static IEnumerable<Type> TryGetTypes(this Assembly asm)
-        {
-            try
-            {
-                return asm.GetTypes();
-            }
-            catch (ReflectionTypeLoadException e)
-            {
-                try
-                {
-                    return asm.GetExportedTypes();
-                }
-                catch
-                {
-                    return e.Types.Where(t => t != null);
-                }
-            }
-            catch
-            {
-                return Enumerable.Empty<Type>();
-            }
-        }
-    }
-}

src/Extensions/UnityExtensions.cs

@@ -1,20 +0,0 @@
-using UnityEngine;
-
-namespace UnityExplorer
-{
-    public static class UnityExtensions
-    {
-        public static string GetTransformPath(this Transform t, bool includeThisName = false)
-        {
-            string path = includeThisName ? t.transform.name : "";
-
-            while (t.parent != null)
-            {
-                t = t.parent;
-                path = $"{t.name}/{path}";
-            }
-
-            return path;
-        }
-    }
-}

src/Helpers/ReflectionHelpers.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using BF = System.Reflection.BindingFlags;
@@ -16,7 +17,7 @@ using System.Runtime.InteropServices;
 namespace UnityExplorer.Helpers
 {
     [SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "External methods")]
-    public class ReflectionHelpers
+    public static class ReflectionHelpers
     {
         public static BF CommonFlags = BF.Public | BF.Instance | BF.NonPublic | BF.Static;
 
@@ -37,7 +38,13 @@ namespace UnityExplorer.Helpers
 #if CPP
         private static readonly Dictionary<Type, IntPtr> ClassPointers = new Dictionary<Type, IntPtr>();
 
-        public static object Il2CppCast(object obj, Type castTo)
+        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public static extern bool il2cpp_class_is_assignable_from(IntPtr klass, IntPtr oklass);
+
+        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
+        public static extern IntPtr il2cpp_object_get_class(IntPtr obj);
+
+        public static object Il2CppCast(this object obj, Type castTo)
         {
             if (!(obj is Il2CppSystem.Object ilObj))
             {
@@ -79,15 +86,31 @@ namespace UnityExplorer.Helpers
 
             return Activator.CreateInstance(castTo, ilObj.Pointer);
         }
-
-        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
-        public static extern bool il2cpp_class_is_assignable_from(IntPtr klass, IntPtr oklass);
-
-        [DllImport("GameAssembly", CallingConvention = CallingConvention.Cdecl, CharSet = CharSet.Ansi)]
-        public static extern IntPtr il2cpp_object_get_class(IntPtr obj);
-
 #endif
 
+        public static IEnumerable<Type> TryGetTypes(this Assembly asm)
+        {
+            try
+            {
+                return asm.GetTypes();
+            }
+            catch (ReflectionTypeLoadException e)
+            {
+                try
+                {
+                    return asm.GetExportedTypes();
+                }
+                catch
+                {
+                    return e.Types.Where(t => t != null);
+                }
+            }
+            catch
+            {
+                return Enumerable.Empty<Type>();
+            }
+        }
+
         public static Type GetTypeByName(string fullName)
         {
             foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())

src/Helpers/Texture2DHelpers.cs

@@ -53,7 +53,7 @@ namespace UnityExplorer.Helpers
             }
         }
 
-        public static Texture2D Copy(Texture2D orig, Rect rect, bool isDTXnmNormal = false)
+        public static Texture2D Copy(Texture2D orig, Rect rect) //, bool isDTXnmNormal = false)
         {
             Color[] pixels;
 

src/Helpers/UnityHelpers.cs

@@ -2,7 +2,7 @@
 
 namespace UnityExplorer.Helpers
 {
-    public class UnityHelpers
+    public static class UnityHelpers
     {
         private static Camera m_mainCamera;
 
@@ -25,5 +25,23 @@ namespace UnityExplorer.Helpers
                 return UnityEngine.SceneManagement.SceneManager.GetActiveScene().name;
             }
         }
+
+        public static string ToStringLong(this Vector3 vec)
+        {
+            return $"X: {vec.x:F3}, Y: {vec.y:F3}, Z: {vec.z:F3}";
+        }
+
+        public static string GetTransformPath(this Transform t, bool includeThisName = false)
+        {
+            string path = includeThisName ? t.transform.name : "";
+
+            while (t.parent != null)
+            {
+                t = t.parent;
+                path = $"{t.name}/{path}";
+            }
+
+            return path;
+        }
     }
 }

src/Inspectors/InspectorBase.cs

@@ -1,8 +1,9 @@
 using System;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.Main.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public abstract class InspectorBase
     {
@@ -32,6 +33,16 @@ namespace UnityExplorer.UI.Main.Inspectors
             AddInspectorTab();
         }
 
+        public virtual void SetContentActive()
+        {
+            Content?.SetActive(true);
+        }
+
+        public virtual void SetContentInactive()
+        {
+            Content?.SetActive(false);
+        }
+
         public virtual void Update()
         {
             if (ObjectNullOrDestroyed(Target, UnityTarget))

src/Inspectors/InspectorManager.cs

@@ -2,14 +2,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityExplorer.Helpers;
-using UnityExplorer.UI.Main.Inspectors;
-using UnityExplorer.UI.Shared;
-using UnityExplorer.Unstrip.Scenes;
+using UnityExplorer.UI;
+using UnityExplorer.UI.PageModel;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 
-namespace UnityExplorer.UI.Main
+namespace UnityExplorer.Inspectors
 {
     public class InspectorManager
     {
@@ -83,7 +82,7 @@ namespace UnityExplorer.UI.Main
             }
 
             m_currentInspectors.Add(inspector);
-            inspector.Content?.SetActive(false);
+            inspector.SetContentInactive();
 
             SetInspectorTab(inspector);
         }
@@ -99,7 +98,7 @@ namespace UnityExplorer.UI.Main
 
             m_activeInspector = inspector;
 
-            m_activeInspector.Content?.SetActive(true);
+            inspector.SetContentActive();
 
             Color activeColor = new Color(0, 0.25f, 0, 1);
             ColorBlock colors = inspector.tabButton.colors;
@@ -115,7 +114,7 @@ namespace UnityExplorer.UI.Main
                 return;
             }
 
-            m_activeInspector.Content?.SetActive(false);
+            m_activeInspector.SetContentInactive();
 
             ColorBlock colors = m_activeInspector.tabButton.colors;
             colors.normalColor = new Color(0.2f, 0.2f, 0.2f, 1);

src/Inspectors/InstanceInspector.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityExplorer.Helpers;
 
-namespace UnityExplorer.UI.Main.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class InstanceInspector : ReflectionInspector
     {

src/Inspectors/ReflectionInspector.cs

@@ -5,7 +5,7 @@ using System.Text;
 using UnityExplorer.Helpers;
 using UnityEngine;
 
-namespace UnityExplorer.UI.Main.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class ReflectionInspector : InspectorBase
     {

src/Inspectors/SceneExplorer.cs

@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using UnityExplorer.Helpers;
-using UnityExplorer.UI.Main.Inspectors;
+using UnityExplorer.UI;
+using UnityExplorer.UI.PageModel;
 using UnityExplorer.UI.Shared;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using UnityExplorer.Unstrip.Scenes;
 
-namespace UnityExplorer.UI.Main
+namespace UnityExplorer.Inspectors
 {
     public class SceneExplorer
     {

src/Inspectors/StaticInspector.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace UnityExplorer.UI.Main.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class StaticInspector : ReflectionInspector
     {

src/UI/InteractiveValue/InteractiveValue.cs

@@ -7,7 +7,7 @@
 //using UnityExplorer.Helpers;
 //using UnityExplorer.UI.Shared;
 
-//namespace UnityExplorer.UI
+//namespace UnityExplorer.UI.InteractiveValue
 //{
 //    public class InteractiveValue
 //    {

src/UI/MainMenu.cs

@@ -1,10 +1,11 @@
 using System;
 using System.Collections.Generic;
-using UnityExplorer.UI.Main.Console;
+using UnityExplorer.Console;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI.PageModel;
 
-namespace UnityExplorer.UI.Main
+namespace UnityExplorer.UI
 {
     public class MainMenu
     {

src/UI/PageModel/ConsolePage.cs

@@ -3,16 +3,17 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using System.Text;
-using UnityExplorer.UI.Main.Console;
+using UnityExplorer.Console;
 using UnityExplorer.Unstrip.Resources;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.Helpers;
 #if CPP
 using UnhollowerRuntimeLib;
 #endif
 
-namespace UnityExplorer.UI.Main
+namespace UnityExplorer.UI.PageModel
 {
     public class ConsolePage : MainMenu.Page
     {

src/UI/PageModel/DebugConsole.cs

@@ -4,10 +4,8 @@ using UnityExplorer.Unstrip.ColorUtility;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
-#if CPP
-#endif
 
-namespace UnityExplorer.UI.Main
+namespace UnityExplorer.UI.PageModel
 {
     public class DebugConsole
     {

src/UI/PageModel/HomePage.cs

@@ -3,8 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.Inspectors;
 
-namespace UnityExplorer.UI.Main
+namespace UnityExplorer.UI.PageModel
 {
     public class HomePage : MainMenu.Page
     {

src/UI/PageModel/OptionsPage.cs

@@ -1,4 +1,10 @@
-namespace UnityExplorer.UI.Main
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace UnityExplorer.UI.PageModel
 {
     public class OptionsPage : MainMenu.Page
     {

src/UI/PageModel/SearchPage.cs

@@ -1,4 +1,10 @@
-namespace UnityExplorer.UI.Main
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace UnityExplorer.UI.PageModel
 {
     public class SearchPage : MainMenu.Page
     {

src/UI/PanelDragger.cs

@@ -8,7 +8,7 @@ using System.IO;
 using UnityExplorer.Unstrip.ImageConversion;
 #endif
 
-namespace UnityExplorer.UI.Main
+namespace UnityExplorer.UI
 {
     // Handles dragging and resizing for the main explorer window.
 

src/UI/Shared/SyntaxColors.cs

@@ -1,6 +1,6 @@
 namespace UnityExplorer.UI.Shared
 {
-    public class Syntax
+    public class SyntaxColors
     {
         public const string Field_Static = "#8d8dc6";
         public const string Field_Instance = "#c266ff";

src/UI/UIFactory.cs

@@ -437,6 +437,7 @@ namespace UnityExplorer.UI
             GameObject placeHolderObj = CreateUIObject("Placeholder", textArea);
             TextMeshProUGUI placeholderText = placeHolderObj.AddComponent<TextMeshProUGUI>();
             placeholderText.fontSize = fontSize;
+            placeholderText.fontSizeMax = fontSize;
             placeholderText.text = "...";
             placeholderText.color = new Color(0.5f, 0.5f, 0.5f, 1.0f);
             placeholderText.overflowMode = (TextOverflowModes)overflowMode;
@@ -457,6 +458,7 @@ namespace UnityExplorer.UI
             GameObject inputTextObj = CreateUIObject("Text", textArea);
             TextMeshProUGUI inputText = inputTextObj.AddComponent<TextMeshProUGUI>();
             inputText.fontSize = fontSize;
+            inputText.fontSizeMax = fontSize;
             inputText.text = "";
             inputText.color = new Color(1f, 1f, 1f, 1f);
             inputText.overflowMode = (TextOverflowModes)overflowMode;

src/UI/UIManager.cs

@@ -1,7 +1,7 @@
-using UnityExplorer.UI.Main;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
+using UnityExplorer.Inspectors;
 
 namespace UnityExplorer.UI
 {

src/UnityExplorer.csproj

@@ -327,20 +327,18 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CacheObject\CacheEnumerated.cs" />
-    <Compile Include="CacheObject\CacheFactory.cs" />
-    <Compile Include="CacheObject\CacheField.cs" />
-    <Compile Include="CacheObject\CacheMember.cs" />
-    <Compile Include="CacheObject\CacheMethod.cs" />
-    <Compile Include="CacheObject\CacheProperty.cs" />
-    <Compile Include="CacheObject\CacheObjectBase.cs" />
+    <Compile Include="Inspectors\CacheObject\CacheEnumerated.cs" />
+    <Compile Include="Inspectors\CacheObject\CacheFactory.cs" />
+    <Compile Include="Inspectors\CacheObject\CacheField.cs" />
+    <Compile Include="Inspectors\CacheObject\CacheMember.cs" />
+    <Compile Include="Inspectors\CacheObject\CacheMethod.cs" />
+    <Compile Include="Inspectors\CacheObject\CacheProperty.cs" />
+    <Compile Include="Inspectors\CacheObject\CacheObjectBase.cs" />
     <Compile Include="Helpers\Texture2DHelpers.cs" />
     <Compile Include="Config\ModConfig.cs" />
     <Compile Include="ExplorerCore.cs" />
     <Compile Include="ExplorerBepInPlugin.cs" />
     <Compile Include="ExplorerMelonMod.cs" />
-    <Compile Include="Extensions\ReflectionExtensions.cs" />
-    <Compile Include="Extensions\UnityExtensions.cs" />
     <Compile Include="Helpers\ReflectionHelpers.cs" />
     <Compile Include="Helpers\UnityHelpers.cs" />
     <Compile Include="UI\ForceUnlockCursor.cs" />
@@ -350,36 +348,36 @@
     <Compile Include="Input\InputSystem.cs" />
     <Compile Include="Input\LegacyInput.cs" />
     <Compile Include="Input\NoInput.cs" />
-    <Compile Include="UI\Main\DebugConsole.cs" />
-    <Compile Include="UI\Main\InspectorManager.cs" />
-    <Compile Include="UI\Main\Inspectors\ReflectionInspector.cs" />
-    <Compile Include="UI\Main\MainMenu.cs" />
-    <Compile Include="UI\Main\ConsolePage.cs" />
-    <Compile Include="UI\Main\Console\AutoCompleter.cs" />
-    <Compile Include="UI\Main\Console\CodeEditor.cs" />
-    <Compile Include="UI\Main\Console\CSharpLexer.cs" />
-    <Compile Include="UI\Main\Console\Lexer\CommentMatch.cs" />
-    <Compile Include="UI\Main\Console\Lexer\InputLexer.cs" />
-    <Compile Include="UI\Main\Console\Lexer\KeywordMatch.cs" />
-    <Compile Include="UI\Main\Console\Lexer\StringMatch.cs" />
-    <Compile Include="UI\Main\Console\Lexer\Matcher.cs" />
-    <Compile Include="UI\Main\Console\Lexer\NumberMatch.cs" />
-    <Compile Include="UI\Main\Console\Lexer\SymbolMatch.cs" />
-    <Compile Include="UI\Main\Console\Suggestion.cs" />
-    <Compile Include="UI\Main\Console\ScriptEvaluator.cs" />
-    <Compile Include="UI\Main\Console\ScriptInteraction.cs" />
-    <Compile Include="UI\Main\HomePage.cs" />
-    <Compile Include="UI\Main\Inspectors\GameObjectInspector.cs" />
-    <Compile Include="UI\Main\Inspectors\InspectorBase.cs" />
-    <Compile Include="UI\Main\Inspectors\InstanceInspector.cs" />
-    <Compile Include="UI\Main\Inspectors\StaticInspector.cs" />
-    <Compile Include="UI\Main\OptionsPage.cs" />
-    <Compile Include="UI\Main\SceneExplorer.cs" />
-    <Compile Include="UI\Main\SearchPage.cs" />
-    <Compile Include="UI\Main\PanelDragger.cs" />
+    <Compile Include="UI\PageModel\DebugConsole.cs" />
+    <Compile Include="Inspectors\InspectorManager.cs" />
+    <Compile Include="Inspectors\ReflectionInspector.cs" />
+    <Compile Include="UI\MainMenu.cs" />
+    <Compile Include="UI\PageModel\ConsolePage.cs" />
+    <Compile Include="Console\AutoCompleter.cs" />
+    <Compile Include="Console\CodeEditor.cs" />
+    <Compile Include="Console\CSharpLexer.cs" />
+    <Compile Include="Console\Lexer\CommentMatch.cs" />
+    <Compile Include="Console\Lexer\InputLexer.cs" />
+    <Compile Include="Console\Lexer\KeywordMatch.cs" />
+    <Compile Include="Console\Lexer\StringMatch.cs" />
+    <Compile Include="Console\Lexer\Matcher.cs" />
+    <Compile Include="Console\Lexer\NumberMatch.cs" />
+    <Compile Include="Console\Lexer\SymbolMatch.cs" />
+    <Compile Include="Console\Suggestion.cs" />
+    <Compile Include="Console\ScriptEvaluator.cs" />
+    <Compile Include="Console\ScriptInteraction.cs" />
+    <Compile Include="UI\PageModel\HomePage.cs" />
+    <Compile Include="Inspectors\GameObjectInspector.cs" />
+    <Compile Include="Inspectors\InspectorBase.cs" />
+    <Compile Include="Inspectors\InstanceInspector.cs" />
+    <Compile Include="Inspectors\StaticInspector.cs" />
+    <Compile Include="UI\PageModel\OptionsPage.cs" />
+    <Compile Include="Inspectors\SceneExplorer.cs" />
+    <Compile Include="UI\PageModel\SearchPage.cs" />
+    <Compile Include="UI\PanelDragger.cs" />
     <Compile Include="UI\InteractiveValue\InteractiveValue.cs" />
     <Compile Include="UI\Shared\PageHandler.cs" />
-    <Compile Include="UI\Shared\Syntax.cs" />
+    <Compile Include="UI\Shared\SyntaxColors.cs" />
     <Compile Include="UI\UIManager.cs" />
     <Compile Include="Unstrip\ColorUtility\ColorUtilityUnstrip.cs" />
     <Compile Include="Unstrip\ImageConversion\ImageConversionUnstrip.cs" />
@@ -394,9 +392,7 @@
     <None Include="ILRepack.targets" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="UI\MouseInspector\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="packages\ILRepack.Lib.MSBuild.Task.2.0.18.1\build\ILRepack.Lib.MSBuild.Task.targets" Condition="Exists('packages\ILRepack.Lib.MSBuild.Task.2.0.18.1\build\ILRepack.Lib.MSBuild.Task.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

src/Unstrip/Scene/SceneUnstrip.cs

@@ -1,8 +1,8 @@
 using System;
 using UnityExplorer.Helpers;
-using UnityExplorer.UI.Main;
 using UnityEngine;
 using UnityEngine.SceneManagement;
+using UnityExplorer.Inspectors;
 
 namespace UnityExplorer.Unstrip.Scenes
 {