diff --git a/RecrownedAthenaeum/Data/SkinData.cs b/RecrownedAthenaeum/Data/SkinData.cs
index 283a619..a7ee0e5 100644
--- a/RecrownedAthenaeum/Data/SkinData.cs
+++ b/RecrownedAthenaeum/Data/SkinData.cs
@@ -1,5 +1,5 @@
 using Microsoft.Xna.Framework;
-using RecrownedAthenaeum.UI.Skin.Definitions;
+using RecrownedAthenaeum.UI.SkinSystem.Definitions;
 
 namespace RecrownedAthenaeum.Data
 {
diff --git a/RecrownedAthenaeum/RecrownedAthenaeum.csproj b/RecrownedAthenaeum/RecrownedAthenaeum.csproj
index c9cbbbf..eba74bc 100644
--- a/RecrownedAthenaeum/RecrownedAthenaeum.csproj
+++ b/RecrownedAthenaeum/RecrownedAthenaeum.csproj
@@ -77,23 +77,23 @@
     <Compile Include="ScreenSystem\LoadingScreen.cs" />
     <Compile Include="ScreenSystem\Screen.cs" />
     <Compile Include="ScreenSystem\ScreenManager.cs" />
-    <Compile Include="UI\Book\Book.cs" />
-    <Compile Include="UI\Book\Page.cs" />
+    <Compile Include="UI\BookSystem\Book.cs" />
+    <Compile Include="UI\BookSystem\Page.cs" />
     <Compile Include="UI\Modular\Modules\Image.cs" />
     <Compile Include="UI\Modular\Modules\Interactive\Button.cs" />
     <Compile Include="UI\Modular\Modules\Interactive\TextButton.cs" />
     <Compile Include="UI\Modular\Modules\Text.cs" />
     <Compile Include="UI\Modular\UIModule.cs" />
     <Compile Include="UI\Modular\UIModuleGroup.cs" />
-    <Compile Include="UI\Skin\Definitions\ButtonSkinDefinition.cs" />
-    <Compile Include="UI\Skin\Definitions\ISkinDefinition.cs" />
-    <Compile Include="UI\Skin\Definitions\TextButtonSkinDefinition.cs" />
-    <Compile Include="UI\Skin\Definitions\TextSkinDefinition.cs" />
-    <Compile Include="UI\Skin\ISkin.cs" />
-    <Compile Include="UI\Skin\Skin.cs" />
+    <Compile Include="UI\SkinSystem\Definitions\ButtonSkinDefinition.cs" />
+    <Compile Include="UI\SkinSystem\Definitions\ISkinDefinition.cs" />
+    <Compile Include="UI\SkinSystem\Definitions\TextButtonSkinDefinition.cs" />
+    <Compile Include="UI\SkinSystem\Definitions\TextSkinDefinition.cs" />
+    <Compile Include="UI\SkinSystem\ISkin.cs" />
+    <Compile Include="UI\SkinSystem\Skin.cs" />
     <Compile Include="Data\SkinData.cs" />
-    <Compile Include="UI\Skin\SkinManager.cs" />
-    <Compile Include="UI\Skin\MergedSkin.cs" />
+    <Compile Include="UI\SkinSystem\SkinManager.cs" />
+    <Compile Include="UI\SkinSystem\MergedSkin.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
diff --git a/RecrownedAthenaeum/UI/Book/Book.cs b/RecrownedAthenaeum/UI/BookSystem/Book.cs
similarity index 99%
rename from RecrownedAthenaeum/UI/Book/Book.cs
rename to RecrownedAthenaeum/UI/BookSystem/Book.cs
index 071b54d..af5945c 100644
--- a/RecrownedAthenaeum/UI/Book/Book.cs
+++ b/RecrownedAthenaeum/UI/BookSystem/Book.cs
@@ -5,7 +5,7 @@ using RecrownedAthenaeum.ContentSystem;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace RecrownedAthenaeum.UI.Book
+namespace RecrownedAthenaeum.UI.BookSystem
 {
     /// <summary>
     /// Contains the pages.
diff --git a/RecrownedAthenaeum/UI/Book/Page.cs b/RecrownedAthenaeum/UI/BookSystem/Page.cs
similarity index 97%
rename from RecrownedAthenaeum/UI/Book/Page.cs
rename to RecrownedAthenaeum/UI/BookSystem/Page.cs
index 488f244..5f05608 100644
--- a/RecrownedAthenaeum/UI/Book/Page.cs
+++ b/RecrownedAthenaeum/UI/BookSystem/Page.cs
@@ -1,7 +1,7 @@
 using RecrownedAthenaeum.ContentSystem;
 using RecrownedAthenaeum.UI.Modular;
 
-namespace RecrownedAthenaeum.UI.Book
+namespace RecrownedAthenaeum.UI.BookSystem
 {
     /// <summary>
     /// A page a part of a <see cref="Book"/>.
diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs
index d5d35a9..2f5e4b2 100644
--- a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs
+++ b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/Button.cs
@@ -2,7 +2,7 @@
 using Microsoft.Xna.Framework.Input;
 using RecrownedAthenaeum.SpecialTypes;
 using RecrownedAthenaeum.Input;
-using RecrownedAthenaeum.UI.Skin.Definitions;
+using RecrownedAthenaeum.UI.SkinSystem.Definitions;
 
 namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive
 {
@@ -53,7 +53,7 @@ namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive
         /// </summary>
         /// <param name="skin">The skin containing the information of the textures and design to follow.</param>
         /// <param name="definitionName">The name of the definition in the skin. Can be null to select the default.</param>
-        public Button(Skin.Skin skin, string definitionName = null)
+        public Button(SkinSystem.Skin skin, string definitionName = null)
         {
             skinDefinition = skin.ObtainDefinition<ButtonSkinDefinition>(definitionName, GetType());
             downTexture = skin.GetTextureAtlasRegion(skinDefinition.downRegion);
diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs
index 9ea7bad..a1417e3 100644
--- a/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs
+++ b/RecrownedAthenaeum/UI/Modular/Modules/Interactive/TextButton.cs
@@ -1,7 +1,7 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.SpecialTypes;
-using RecrownedAthenaeum.UI.Skin.Definitions;
+using RecrownedAthenaeum.UI.SkinSystem.Definitions;
 
 namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive
 {
@@ -41,7 +41,7 @@ namespace RecrownedAthenaeum.UI.Modular.Modules.Interactive
         /// <param name="font">The font to be used.</param>
         /// <param name="skin">The skin to use.</param>
         /// <param name="definitionName">Name of the definition for this type in the skin given.</param>
-        public TextButton(string text, SpriteFont font, Skin.Skin skin, string definitionName = null) : base(skin, definitionName)
+        public TextButton(string text, SpriteFont font, SkinSystem.Skin skin, string definitionName = null) : base(skin, definitionName)
         {
             TextButtonSkinDefinition skinDefinition = skin.ObtainDefinition<TextButtonSkinDefinition>(definitionName, GetType());
             this.text = new Text(font, text);
diff --git a/RecrownedAthenaeum/UI/Modular/Modules/Text.cs b/RecrownedAthenaeum/UI/Modular/Modules/Text.cs
index cacd1a1..1421736 100644
--- a/RecrownedAthenaeum/UI/Modular/Modules/Text.cs
+++ b/RecrownedAthenaeum/UI/Modular/Modules/Text.cs
@@ -1,6 +1,6 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using RecrownedAthenaeum.UI.Skin.Definitions;
+using RecrownedAthenaeum.UI.SkinSystem.Definitions;
 using System.Text;
 
 namespace RecrownedAthenaeum.UI.Modular.Modules
@@ -61,7 +61,7 @@ namespace RecrownedAthenaeum.UI.Modular.Modules
         /// <param name="skinDefinitionName">The name of the skin's definition to use of a <see cref="TextSkinDefinition"/>.</param>
         /// <param name="font">The font to be used.</param>
         /// <param name="content">The string of text to be displayed.</param>
-        public Text(Skin.Skin skin, SpriteFont font, string skinDefinitionName = null, string content = null) : this(font, content)
+        public Text(SkinSystem.Skin skin, SpriteFont font, string skinDefinitionName = null, string content = null) : this(font, content)
         {
             skinDefinition = skin.ObtainDefinition<TextSkinDefinition>(skinDefinitionName, GetType());
             color = skin.GetColor(skinDefinition.color);
diff --git a/RecrownedAthenaeum/UI/Skin/Definitions/ButtonSkinDefinition.cs b/RecrownedAthenaeum/UI/SkinSystem/Definitions/ButtonSkinDefinition.cs
similarity index 94%
rename from RecrownedAthenaeum/UI/Skin/Definitions/ButtonSkinDefinition.cs
rename to RecrownedAthenaeum/UI/SkinSystem/Definitions/ButtonSkinDefinition.cs
index 821498a..416ab50 100644
--- a/RecrownedAthenaeum/UI/Skin/Definitions/ButtonSkinDefinition.cs
+++ b/RecrownedAthenaeum/UI/SkinSystem/Definitions/ButtonSkinDefinition.cs
@@ -1,7 +1,7 @@
 using RecrownedAthenaeum.UI.Modular.Modules.Interactive;
 using System;
 
-namespace RecrownedAthenaeum.UI.Skin.Definitions
+namespace RecrownedAthenaeum.UI.SkinSystem.Definitions
 {
     /// <summary>
     /// Definition for a button.
diff --git a/RecrownedAthenaeum/UI/Skin/Definitions/ISkinDefinition.cs b/RecrownedAthenaeum/UI/SkinSystem/Definitions/ISkinDefinition.cs
similarity index 86%
rename from RecrownedAthenaeum/UI/Skin/Definitions/ISkinDefinition.cs
rename to RecrownedAthenaeum/UI/SkinSystem/Definitions/ISkinDefinition.cs
index 7072be0..4c4b968 100644
--- a/RecrownedAthenaeum/UI/Skin/Definitions/ISkinDefinition.cs
+++ b/RecrownedAthenaeum/UI/SkinSystem/Definitions/ISkinDefinition.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace RecrownedAthenaeum.UI.Skin.Definitions
+namespace RecrownedAthenaeum.UI.SkinSystem.Definitions
 {
     /// <summary>
     /// A definition containing the data for the skin system. Should be in data transfer object model.
diff --git a/RecrownedAthenaeum/UI/Skin/Definitions/TextButtonSkinDefinition.cs b/RecrownedAthenaeum/UI/SkinSystem/Definitions/TextButtonSkinDefinition.cs
similarity index 94%
rename from RecrownedAthenaeum/UI/Skin/Definitions/TextButtonSkinDefinition.cs
rename to RecrownedAthenaeum/UI/SkinSystem/Definitions/TextButtonSkinDefinition.cs
index 8490d49..02fc734 100644
--- a/RecrownedAthenaeum/UI/Skin/Definitions/TextButtonSkinDefinition.cs
+++ b/RecrownedAthenaeum/UI/SkinSystem/Definitions/TextButtonSkinDefinition.cs
@@ -1,7 +1,7 @@
 using RecrownedAthenaeum.UI.Modular.Modules.Interactive;
 using System;
 
-namespace RecrownedAthenaeum.UI.Skin.Definitions
+namespace RecrownedAthenaeum.UI.SkinSystem.Definitions
 {
     /// <summary>
     /// Definition for a text button for a skin theme.
diff --git a/RecrownedAthenaeum/UI/Skin/Definitions/TextSkinDefinition.cs b/RecrownedAthenaeum/UI/SkinSystem/Definitions/TextSkinDefinition.cs
similarity index 85%
rename from RecrownedAthenaeum/UI/Skin/Definitions/TextSkinDefinition.cs
rename to RecrownedAthenaeum/UI/SkinSystem/Definitions/TextSkinDefinition.cs
index f9f3878..9591468 100644
--- a/RecrownedAthenaeum/UI/Skin/Definitions/TextSkinDefinition.cs
+++ b/RecrownedAthenaeum/UI/SkinSystem/Definitions/TextSkinDefinition.cs
@@ -1,7 +1,7 @@
 using System;
 using static System.Net.Mime.MediaTypeNames;
 
-namespace RecrownedAthenaeum.UI.Skin.Definitions
+namespace RecrownedAthenaeum.UI.SkinSystem.Definitions
 {
     class TextSkinDefinition : ISkinDefinitionData
     {
diff --git a/RecrownedAthenaeum/UI/Skin/ISkin.cs b/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs
similarity index 97%
rename from RecrownedAthenaeum/UI/Skin/ISkin.cs
rename to RecrownedAthenaeum/UI/SkinSystem/ISkin.cs
index 268bb55..1fcef87 100644
--- a/RecrownedAthenaeum/UI/Skin/ISkin.cs
+++ b/RecrownedAthenaeum/UI/SkinSystem/ISkin.cs
@@ -2,9 +2,9 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.SpecialTypes;
-using RecrownedAthenaeum.UI.Skin.Definitions;
+using RecrownedAthenaeum.UI.SkinSystem.Definitions;
 
-namespace RecrownedAthenaeum.UI.Skin
+namespace RecrownedAthenaeum.UI.SkinSystem
 {
     /// <summary>
     /// The output requirements of a skin. This allows for very customized skin systems if needed.
diff --git a/RecrownedAthenaeum/UI/Skin/MergedSkin.cs b/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs
similarity index 97%
rename from RecrownedAthenaeum/UI/Skin/MergedSkin.cs
rename to RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs
index b333335..cc7f294 100644
--- a/RecrownedAthenaeum/UI/Skin/MergedSkin.cs
+++ b/RecrownedAthenaeum/UI/SkinSystem/MergedSkin.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.SpecialTypes;
-using RecrownedAthenaeum.UI.Skin.Definitions;
+using RecrownedAthenaeum.UI.SkinSystem.Definitions;
 
-namespace RecrownedAthenaeum.UI.Skin
+namespace RecrownedAthenaeum.UI.SkinSystem
 {
     internal class MergedSkin : ISkin
     {
diff --git a/RecrownedAthenaeum/UI/Skin/Skin.cs b/RecrownedAthenaeum/UI/SkinSystem/Skin.cs
similarity index 98%
rename from RecrownedAthenaeum/UI/Skin/Skin.cs
rename to RecrownedAthenaeum/UI/SkinSystem/Skin.cs
index 63b120e..df52a4f 100644
--- a/RecrownedAthenaeum/UI/Skin/Skin.cs
+++ b/RecrownedAthenaeum/UI/SkinSystem/Skin.cs
@@ -1,11 +1,11 @@
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using RecrownedAthenaeum.SpecialTypes;
-using RecrownedAthenaeum.UI.Skin.Definitions;
+using RecrownedAthenaeum.UI.SkinSystem.Definitions;
 using System;
 using System.Collections.Generic;
 
-namespace RecrownedAthenaeum.UI.Skin
+namespace RecrownedAthenaeum.UI.SkinSystem
 {
     /// <summary>
     /// A skin is used to group a theme which can then be applied to the UI via the use of modules.
diff --git a/RecrownedAthenaeum/UI/Skin/SkinManager.cs b/RecrownedAthenaeum/UI/SkinSystem/SkinManager.cs
similarity index 99%
rename from RecrownedAthenaeum/UI/Skin/SkinManager.cs
rename to RecrownedAthenaeum/UI/SkinSystem/SkinManager.cs
index 5eada23..a3e059f 100644
--- a/RecrownedAthenaeum/UI/Skin/SkinManager.cs
+++ b/RecrownedAthenaeum/UI/SkinSystem/SkinManager.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 
-namespace RecrownedAthenaeum.UI.Skin
+namespace RecrownedAthenaeum.UI.SkinSystem
 {
     /// <summary>
     /// Called when the skin manager has completed a async action.