diff --git a/src/UI/CSConsole/CSAutoCompleter.cs b/src/CSConsole/CSAutoCompleter.cs
similarity index 98%
rename from src/UI/CSConsole/CSAutoCompleter.cs
rename to src/CSConsole/CSAutoCompleter.cs
index a760f1b..af0854b 100644
--- a/src/UI/CSConsole/CSAutoCompleter.cs
+++ b/src/CSConsole/CSAutoCompleter.cs
@@ -3,10 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.UI.CSConsole.Lexers;
+using UnityExplorer.CSConsole.Lexers;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public class CSAutoCompleter : ISuggestionProvider
     {
diff --git a/src/UI/CSConsole/ConsoleController.cs b/src/CSConsole/ConsoleController.cs
similarity index 99%
rename from src/UI/CSConsole/ConsoleController.cs
rename to src/CSConsole/ConsoleController.cs
index 738b736..5bf8f87 100644
--- a/src/UI/CSConsole/ConsoleController.cs
+++ b/src/CSConsole/ConsoleController.cs
@@ -10,11 +10,12 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UnityExplorer.Core.Input;
-using UnityExplorer.UI.CSConsole;
+using UnityExplorer.CSConsole;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public static class ConsoleController
     {
diff --git a/src/UI/CSConsole/LexerBuilder.cs b/src/CSConsole/LexerBuilder.cs
similarity index 99%
rename from src/UI/CSConsole/LexerBuilder.cs
rename to src/CSConsole/LexerBuilder.cs
index 4bf19d2..21a5c9d 100644
--- a/src/UI/CSConsole/LexerBuilder.cs
+++ b/src/CSConsole/LexerBuilder.cs
@@ -5,9 +5,9 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CSConsole.Lexers;
+using UnityExplorer.CSConsole.Lexers;
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public struct MatchInfo
     {
diff --git a/src/UI/CSConsole/Lexers/CommentLexer.cs b/src/CSConsole/Lexers/CommentLexer.cs
similarity index 96%
rename from src/UI/CSConsole/Lexers/CommentLexer.cs
rename to src/CSConsole/Lexers/CommentLexer.cs
index ed33565..afa605d 100644
--- a/src/UI/CSConsole/Lexers/CommentLexer.cs
+++ b/src/CSConsole/Lexers/CommentLexer.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class CommentLexer : Lexer
     {
diff --git a/src/UI/CSConsole/Lexers/KeywordLexer.cs b/src/CSConsole/Lexers/KeywordLexer.cs
similarity index 98%
rename from src/UI/CSConsole/Lexers/KeywordLexer.cs
rename to src/CSConsole/Lexers/KeywordLexer.cs
index 5c55ebb..34f4e81 100644
--- a/src/UI/CSConsole/Lexers/KeywordLexer.cs
+++ b/src/CSConsole/Lexers/KeywordLexer.cs
@@ -2,7 +2,7 @@
 using System.Text;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class KeywordLexer : Lexer
     {
diff --git a/src/UI/CSConsole/Lexers/Lexer.cs b/src/CSConsole/Lexers/Lexer.cs
similarity index 91%
rename from src/UI/CSConsole/Lexers/Lexer.cs
rename to src/CSConsole/Lexers/Lexer.cs
index a0a5a92..056ebc7 100644
--- a/src/UI/CSConsole/Lexers/Lexer.cs
+++ b/src/CSConsole/Lexers/Lexer.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public abstract class Lexer
     {
diff --git a/src/UI/CSConsole/Lexers/NumberLexer.cs b/src/CSConsole/Lexers/NumberLexer.cs
similarity index 94%
rename from src/UI/CSConsole/Lexers/NumberLexer.cs
rename to src/CSConsole/Lexers/NumberLexer.cs
index 98c0c17..c1a4920 100644
--- a/src/UI/CSConsole/Lexers/NumberLexer.cs
+++ b/src/CSConsole/Lexers/NumberLexer.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class NumberLexer : Lexer
     {
diff --git a/src/UI/CSConsole/Lexers/StringLexer.cs b/src/CSConsole/Lexers/StringLexer.cs
similarity index 98%
rename from src/UI/CSConsole/Lexers/StringLexer.cs
rename to src/CSConsole/Lexers/StringLexer.cs
index e7c5e02..776ed2b 100644
--- a/src/UI/CSConsole/Lexers/StringLexer.cs
+++ b/src/CSConsole/Lexers/StringLexer.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class StringLexer : Lexer
     {
diff --git a/src/UI/CSConsole/Lexers/SymbolLexer.cs b/src/CSConsole/Lexers/SymbolLexer.cs
similarity index 96%
rename from src/UI/CSConsole/Lexers/SymbolLexer.cs
rename to src/CSConsole/Lexers/SymbolLexer.cs
index 4d35297..c6e7e9a 100644
--- a/src/UI/CSConsole/Lexers/SymbolLexer.cs
+++ b/src/CSConsole/Lexers/SymbolLexer.cs
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexers
+namespace UnityExplorer.CSConsole.Lexers
 {
     public class SymbolLexer : Lexer
     {
diff --git a/src/UI/CSConsole/ScriptEvaluator.cs b/src/CSConsole/ScriptEvaluator.cs
similarity index 98%
rename from src/UI/CSConsole/ScriptEvaluator.cs
rename to src/CSConsole/ScriptEvaluator.cs
index d849b07..3bcbaf4 100644
--- a/src/UI/CSConsole/ScriptEvaluator.cs
+++ b/src/CSConsole/ScriptEvaluator.cs
@@ -7,7 +7,7 @@ using System.Text;
 
 // Thanks to ManlyMarco for this
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public class ScriptEvaluator : Evaluator, IDisposable
     {
diff --git a/src/UI/CSConsole/ScriptInteraction.cs b/src/CSConsole/ScriptInteraction.cs
similarity index 98%
rename from src/UI/CSConsole/ScriptInteraction.cs
rename to src/CSConsole/ScriptInteraction.cs
index faf432b..97ce201 100644
--- a/src/UI/CSConsole/ScriptInteraction.cs
+++ b/src/CSConsole/ScriptInteraction.cs
@@ -13,7 +13,7 @@ using UnityExplorer.Core.Runtime;
     To see your output, use the Log panel or a Console Log window.
 */
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.CSConsole
 {
     public class ScriptInteraction : InteractiveBase
     {
diff --git a/src/UI/CacheObject/CacheConfigEntry.cs b/src/CacheObject/CacheConfigEntry.cs
similarity index 94%
rename from src/UI/CacheObject/CacheConfigEntry.cs
rename to src/CacheObject/CacheConfigEntry.cs
index fd2dcd4..b03f0fc 100644
--- a/src/UI/CacheObject/CacheConfigEntry.cs
+++ b/src/CacheObject/CacheConfigEntry.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject.Views;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheConfigEntry : CacheObjectBase
     {
diff --git a/src/UI/CacheObject/CacheField.cs b/src/CacheObject/CacheField.cs
similarity index 95%
rename from src/UI/CacheObject/CacheField.cs
rename to src/CacheObject/CacheField.cs
index 6a7375e..05c6d92 100644
--- a/src/UI/CacheObject/CacheField.cs
+++ b/src/CacheObject/CacheField.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheField : CacheMember
     {
diff --git a/src/UI/CacheObject/CacheKeyValuePair.cs b/src/CacheObject/CacheKeyValuePair.cs
similarity index 96%
rename from src/UI/CacheObject/CacheKeyValuePair.cs
rename to src/CacheObject/CacheKeyValuePair.cs
index 45c979d..54e8ba7 100644
--- a/src/UI/CacheObject/CacheKeyValuePair.cs
+++ b/src/CacheObject/CacheKeyValuePair.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.UI.CacheObject.IValues;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.CacheObject.Views;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheKeyValuePair : CacheObjectBase
     {
diff --git a/src/UI/CacheObject/CacheListEntry.cs b/src/CacheObject/CacheListEntry.cs
similarity index 90%
rename from src/UI/CacheObject/CacheListEntry.cs
rename to src/CacheObject/CacheListEntry.cs
index eae6658..fe2481c 100644
--- a/src/UI/CacheObject/CacheListEntry.cs
+++ b/src/CacheObject/CacheListEntry.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.UI.CacheObject.IValues;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.CacheObject.Views;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheListEntry : CacheObjectBase
     {
diff --git a/src/UI/CacheObject/CacheMember.cs b/src/CacheObject/CacheMember.cs
similarity index 98%
rename from src/UI/CacheObject/CacheMember.cs
rename to src/CacheObject/CacheMember.cs
index be8cc82..2650c54 100644
--- a/src/UI/CacheObject/CacheMember.cs
+++ b/src/CacheObject/CacheMember.cs
@@ -5,11 +5,12 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityExplorer.Core.Runtime;
-using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject.Views;
+using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Models;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public abstract class CacheMember : CacheObjectBase
     {
diff --git a/src/UI/CacheObject/CacheMethod.cs b/src/CacheObject/CacheMethod.cs
similarity index 95%
rename from src/UI/CacheObject/CacheMethod.cs
rename to src/CacheObject/CacheMethod.cs
index 28771dd..0b5a55e 100644
--- a/src/UI/CacheObject/CacheMethod.cs
+++ b/src/CacheObject/CacheMethod.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheMethod : CacheMember
     {
diff --git a/src/UI/CacheObject/CacheObjectBase.cs b/src/CacheObject/CacheObjectBase.cs
similarity index 99%
rename from src/UI/CacheObject/CacheObjectBase.cs
rename to src/CacheObject/CacheObjectBase.cs
index 8d6a53b..2491094 100644
--- a/src/UI/CacheObject/CacheObjectBase.cs
+++ b/src/CacheObject/CacheObjectBase.cs
@@ -7,11 +7,12 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Runtime;
-using UnityExplorer.UI.CacheObject.IValues;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Models;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public enum ValueState
     {
diff --git a/src/UI/CacheObject/CacheProperty.cs b/src/CacheObject/CacheProperty.cs
similarity index 96%
rename from src/UI/CacheObject/CacheProperty.cs
rename to src/CacheObject/CacheProperty.cs
index 503ae95..5f3cea9 100644
--- a/src/UI/CacheObject/CacheProperty.cs
+++ b/src/CacheObject/CacheProperty.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public class CacheProperty : CacheMember
     {
diff --git a/src/UI/CacheObject/ICacheObjectController.cs b/src/CacheObject/ICacheObjectController.cs
similarity index 91%
rename from src/UI/CacheObject/ICacheObjectController.cs
rename to src/CacheObject/ICacheObjectController.cs
index 0e5126f..941e37d 100644
--- a/src/UI/CacheObject/ICacheObjectController.cs
+++ b/src/CacheObject/ICacheObjectController.cs
@@ -3,10 +3,10 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
 
-namespace UnityExplorer.UI.CacheObject
+namespace UnityExplorer.CacheObject
 {
     public interface ICacheObjectController
     {
diff --git a/src/UI/CacheObject/IValues/InteractiveColor.cs b/src/CacheObject/IValues/InteractiveColor.cs
similarity index 98%
rename from src/UI/CacheObject/IValues/InteractiveColor.cs
rename to src/CacheObject/IValues/InteractiveColor.cs
index bb078d5..9cd6fe3 100644
--- a/src/UI/CacheObject/IValues/InteractiveColor.cs
+++ b/src/CacheObject/IValues/InteractiveColor.cs
@@ -4,9 +4,10 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveColor : InteractiveValue
     {
diff --git a/src/UI/CacheObject/IValues/InteractiveDictionary.cs b/src/CacheObject/IValues/InteractiveDictionary.cs
similarity index 98%
rename from src/UI/CacheObject/IValues/InteractiveDictionary.cs
rename to src/CacheObject/IValues/InteractiveDictionary.cs
index 62a614e..b508efb 100644
--- a/src/UI/CacheObject/IValues/InteractiveDictionary.cs
+++ b/src/CacheObject/IValues/InteractiveDictionary.cs
@@ -5,13 +5,14 @@ using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
+using UnityExplorer.Inspectors;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveDictionary : InteractiveValue, ICellPoolDataSource<CacheKeyValuePairCell>, ICacheObjectController
     {
diff --git a/src/UI/CacheObject/IValues/InteractiveEnum.cs b/src/CacheObject/IValues/InteractiveEnum.cs
similarity index 98%
rename from src/UI/CacheObject/IValues/InteractiveEnum.cs
rename to src/CacheObject/IValues/InteractiveEnum.cs
index 3c1d61a..14d1ca2 100644
--- a/src/UI/CacheObject/IValues/InteractiveEnum.cs
+++ b/src/CacheObject/IValues/InteractiveEnum.cs
@@ -5,9 +5,10 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveEnum : InteractiveValue
     {
diff --git a/src/UI/CacheObject/IValues/InteractiveList.cs b/src/CacheObject/IValues/InteractiveList.cs
similarity index 98%
rename from src/UI/CacheObject/IValues/InteractiveList.cs
rename to src/CacheObject/IValues/InteractiveList.cs
index 85b93ec..1b69d16 100644
--- a/src/UI/CacheObject/IValues/InteractiveList.cs
+++ b/src/CacheObject/IValues/InteractiveList.cs
@@ -5,13 +5,14 @@ using System.Linq;
 using System.Reflection;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
+using UnityExplorer.Inspectors;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveList : InteractiveValue, ICellPoolDataSource<CacheListEntryCell>, ICacheObjectController
     {
diff --git a/src/UI/CacheObject/IValues/InteractiveString.cs b/src/CacheObject/IValues/InteractiveString.cs
similarity index 97%
rename from src/UI/CacheObject/IValues/InteractiveString.cs
rename to src/CacheObject/IValues/InteractiveString.cs
index 5c240d1..52d1f4d 100644
--- a/src/UI/CacheObject/IValues/InteractiveString.cs
+++ b/src/CacheObject/IValues/InteractiveString.cs
@@ -6,10 +6,11 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
 using UnityExplorer.UI.Widgets;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveString : InteractiveValue
     {
diff --git a/src/UI/CacheObject/IValues/InteractiveValue.cs b/src/CacheObject/IValues/InteractiveValue.cs
similarity index 95%
rename from src/UI/CacheObject/IValues/InteractiveValue.cs
rename to src/CacheObject/IValues/InteractiveValue.cs
index 1fda917..de88cc6 100644
--- a/src/UI/CacheObject/IValues/InteractiveValue.cs
+++ b/src/CacheObject/IValues/InteractiveValue.cs
@@ -4,10 +4,11 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public abstract class InteractiveValue : IPooledObject
     {
diff --git a/src/UI/CacheObject/IValues/InteractiveValueStruct.cs b/src/CacheObject/IValues/InteractiveValueStruct.cs
similarity index 98%
rename from src/UI/CacheObject/IValues/InteractiveValueStruct.cs
rename to src/CacheObject/IValues/InteractiveValueStruct.cs
index e8ec2c9..6c1cd03 100644
--- a/src/UI/CacheObject/IValues/InteractiveValueStruct.cs
+++ b/src/CacheObject/IValues/InteractiveValueStruct.cs
@@ -5,9 +5,10 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject;
+using UnityExplorer.CacheObject;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.IValues
+namespace UnityExplorer.CacheObject.IValues
 {
     public class InteractiveValueStruct : InteractiveValue
     {
diff --git a/src/UI/CacheObject/Views/CacheConfigCell.cs b/src/CacheObject/Views/CacheConfigCell.cs
similarity index 98%
rename from src/UI/CacheObject/Views/CacheConfigCell.cs
rename to src/CacheObject/Views/CacheConfigCell.cs
index cf1c30e..bd4b3a1 100644
--- a/src/UI/CacheObject/Views/CacheConfigCell.cs
+++ b/src/CacheObject/Views/CacheConfigCell.cs
@@ -4,8 +4,9 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class ConfigEntryCell : CacheObjectCell
     {
diff --git a/src/UI/CacheObject/Views/CacheKeyValuePairCell.cs b/src/CacheObject/Views/CacheKeyValuePairCell.cs
similarity index 96%
rename from src/UI/CacheObject/Views/CacheKeyValuePairCell.cs
rename to src/CacheObject/Views/CacheKeyValuePairCell.cs
index bc7ba67..cf14957 100644
--- a/src/UI/CacheObject/Views/CacheKeyValuePairCell.cs
+++ b/src/CacheObject/Views/CacheKeyValuePairCell.cs
@@ -4,11 +4,12 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject.IValues;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.Inspectors;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class CacheKeyValuePairCell : CacheObjectCell
     {
diff --git a/src/UI/CacheObject/Views/CacheListEntryCell.cs b/src/CacheObject/Views/CacheListEntryCell.cs
similarity index 92%
rename from src/UI/CacheObject/Views/CacheListEntryCell.cs
rename to src/CacheObject/Views/CacheListEntryCell.cs
index 27c0b46..43a92af 100644
--- a/src/UI/CacheObject/Views/CacheListEntryCell.cs
+++ b/src/CacheObject/Views/CacheListEntryCell.cs
@@ -4,9 +4,9 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.CacheObject.IValues;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class CacheListEntryCell : CacheObjectCell
     {
diff --git a/src/UI/CacheObject/Views/CacheMemberCell.cs b/src/CacheObject/Views/CacheMemberCell.cs
similarity index 96%
rename from src/UI/CacheObject/Views/CacheMemberCell.cs
rename to src/CacheObject/Views/CacheMemberCell.cs
index 5c3e9b1..7710a85 100644
--- a/src/UI/CacheObject/Views/CacheMemberCell.cs
+++ b/src/CacheObject/Views/CacheMemberCell.cs
@@ -4,9 +4,10 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class CacheMemberCell : CacheObjectCell
     {
diff --git a/src/UI/CacheObject/Views/CacheObjectCell.cs b/src/CacheObject/Views/CacheObjectCell.cs
similarity index 98%
rename from src/UI/CacheObject/Views/CacheObjectCell.cs
rename to src/CacheObject/Views/CacheObjectCell.cs
index d247549..147b2b1 100644
--- a/src/UI/CacheObject/Views/CacheObjectCell.cs
+++ b/src/CacheObject/Views/CacheObjectCell.cs
@@ -4,11 +4,12 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.CacheObject.IValues;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject.IValues;
+using UnityExplorer.Inspectors;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public abstract class CacheObjectCell : ICell
     {
diff --git a/src/UI/CacheObject/Views/EvaluateWidget.cs b/src/CacheObject/Views/EvaluateWidget.cs
similarity index 99%
rename from src/UI/CacheObject/Views/EvaluateWidget.cs
rename to src/CacheObject/Views/EvaluateWidget.cs
index f0aa36e..0e08f7d 100644
--- a/src/UI/CacheObject/Views/EvaluateWidget.cs
+++ b/src/CacheObject/Views/EvaluateWidget.cs
@@ -5,10 +5,11 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
-namespace UnityExplorer.UI.CacheObject.Views
+namespace UnityExplorer.CacheObject.Views
 {
     public class EvaluateWidget : IPooledObject
     {
diff --git a/src/Core/Tests/TestClass.cs b/src/Core/Tests/TestClass.cs
index de19d53..40a0fa4 100644
--- a/src/Core/Tests/TestClass.cs
+++ b/src/Core/Tests/TestClass.cs
@@ -6,7 +6,7 @@ using System.Reflection;
 using System.Text;
 using UnityEngine;
 using UnityExplorer.UI;
-using UnityExplorer.UI.CacheObject.IValues;
+using UnityExplorer.CacheObject.IValues;
 #if CPP
 using UnhollowerRuntimeLib;
 using UnhollowerBaseLib;
diff --git a/src/ExplorerCore.cs b/src/ExplorerCore.cs
index 68140af..d75ad2f 100644
--- a/src/ExplorerCore.cs
+++ b/src/ExplorerCore.cs
@@ -11,8 +11,8 @@ using UnityExplorer.Core.Input;
 using UnityExplorer.Core.Runtime;
 using UnityExplorer.Tests;
 using UnityExplorer.UI;
-using UnityExplorer.UI.Inspectors;
-using UnityExplorer.UI.ObjectExplorer;
+using UnityExplorer.Inspectors;
+using UnityExplorer.ObjectExplorer;
 using UnityExplorer.UI.Panels;
 
 namespace UnityExplorer
diff --git a/src/UI/Inspectors/GameObjectInspector.cs b/src/Inspectors/GameObjectInspector.cs
similarity index 99%
rename from src/UI/Inspectors/GameObjectInspector.cs
rename to src/Inspectors/GameObjectInspector.cs
index f28b4fc..e12677f 100644
--- a/src/UI/Inspectors/GameObjectInspector.cs
+++ b/src/Inspectors/GameObjectInspector.cs
@@ -6,12 +6,13 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Input;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class GameObjectInspector : InspectorBase
     {
diff --git a/src/UI/Inspectors/GameObjectWidgets/ComponentCell.cs b/src/Inspectors/GameObjectWidgets/ComponentCell.cs
similarity index 96%
rename from src/UI/Inspectors/GameObjectWidgets/ComponentCell.cs
rename to src/Inspectors/GameObjectWidgets/ComponentCell.cs
index 59ef68d..d0f774a 100644
--- a/src/UI/Inspectors/GameObjectWidgets/ComponentCell.cs
+++ b/src/Inspectors/GameObjectWidgets/ComponentCell.cs
@@ -4,9 +4,10 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class ComponentCell : ButtonCell
     {
diff --git a/src/UI/Inspectors/GameObjectWidgets/ComponentList.cs b/src/Inspectors/GameObjectWidgets/ComponentList.cs
similarity index 99%
rename from src/UI/Inspectors/GameObjectWidgets/ComponentList.cs
rename to src/Inspectors/GameObjectWidgets/ComponentList.cs
index e9b9f08..473bd9c 100644
--- a/src/UI/Inspectors/GameObjectWidgets/ComponentList.cs
+++ b/src/Inspectors/GameObjectWidgets/ComponentList.cs
@@ -5,7 +5,7 @@ using System.Text;
 using UnityEngine;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class ComponentList : ButtonListHandler<Component, ComponentCell>
     {
diff --git a/src/UI/Inspectors/GameObjectWidgets/GameObjectControls.cs b/src/Inspectors/GameObjectWidgets/GameObjectControls.cs
similarity index 99%
rename from src/UI/Inspectors/GameObjectWidgets/GameObjectControls.cs
rename to src/Inspectors/GameObjectWidgets/GameObjectControls.cs
index be2d1b2..2b0c184 100644
--- a/src/UI/Inspectors/GameObjectWidgets/GameObjectControls.cs
+++ b/src/Inspectors/GameObjectWidgets/GameObjectControls.cs
@@ -5,8 +5,9 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Input;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class GameObjectControls
     {
@@ -234,7 +235,7 @@ namespace UnityExplorer.UI.Inspectors
 
         private void OnExploreButtonClicked()
         {
-            var panel = UIManager.GetPanel<Panels.ObjectExplorerPanel>(UIManager.Panels.ObjectExplorer);
+            var panel = UIManager.GetPanel<UI.Panels.ObjectExplorerPanel>(UIManager.Panels.ObjectExplorer);
             panel.SceneExplorer.JumpToTransform(this.Parent.GOTarget.transform);
         }
 
diff --git a/src/UI/Inspectors/InspectUnderMouse.cs b/src/Inspectors/InspectUnderMouse.cs
similarity index 99%
rename from src/UI/Inspectors/InspectUnderMouse.cs
rename to src/Inspectors/InspectUnderMouse.cs
index aa4550a..09cdc1c 100644
--- a/src/UI/Inspectors/InspectUnderMouse.cs
+++ b/src/Inspectors/InspectUnderMouse.cs
@@ -11,7 +11,7 @@ using UnityExplorer.Core.Runtime;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Panels;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public enum MouseInspectMode
     {
diff --git a/src/UI/Inspectors/InspectorBase.cs b/src/Inspectors/InspectorBase.cs
similarity index 96%
rename from src/UI/Inspectors/InspectorBase.cs
rename to src/Inspectors/InspectorBase.cs
index 8623f5c..5d59ff5 100644
--- a/src/UI/Inspectors/InspectorBase.cs
+++ b/src/Inspectors/InspectorBase.cs
@@ -4,10 +4,11 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public abstract class InspectorBase : IPooledObject
     {
diff --git a/src/UI/Inspectors/InspectorManager.cs b/src/Inspectors/InspectorManager.cs
similarity index 98%
rename from src/UI/Inspectors/InspectorManager.cs
rename to src/Inspectors/InspectorManager.cs
index fa403b0..4ffd46d 100644
--- a/src/UI/Inspectors/InspectorManager.cs
+++ b/src/Inspectors/InspectorManager.cs
@@ -5,8 +5,8 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.UI;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CacheObject;
+using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 
diff --git a/src/UI/Inspectors/InspectorTab.cs b/src/Inspectors/InspectorTab.cs
similarity index 97%
rename from src/UI/Inspectors/InspectorTab.cs
rename to src/Inspectors/InspectorTab.cs
index 16fc418..e900a04 100644
--- a/src/UI/Inspectors/InspectorTab.cs
+++ b/src/Inspectors/InspectorTab.cs
@@ -4,10 +4,11 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class InspectorTab : IPooledObject
     {
diff --git a/src/UI/Inspectors/ReflectionInspector.cs b/src/Inspectors/ReflectionInspector.cs
similarity index 99%
rename from src/UI/Inspectors/ReflectionInspector.cs
rename to src/Inspectors/ReflectionInspector.cs
index fd9817e..829122d 100644
--- a/src/UI/Inspectors/ReflectionInspector.cs
+++ b/src/Inspectors/ReflectionInspector.cs
@@ -10,12 +10,13 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Runtime;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
+using UnityExplorer.UI;
 
-namespace UnityExplorer.UI.Inspectors
+namespace UnityExplorer.Inspectors
 {
     public class ReflectionInspector : InspectorBase, ICellPoolDataSource<CacheMemberCell>, ICacheObjectController
     {
diff --git a/src/UI/ObjectExplorer/ObjectSearch.cs b/src/ObjectExplorer/ObjectSearch.cs
similarity index 99%
rename from src/UI/ObjectExplorer/ObjectSearch.cs
rename to src/ObjectExplorer/ObjectSearch.cs
index d67b24d..202e169 100644
--- a/src/UI/ObjectExplorer/ObjectSearch.cs
+++ b/src/ObjectExplorer/ObjectSearch.cs
@@ -4,12 +4,13 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 using UnityExplorer.UI.Widgets.AutoComplete;
 
-namespace UnityExplorer.UI.ObjectExplorer
+namespace UnityExplorer.ObjectExplorer
 {
     public class ObjectSearch : UIModel
     {
diff --git a/src/UI/ObjectExplorer/SceneExplorer.cs b/src/ObjectExplorer/SceneExplorer.cs
similarity index 99%
rename from src/UI/ObjectExplorer/SceneExplorer.cs
rename to src/ObjectExplorer/SceneExplorer.cs
index 1f2e947..6ea9eb0 100644
--- a/src/UI/ObjectExplorer/SceneExplorer.cs
+++ b/src/ObjectExplorer/SceneExplorer.cs
@@ -8,11 +8,12 @@ using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.UI;
 using UnityExplorer.Core;
+using UnityExplorer.UI;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
 
-namespace UnityExplorer.UI.ObjectExplorer
+namespace UnityExplorer.ObjectExplorer
 {
     public class SceneExplorer : UIModel
     {
diff --git a/src/UI/ObjectExplorer/SceneHandler.cs b/src/ObjectExplorer/SceneHandler.cs
similarity index 99%
rename from src/UI/ObjectExplorer/SceneHandler.cs
rename to src/ObjectExplorer/SceneHandler.cs
index 1b79a2b..7768ec6 100644
--- a/src/UI/ObjectExplorer/SceneHandler.cs
+++ b/src/ObjectExplorer/SceneHandler.cs
@@ -6,7 +6,7 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 
-namespace UnityExplorer.UI.ObjectExplorer
+namespace UnityExplorer.ObjectExplorer
 {
     public static class SceneHandler
     {
diff --git a/src/UI/ObjectExplorer/SearchProvider.cs b/src/ObjectExplorer/SearchProvider.cs
similarity index 99%
rename from src/UI/ObjectExplorer/SearchProvider.cs
rename to src/ObjectExplorer/SearchProvider.cs
index 17e2ef3..ce8b7e1 100644
--- a/src/UI/ObjectExplorer/SearchProvider.cs
+++ b/src/ObjectExplorer/SearchProvider.cs
@@ -8,7 +8,7 @@ using UnityEngine.SceneManagement;
 using UnityExplorer.Core;
 using UnityExplorer.Core.Runtime;
 
-namespace UnityExplorer.UI.ObjectExplorer
+namespace UnityExplorer.ObjectExplorer
 {
     public enum SearchContext
     {
diff --git a/src/UI/Panels/CSConsolePanel.cs b/src/UI/Panels/CSConsolePanel.cs
index bf39579..51d98d1 100644
--- a/src/UI/Panels/CSConsolePanel.cs
+++ b/src/UI/Panels/CSConsolePanel.cs
@@ -7,7 +7,7 @@ using UnityEngine;
 using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.CSConsole;
+using UnityExplorer.CSConsole;
 using UnityExplorer.UI.Widgets;
 
 namespace UnityExplorer.UI.Panels
diff --git a/src/UI/Panels/InspectorPanel.cs b/src/UI/Panels/InspectorPanel.cs
index 93a07a2..4cfca70 100644
--- a/src/UI/Panels/InspectorPanel.cs
+++ b/src/UI/Panels/InspectorPanel.cs
@@ -6,7 +6,7 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 
 namespace UnityExplorer.UI.Panels
 {
diff --git a/src/UI/Panels/ObjectExplorerPanel.cs b/src/UI/Panels/ObjectExplorerPanel.cs
index c37ded0..2ab8749 100644
--- a/src/UI/Panels/ObjectExplorerPanel.cs
+++ b/src/UI/Panels/ObjectExplorerPanel.cs
@@ -11,7 +11,7 @@ using UnityEngine.UI;
 using UnityExplorer.Core;
 using UnityExplorer.Core.Config;
 using UnityExplorer.UI.Models;
-using UnityExplorer.UI.ObjectExplorer;
+using UnityExplorer.ObjectExplorer;
 using UnityExplorer.UI.Widgets;
 
 namespace UnityExplorer.UI.Panels
diff --git a/src/UI/Panels/OptionsPanel.cs b/src/UI/Panels/OptionsPanel.cs
index a0bf3b0..60f34f3 100644
--- a/src/UI/Panels/OptionsPanel.cs
+++ b/src/UI/Panels/OptionsPanel.cs
@@ -5,8 +5,8 @@ using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
-using UnityExplorer.UI.CacheObject;
-using UnityExplorer.UI.CacheObject.Views;
+using UnityExplorer.CacheObject;
+using UnityExplorer.CacheObject.Views;
 using UnityExplorer.UI.Widgets;
 
 namespace UnityExplorer.UI.Panels
diff --git a/src/UI/UIManager.cs b/src/UI/UIManager.cs
index 2e172b8..b0b0175 100644
--- a/src/UI/UIManager.cs
+++ b/src/UI/UIManager.cs
@@ -8,8 +8,8 @@ using UnityEngine.EventSystems;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Input;
-using UnityExplorer.UI.CSConsole;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.CSConsole;
+using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Models;
 using UnityExplorer.UI.Panels;
 using UnityExplorer.UI.Widgets;
diff --git a/src/UI/Widgets/TransformTree/TransformCell.cs b/src/UI/Widgets/TransformTree/TransformCell.cs
index c15bba2..8b69e40 100644
--- a/src/UI/Widgets/TransformTree/TransformCell.cs
+++ b/src/UI/Widgets/TransformTree/TransformCell.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using UnityEngine;
 using UnityEngine.UI;
-using UnityExplorer.UI.Inspectors;
+using UnityExplorer.Inspectors;
 using UnityExplorer.UI.Widgets;
 
 namespace UnityExplorer.UI.Widgets
diff --git a/src/UnityExplorer.csproj b/src/UnityExplorer.csproj
index 1360319..4dfb13e 100644
--- a/src/UnityExplorer.csproj
+++ b/src/UnityExplorer.csproj
@@ -143,12 +143,12 @@
     </Reference>
   </ItemGroup>
   <!-- BepInEx universal refs -->
-    <ItemGroup Condition="'$(IsBepInEx)'=='true'">
-        <Reference Include="0Harmony">
-            <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
-            <Private>False</Private>
-        </Reference>
-    </ItemGroup>
+  <ItemGroup Condition="'$(IsBepInEx)'=='true'">
+    <Reference Include="0Harmony">
+      <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <!-- BepInEx 5 Mono refs -->
   <ItemGroup Condition="'$(IsBepInEx)|$(IsCpp)|$(Configuration)'=='true|false|Release_BIE5_Mono'">
     <Reference Include="BepInEx">
@@ -180,10 +180,10 @@
   </ItemGroup>
   <!-- Standalone refs -->
   <ItemGroup Condition="'$(IsStandalone)'=='true'">
-      <Reference Include="0Harmony">
-          <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
-          <Private>False</Private>
-      </Reference>
+    <Reference Include="0Harmony">
+      <HintPath>packages\HarmonyX.2.4.2\lib\net35\0Harmony.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <!-- Mono refs -->
   <ItemGroup Condition="'$(IsCpp)'=='false'">
@@ -241,54 +241,54 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Core\Config\InternalConfigHandler.cs" />
-    <Compile Include="UI\CacheObject\CacheConfigEntry.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheConfigCell.cs" />
-    <Compile Include="UI\CSConsole\CSAutoCompleter.cs" />
-    <Compile Include="UI\CSConsole\LexerBuilder.cs" />
-    <Compile Include="UI\CSConsole\Lexers\CommentLexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\KeywordLexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\Lexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\NumberLexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\StringLexer.cs" />
-    <Compile Include="UI\CSConsole\Lexers\SymbolLexer.cs" />
-    <Compile Include="UI\CSConsole\ScriptEvaluator.cs" />
-    <Compile Include="UI\CSConsole\ScriptInteraction.cs" />
+    <Compile Include="CacheObject\CacheConfigEntry.cs" />
+    <Compile Include="CacheObject\Views\CacheConfigCell.cs" />
+    <Compile Include="CSConsole\CSAutoCompleter.cs" />
+    <Compile Include="CSConsole\LexerBuilder.cs" />
+    <Compile Include="CSConsole\Lexers\CommentLexer.cs" />
+    <Compile Include="CSConsole\Lexers\KeywordLexer.cs" />
+    <Compile Include="CSConsole\Lexers\Lexer.cs" />
+    <Compile Include="CSConsole\Lexers\NumberLexer.cs" />
+    <Compile Include="CSConsole\Lexers\StringLexer.cs" />
+    <Compile Include="CSConsole\Lexers\SymbolLexer.cs" />
+    <Compile Include="CSConsole\ScriptEvaluator.cs" />
+    <Compile Include="CSConsole\ScriptInteraction.cs" />
     <Compile Include="Core\ExplorerBehaviour.cs" />
     <Compile Include="Core\Reflection\Extensions.cs" />
     <Compile Include="Core\Reflection\Il2CppReflection.cs" />
     <Compile Include="Core\Utility\ArgumentUtility.cs" />
     <Compile Include="Core\Utility\MiscUtility.cs" />
     <Compile Include="Core\Utility\ParseUtility.cs" />
-    <Compile Include="UI\Inspectors\GameObjectWidgets\ComponentCell.cs" />
-    <Compile Include="UI\Inspectors\GameObjectWidgets\ComponentList.cs" />
-    <Compile Include="UI\Inspectors\GameObjectWidgets\GameObjectControls.cs" />
-    <Compile Include="UI\Inspectors\InspectUnderMouse.cs" />
-    <Compile Include="UI\CSConsole\ConsoleController.cs" />
-    <Compile Include="UI\CacheObject\CacheField.cs" />
-    <Compile Include="UI\CacheObject\CacheKeyValuePair.cs" />
-    <Compile Include="UI\CacheObject\CacheListEntry.cs" />
-    <Compile Include="UI\CacheObject\CacheMember.cs" />
-    <Compile Include="UI\CacheObject\CacheMethod.cs" />
-    <Compile Include="UI\CacheObject\CacheObjectBase.cs" />
-    <Compile Include="UI\CacheObject\CacheProperty.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheKeyValuePairCell.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheListEntryCell.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheMemberCell.cs" />
-    <Compile Include="UI\CacheObject\Views\CacheObjectCell.cs" />
-    <Compile Include="UI\CacheObject\Views\EvaluateWidget.cs" />
-    <Compile Include="UI\Inspectors\GameObjectInspector.cs" />
-    <Compile Include="UI\CacheObject\ICacheObjectController.cs" />
-    <Compile Include="UI\Inspectors\InspectorManager.cs" />
-    <Compile Include="UI\Inspectors\InspectorTab.cs" />
-    <Compile Include="UI\Inspectors\InspectorBase.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveColor.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveDictionary.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveEnum.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveList.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveString.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveValue.cs" />
-    <Compile Include="UI\Inspectors\ReflectionInspector.cs" />
-    <Compile Include="UI\CacheObject\IValues\InteractiveValueStruct.cs" />
+    <Compile Include="Inspectors\GameObjectWidgets\ComponentCell.cs" />
+    <Compile Include="Inspectors\GameObjectWidgets\ComponentList.cs" />
+    <Compile Include="Inspectors\GameObjectWidgets\GameObjectControls.cs" />
+    <Compile Include="Inspectors\InspectUnderMouse.cs" />
+    <Compile Include="CSConsole\ConsoleController.cs" />
+    <Compile Include="CacheObject\CacheField.cs" />
+    <Compile Include="CacheObject\CacheKeyValuePair.cs" />
+    <Compile Include="CacheObject\CacheListEntry.cs" />
+    <Compile Include="CacheObject\CacheMember.cs" />
+    <Compile Include="CacheObject\CacheMethod.cs" />
+    <Compile Include="CacheObject\CacheObjectBase.cs" />
+    <Compile Include="CacheObject\CacheProperty.cs" />
+    <Compile Include="CacheObject\Views\CacheKeyValuePairCell.cs" />
+    <Compile Include="CacheObject\Views\CacheListEntryCell.cs" />
+    <Compile Include="CacheObject\Views\CacheMemberCell.cs" />
+    <Compile Include="CacheObject\Views\CacheObjectCell.cs" />
+    <Compile Include="CacheObject\Views\EvaluateWidget.cs" />
+    <Compile Include="Inspectors\GameObjectInspector.cs" />
+    <Compile Include="CacheObject\ICacheObjectController.cs" />
+    <Compile Include="Inspectors\InspectorManager.cs" />
+    <Compile Include="Inspectors\InspectorTab.cs" />
+    <Compile Include="Inspectors\InspectorBase.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveColor.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveDictionary.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveEnum.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveList.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveString.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveValue.cs" />
+    <Compile Include="Inspectors\ReflectionInspector.cs" />
+    <Compile Include="CacheObject\IValues\InteractiveValueStruct.cs" />
     <Compile Include="UI\Models\InputFieldRef.cs" />
     <Compile Include="UI\Pool.cs" />
     <Compile Include="UI\Panels\LogPanel.cs" />
@@ -318,8 +318,8 @@
     <Compile Include="Core\Runtime\RuntimeContext.cs" />
     <Compile Include="Core\Runtime\RuntimeProvider.cs" />
     <Compile Include="Core\Runtime\TextureUtilProvider.cs" />
-    <Compile Include="UI\ObjectExplorer\SceneHandler.cs" />
-    <Compile Include="UI\ObjectExplorer\SearchProvider.cs" />
+    <Compile Include="ObjectExplorer\SceneHandler.cs" />
+    <Compile Include="ObjectExplorer\SearchProvider.cs" />
     <Compile Include="Core\Tests\TestClass.cs" />
     <Compile Include="Core\Utility\UnityHelpers.cs" />
     <Compile Include="ExplorerCore.cs" />
@@ -344,8 +344,8 @@
     <Compile Include="UI\Widgets\AutoComplete\AutoCompleteModal.cs" />
     <Compile Include="UI\Widgets\AutoComplete\TypeCompleter.cs" />
     <Compile Include="UI\Models\ButtonRef.cs" />
-    <Compile Include="UI\ObjectExplorer\ObjectSearch.cs" />
-    <Compile Include="UI\ObjectExplorer\SceneExplorer.cs" />
+    <Compile Include="ObjectExplorer\ObjectSearch.cs" />
+    <Compile Include="ObjectExplorer\SceneExplorer.cs" />
     <Compile Include="UI\Widgets\ScrollPool\DataHeightCache.cs" />
     <Compile Include="UI\Widgets\ScrollPool\ICell.cs" />
     <Compile Include="UI\Widgets\ScrollPool\ICellPoolDataSource.cs" />