diff --git a/README.md b/README.md
index 6ccdfba..f932584 100644
--- a/README.md
+++ b/README.md
@@ -133,4 +133,4 @@ Written by Sinai.
 This project uses code from:
 * (GPL) [ManlyMarco](https://github.com/ManlyMarco)'s [Runtime Unity Editor](https://github.com/ManlyMarco/RuntimeUnityEditor), which I used for some aspects of the C# Console and Auto-Complete features. The snippets I used are indicated with a comment.
 * (MIT) [denikson](https://github.com/denikson) (aka Horse)'s [mcs-unity](https://github.com/denikson/mcs-unity). I commented out the `SkipVisibilityExt` constructor since it was causing an exception with the Hook it attempted in IL2CPP.
-* (Apache) [InGameCodeEditor](https://assetstore.unity.com/packages/tools/gui/ingame-code-editor-144254) was used as the base for the syntax highlighting for UnityExplorer's C# console, although it has been heavily rewritten and optimized. Used classes are in the `UnityExplorer.CSConsole.Lexer` namespace.
+* (Apache) [InGameCodeEditor](https://assetstore.unity.com/packages/tools/gui/ingame-code-editor-144254) was used as the base for the syntax highlighting for UnityExplorer's C# console, although it has been heavily rewritten and optimized. Used classes are in the `UnityExplorer.UI.Main.CSConsole.Lexer` namespace.
diff --git a/src/Core/CSharp/ScriptInteraction.cs b/src/Core/CSharp/ScriptInteraction.cs
index 142eb74..5172520 100644
--- a/src/Core/CSharp/ScriptInteraction.cs
+++ b/src/Core/CSharp/ScriptInteraction.cs
@@ -3,6 +3,7 @@ using Mono.CSharp;
 using UnityExplorer.UI;
 using UnityExplorer.UI.Main;
 using UnityExplorer.Core.Inspectors;
+using UnityExplorer.UI.Main.CSConsole;
 
 namespace UnityExplorer.Core.CSharp
 {
diff --git a/src/Core/CSharp/Suggestion.cs b/src/Core/CSharp/Suggestion.cs
index bc27568..7875f47 100644
--- a/src/Core/CSharp/Suggestion.cs
+++ b/src/Core/CSharp/Suggestion.cs
@@ -5,7 +5,7 @@ using System.Reflection;
 using UnityEngine;
 using UnityExplorer.Core;
 using UnityExplorer.Core.Unity;
-using UnityExplorer.UI.CSConsole;
+using UnityExplorer.UI.Main.CSConsole;
 
 namespace UnityExplorer.Core.CSharp
 {
diff --git a/src/UI/Main/CSConsole/AutoCompleter.cs b/src/UI/Main/CSConsole/AutoCompleter.cs
index 75dc16d..633a60a 100644
--- a/src/UI/Main/CSConsole/AutoCompleter.cs
+++ b/src/UI/Main/CSConsole/AutoCompleter.cs
@@ -7,7 +7,6 @@ using UnityEngine.UI;
 using UnityExplorer.Core.CSharp;
 using UnityExplorer.Core.Unity;
 using UnityExplorer.UI;
-using UnityExplorer.UI.CSConsole;
 using UnityExplorer.UI.Main;
 
 namespace UnityExplorer.UI.Main.CSConsole
diff --git a/src/UI/Main/CSConsole/CSLexerHighlighter.cs b/src/UI/Main/CSConsole/CSLexerHighlighter.cs
index 4545b61..e591268 100644
--- a/src/UI/Main/CSConsole/CSLexerHighlighter.cs
+++ b/src/UI/Main/CSConsole/CSLexerHighlighter.cs
@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
-using UnityExplorer.UI.CSConsole.Lexer;
+using UnityExplorer.UI.Main.CSConsole.Lexer;
 
-namespace UnityExplorer.UI.CSConsole
+namespace UnityExplorer.UI.Main.CSConsole
 {
     public struct LexerMatchInfo
     {
diff --git a/src/UI/Main/CSConsole/CSharpConsole.cs b/src/UI/Main/CSConsole/CSharpConsole.cs
index c2c24ff..a91392a 100644
--- a/src/UI/Main/CSConsole/CSharpConsole.cs
+++ b/src/UI/Main/CSConsole/CSharpConsole.cs
@@ -4,7 +4,6 @@ using System.IO;
 using System.Reflection;
 using System.Text;
 using UnityExplorer.Core.CSharp;
-using UnityExplorer.UI.CSConsole;
 using System.Linq;
 using UnityExplorer.Core.Input;
 using UnityEngine;
@@ -14,7 +13,7 @@ using UnityExplorer.UI.Reusable;
 using UnityExplorer.UI.Main.CSConsole;
 using UnityExplorer.Core;
 
-namespace UnityExplorer.UI.Main
+namespace UnityExplorer.UI.Main.CSConsole
 {
     public class CSharpConsole : BaseMenuPage
     {
diff --git a/src/UI/Main/CSConsole/Lexer/CommentMatch.cs b/src/UI/Main/CSConsole/Lexer/CommentMatch.cs
index 2673705..35fac37 100644
--- a/src/UI/Main/CSConsole/Lexer/CommentMatch.cs
+++ b/src/UI/Main/CSConsole/Lexer/CommentMatch.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public class CommentMatch : Matcher
     {
diff --git a/src/UI/Main/CSConsole/Lexer/KeywordMatch.cs b/src/UI/Main/CSConsole/Lexer/KeywordMatch.cs
index 3046c8a..e4230b7 100644
--- a/src/UI/Main/CSConsole/Lexer/KeywordMatch.cs
+++ b/src/UI/Main/CSConsole/Lexer/KeywordMatch.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     // I use two different KeywordMatch instances (valid and invalid).
     // This class just contains common implementations.
diff --git a/src/UI/Main/CSConsole/Lexer/Matcher.cs b/src/UI/Main/CSConsole/Lexer/Matcher.cs
index ab1fbf5..0b5b53f 100644
--- a/src/UI/Main/CSConsole/Lexer/Matcher.cs
+++ b/src/UI/Main/CSConsole/Lexer/Matcher.cs
@@ -3,7 +3,7 @@ using UnityEngine;
 using System.Linq;
 using UnityExplorer.Core.Unity;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public abstract class Matcher
     {
diff --git a/src/UI/Main/CSConsole/Lexer/NumberMatch.cs b/src/UI/Main/CSConsole/Lexer/NumberMatch.cs
index c831180..75b352d 100644
--- a/src/UI/Main/CSConsole/Lexer/NumberMatch.cs
+++ b/src/UI/Main/CSConsole/Lexer/NumberMatch.cs
@@ -1,6 +1,6 @@
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public class NumberMatch : Matcher
     {
diff --git a/src/UI/Main/CSConsole/Lexer/StringMatch.cs b/src/UI/Main/CSConsole/Lexer/StringMatch.cs
index 070f061..8712ea3 100644
--- a/src/UI/Main/CSConsole/Lexer/StringMatch.cs
+++ b/src/UI/Main/CSConsole/Lexer/StringMatch.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public class StringMatch : Matcher
     {
diff --git a/src/UI/Main/CSConsole/Lexer/SymbolMatch.cs b/src/UI/Main/CSConsole/Lexer/SymbolMatch.cs
index ed63efa..9ba817b 100644
--- a/src/UI/Main/CSConsole/Lexer/SymbolMatch.cs
+++ b/src/UI/Main/CSConsole/Lexer/SymbolMatch.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace UnityExplorer.UI.CSConsole.Lexer
+namespace UnityExplorer.UI.Main.CSConsole.Lexer
 {
     public class SymbolMatch : Matcher
     {
diff --git a/src/UI/Main/MainMenu.cs b/src/UI/Main/MainMenu.cs
index 8e0fd14..598150e 100644
--- a/src/UI/Main/MainMenu.cs
+++ b/src/UI/Main/MainMenu.cs
@@ -5,7 +5,6 @@ using UnityEngine;
 using UnityEngine.UI;
 using UnityExplorer.Core.Config;
 using UnityExplorer.Core.Unity;
-using UnityExplorer.UI.CSConsole;
 using UnityExplorer.UI.Main;
 using UnityExplorer.UI.Main.CSConsole;