diff --git a/Novetus/Novetus.sln b/Novetus/Novetus.sln
index cdc1a8e..bfdd29a 100644
--- a/Novetus/Novetus.sln
+++ b/Novetus/Novetus.sln
@@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusLauncher", "NovetusLauncher\NovetusLauncher.csproj", "{F92FFBED-2767-4676-9711-BB89CDA58A43}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Launcher", "NovetusLauncher\Novetus.Launcher.csproj", "{F92FFBED-2767-4676-9711-BB89CDA58A43}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusCMD", "NovetusCMD\NovetusCMD.csproj", "{BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.CMD", "NovetusCMD\Novetus.CMD.csproj", "{BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "NovetusFuncs", "NovetusFuncs\NovetusFuncs.shproj", "{54856A61-1EE2-40C3-85AE-C54B8DE7CC30}"
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Novetus.Core", "NovetusFuncs\Novetus.Core.shproj", "{54856A61-1EE2-40C3-85AE-C54B8DE7CC30}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NovetusURI", "NovetusURI\NovetusURI.csproj", "{2070EAA6-7606-4006-A628-5705C24A3644}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.URI", "NovetusURI\Novetus.URI.csproj", "{2070EAA6-7606-4006-A628-5705C24A3644}"
 EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
diff --git a/Novetus/NovetusCMD/CommandLineArguments.cs b/Novetus/NovetusCMD/Classes/CommandLineArguments.cs
similarity index 100%
rename from Novetus/NovetusCMD/CommandLineArguments.cs
rename to Novetus/NovetusCMD/Classes/CommandLineArguments.cs
diff --git a/Novetus/NovetusCMD/LocalVars.cs b/Novetus/NovetusCMD/Classes/LocalVars.cs
similarity index 100%
rename from Novetus/NovetusCMD/LocalVars.cs
rename to Novetus/NovetusCMD/Classes/LocalVars.cs
diff --git a/Novetus/NovetusCMD/NovetusCMD.csproj b/Novetus/NovetusCMD/Novetus.CMD.csproj
similarity index 98%
rename from Novetus/NovetusCMD/NovetusCMD.csproj
rename to Novetus/NovetusCMD/Novetus.CMD.csproj
index 2a23e5c..5ff2893 100644
--- a/Novetus/NovetusCMD/NovetusCMD.csproj
+++ b/Novetus/NovetusCMD/Novetus.CMD.csproj
@@ -122,8 +122,8 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CommandLineArguments.cs" />
-    <Compile Include="LocalVars.cs" />
+    <Compile Include="Classes\CommandLineArguments.cs" />
+    <Compile Include="Classes\LocalVars.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
diff --git a/Novetus/NovetusFuncs/NovetusFuncs.shproj b/Novetus/NovetusFuncs/Novetus.Core.shproj
similarity index 100%
rename from Novetus/NovetusFuncs/NovetusFuncs.shproj
rename to Novetus/NovetusFuncs/Novetus.Core.shproj
diff --git a/Novetus/NovetusFuncs/NovetusCodeExtensions.cs b/Novetus/NovetusFuncs/NovetusCodeExtensionLibrary.cs
similarity index 99%
rename from Novetus/NovetusFuncs/NovetusCodeExtensions.cs
rename to Novetus/NovetusFuncs/NovetusCodeExtensionLibrary.cs
index c04e243..cede700 100644
--- a/Novetus/NovetusFuncs/NovetusCodeExtensions.cs
+++ b/Novetus/NovetusFuncs/NovetusCodeExtensionLibrary.cs
@@ -42,7 +42,7 @@ public static class ProcessExtensions
 }
 #endregion
 
-#region #String Extensions
+#region String Extensions
 public static class StringExtensions
 {
 	public static bool Contains(this string source, string toCheck, StringComparison comp)
diff --git a/Novetus/NovetusFuncs/NovetusFuncs.projitems b/Novetus/NovetusFuncs/NovetusFuncs.projitems
index fc79d86..6615b30 100644
--- a/Novetus/NovetusFuncs/NovetusFuncs.projitems
+++ b/Novetus/NovetusFuncs/NovetusFuncs.projitems
@@ -9,10 +9,10 @@
     <Import_RootNamespace>NovetusFuncs</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)NovetusGlobalFuncs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)NovetusScriptFuncs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)NovetusCodeExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)NovetusLauncherFuncs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)NovetusSecurityFuncs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NovetusMainLibrary.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NovetusScriptLibrary.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NovetusCodeExtensionLibrary.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NovetusLauncherLibrary.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NovetusSecurityLibrary.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Novetus/NovetusFuncs/NovetusLauncherFuncs.cs b/Novetus/NovetusFuncs/NovetusLauncherLibrary.cs
similarity index 100%
rename from Novetus/NovetusFuncs/NovetusLauncherFuncs.cs
rename to Novetus/NovetusFuncs/NovetusLauncherLibrary.cs
diff --git a/Novetus/NovetusFuncs/NovetusGlobalFuncs.cs b/Novetus/NovetusFuncs/NovetusMainLibrary.cs
similarity index 100%
rename from Novetus/NovetusFuncs/NovetusGlobalFuncs.cs
rename to Novetus/NovetusFuncs/NovetusMainLibrary.cs
diff --git a/Novetus/NovetusFuncs/NovetusScriptFuncs.cs b/Novetus/NovetusFuncs/NovetusScriptLibrary.cs
similarity index 100%
rename from Novetus/NovetusFuncs/NovetusScriptFuncs.cs
rename to Novetus/NovetusFuncs/NovetusScriptLibrary.cs
diff --git a/Novetus/NovetusFuncs/NovetusSecurityFuncs.cs b/Novetus/NovetusFuncs/NovetusSecurityLibrary.cs
similarity index 100%
rename from Novetus/NovetusFuncs/NovetusSecurityFuncs.cs
rename to Novetus/NovetusFuncs/NovetusSecurityLibrary.cs
diff --git a/Novetus/NovetusLauncher/LocalVars.cs b/Novetus/NovetusLauncher/Classes/LocalVars.cs
similarity index 70%
rename from Novetus/NovetusLauncher/LocalVars.cs
rename to Novetus/NovetusLauncher/Classes/LocalVars.cs
index 7b2f8e9..f5dc9e5 100644
--- a/Novetus/NovetusLauncher/LocalVars.cs
+++ b/Novetus/NovetusLauncher/Classes/LocalVars.cs
@@ -322,29 +322,269 @@ namespace NovetusLauncher
     #region Roblox Type Definitions
     public class RobloxDefs
     {
-        public static AssetCacheDef Fonts { get { return new AssetCacheDef("SpecialMesh", new string[] { "MeshId", "TextureId" }, new string[] { ".mesh", ".png" }, new string[] { Directories.AssetCacheDirFonts, Directories.AssetCacheDirTextures }, new string[] { Directories.AssetCacheFontsGameDir, Directories.AssetCacheTexturesGameDir }); } }
-        public static AssetCacheDef Sky { get { return new AssetCacheDef("Sky", new string[] { "SkyboxBk", "SkyboxDn", "SkyboxFt", "SkyboxLf", "SkyboxRt", "SkyboxUp" }, new string[] { ".png" }, new string[] { Directories.AssetCacheDirSky }, new string[] { Directories.AssetCacheSkyGameDir }); } }
-        public static AssetCacheDef Decal { get { return new AssetCacheDef("Decal", new string[] { "Texture" }, new string[] { ".png" }, new string[] { Directories.AssetCacheDirTextures }, new string[] { Directories.AssetCacheTexturesGameDir }); } }
-        public static AssetCacheDef Texture { get { return new AssetCacheDef("Texture", new string[] { "Texture" }, new string[] { ".png" }, new string[] { Directories.AssetCacheDirTextures }, new string[] { Directories.AssetCacheTexturesGameDir }); } }
-        public static AssetCacheDef HopperBin { get { return new AssetCacheDef("HopperBin", new string[] { "TextureId" }, new string[] { ".png" }, new string[] { Directories.AssetCacheDirTextures }, new string[] { Directories.AssetCacheTexturesGameDir }); } }
-        public static AssetCacheDef Tool { get { return new AssetCacheDef("Tool", new string[] { "TextureId" }, new string[] { ".png" }, new string[] { Directories.AssetCacheDirTextures }, new string[] { Directories.AssetCacheTexturesGameDir }); } }
-        public static AssetCacheDef Sound { get { return new AssetCacheDef("Sound", new string[] { "SoundId" }, new string[] { ".wav" }, new string[] { Directories.AssetCacheDirSounds }, new string[] { Directories.AssetCacheSoundsGameDir }); } }
-        public static AssetCacheDef ImageLabel { get { return new AssetCacheDef("ImageLabel", new string[] { "Image" }, new string[] { ".png" }, new string[] { Directories.AssetCacheDirTextures }, new string[] { Directories.AssetCacheTexturesGameDir }); } }
-        public static AssetCacheDef Shirt { get { return new AssetCacheDef("Shirt", new string[] { "ShirtTemplate" }, new string[] { ".png" }, new string[] { Directories.AssetCacheDirTextures }, new string[] { Directories.AssetCacheTexturesGameDir }); } }
-        public static AssetCacheDef ShirtGraphic { get { return new AssetCacheDef("ShirtGraphic", new string[] { "Graphic" }, new string[] { ".png" }, new string[] { Directories.AssetCacheDirTextures }, new string[] { Directories.AssetCacheTexturesGameDir }); } }
-        public static AssetCacheDef Pants { get { return new AssetCacheDef("Pants", new string[] { "PantsTemplate" }, new string[] { ".png" }, new string[] { Directories.AssetCacheDirTextures }, new string[] { Directories.AssetCacheTexturesGameDir }); } }
-        public static AssetCacheDef Script { get { return new AssetCacheDef("Script", new string[] { "LinkedSource" }, new string[] { ".lua" }, new string[] { Directories.AssetCacheDirScripts }, new string[] { Directories.AssetCacheScriptsGameDir }); } }
-        public static AssetCacheDef LocalScript { get { return new AssetCacheDef("LocalScript", new string[] { "LinkedSource" }, new string[] { ".lua" }, new string[] { Directories.AssetCacheDirScripts }, new string[] { Directories.AssetCacheScriptsGameDir }); } }
+        public static AssetCacheDef Fonts 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("SpecialMesh", 
+                new string[] { "MeshId", "TextureId" }, 
+                new string[] { ".mesh", ".png" }, 
+                new string[] { Directories.AssetCacheDirFonts, Directories.AssetCacheDirTextures }, 
+                new string[] { Directories.AssetCacheFontsGameDir, Directories.AssetCacheTexturesGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef Sky 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Sky", 
+                    new string[] { "SkyboxBk", "SkyboxDn", "SkyboxFt", "SkyboxLf", "SkyboxRt", "SkyboxUp" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.AssetCacheDirSky }, 
+                    new string[] { Directories.AssetCacheSkyGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef Decal 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Decal", 
+                    new string[] { "Texture" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.AssetCacheDirTextures }, 
+                    new string[] { Directories.AssetCacheTexturesGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef Texture 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Texture", 
+                    new string[] { "Texture" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.AssetCacheDirTextures },
+                    new string[] { Directories.AssetCacheTexturesGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef HopperBin 
+        { 
+            get 
+            { return new AssetCacheDef("HopperBin", 
+                new string[] { "TextureId" }, 
+                new string[] { ".png" }, 
+                new string[] { Directories.AssetCacheDirTextures }, 
+                new string[] { Directories.AssetCacheTexturesGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef Tool 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Tool", 
+                    new string[] { "TextureId" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.AssetCacheDirTextures }, 
+                    new string[] { Directories.AssetCacheTexturesGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef Sound 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Sound", 
+                    new string[] { "SoundId" }, 
+                    new string[] { ".wav" }, 
+                    new string[] { Directories.AssetCacheDirSounds }, 
+                    new string[] { Directories.AssetCacheSoundsGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef ImageLabel 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("ImageLabel", 
+                    new string[] { "Image" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.AssetCacheDirTextures }, 
+                    new string[] { Directories.AssetCacheTexturesGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef Shirt 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Shirt", 
+                    new string[] { "ShirtTemplate" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.AssetCacheDirTextures }, 
+                    new string[] { Directories.AssetCacheTexturesGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef ShirtGraphic 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("ShirtGraphic", 
+                    new string[] { "Graphic" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.AssetCacheDirTextures }, 
+                    new string[] { Directories.AssetCacheTexturesGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef Pants 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Pants", 
+                    new string[] { "PantsTemplate" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.AssetCacheDirTextures }, 
+                    new string[] { Directories.AssetCacheTexturesGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef Script 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Script", 
+                    new string[] { "LinkedSource" }, 
+                    new string[] { ".lua" }, 
+                    new string[] { Directories.AssetCacheDirScripts }, 
+                    new string[] { Directories.AssetCacheScriptsGameDir }); 
+            } 
+        }
+
+        public static AssetCacheDef LocalScript 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("LocalScript", 
+                    new string[] { "LinkedSource" }, 
+                    new string[] { ".lua" }, 
+                    new string[] { Directories.AssetCacheDirScripts }, 
+                    new string[] { Directories.AssetCacheScriptsGameDir }); 
+            } 
+        }
+
         //item defs below
-        public static AssetCacheDef ItemHatFonts { get { return new AssetCacheDef("SpecialMesh", new string[] { "MeshId", "TextureId" }, new string[] { ".mesh", ".png" }, new string[] { Directories.hatdirFonts, Directories.hatdirTextures }, new string[] { Directories.hatGameDirFonts, Directories.hatGameDirTextures }); } }
-        public static AssetCacheDef ItemHatSound { get { return new AssetCacheDef("Sound", new string[] { "SoundId" }, new string[] { ".wav" }, new string[] { Directories.hatdirSounds }, new string[] { Directories.hatGameDirSounds }); } }
-        public static AssetCacheDef ItemHatScript { get { return new AssetCacheDef("Script", new string[] { "LinkedSource" }, new string[] { ".lua" }, new string[] { Directories.hatdirScripts }, new string[] { Directories.hatGameDirScripts }); } }
-        public static AssetCacheDef ItemHatLocalScript { get { return new AssetCacheDef("LocalScript", new string[] { "LinkedSource" }, new string[] { ".lua" }, new string[] { Directories.hatdirScripts }, new string[] { Directories.hatGameDirScripts }); } }
-        public static AssetCacheDef ItemHeadFonts { get { return new AssetCacheDef("SpecialMesh", new string[] { "MeshId", "TextureId" }, new string[] { ".mesh", ".png" }, new string[] { Directories.headdirFonts, Directories.headdirTextures }, new string[] { Directories.headGameDirFonts, Directories.headGameDirTextures }); } }
-        public static AssetCacheDef ItemFaceTexture { get { return new AssetCacheDef("Decal", new string[] { "Texture" }, new string[] { ".png" }, new string[] { Directories.facedirTextures }, new string[] { Directories.faceGameDirTextures }); } }
-        public static AssetCacheDef ItemShirtTexture { get { return new AssetCacheDef("Shirt", new string[] { "ShirtTemplate" }, new string[] { ".png" }, new string[] { Directories.shirtdirTextures }, new string[] { Directories.shirtGameDirTextures }); } }
-        public static AssetCacheDef ItemTShirtTexture { get { return new AssetCacheDef("ShirtGraphic", new string[] { "Graphic" }, new string[] { ".png" }, new string[] { Directories.tshirtdirTextures }, new string[] { Directories.tshirtGameDirTextures }); } }
-        public static AssetCacheDef ItemPantsTexture { get { return new AssetCacheDef("Pants", new string[] { "PantsTemplate" }, new string[] { ".png" }, new string[] { Directories.pantsdirTextures }, new string[] { Directories.pantsGameDirTextures }); } }
+        public static AssetCacheDef ItemHatFonts 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("SpecialMesh", 
+                    new string[] { "MeshId", "TextureId" }, 
+                    new string[] { ".mesh", ".png" }, 
+                    new string[] { Directories.hatdirFonts, Directories.hatdirTextures }, 
+                    new string[] { Directories.hatGameDirFonts, Directories.hatGameDirTextures }); 
+            } 
+        }
+
+        public static AssetCacheDef ItemHatSound 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Sound", 
+                    new string[] { "SoundId" }, 
+                    new string[] { ".wav" }, 
+                    new string[] { Directories.hatdirSounds }, 
+                    new string[] { Directories.hatGameDirSounds }); 
+            } 
+        }
+
+        public static AssetCacheDef ItemHatScript 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Script", 
+                    new string[] { "LinkedSource" }, 
+                    new string[] { ".lua" }, 
+                    new string[] { Directories.hatdirScripts }, 
+                    new string[] { Directories.hatGameDirScripts }); 
+            } 
+        }
+
+        public static AssetCacheDef ItemHatLocalScript 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("LocalScript", 
+                    new string[] { "LinkedSource" }, 
+                    new string[] { ".lua" }, 
+                    new string[] { Directories.hatdirScripts }, 
+                    new string[] { Directories.hatGameDirScripts }); 
+            } 
+        }
+
+        public static AssetCacheDef ItemHeadFonts 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("SpecialMesh", 
+                    new string[] { "MeshId", "TextureId" }, 
+                    new string[] { ".mesh", ".png" }, 
+                    new string[] { Directories.headdirFonts, Directories.headdirTextures }, 
+                    new string[] { Directories.headGameDirFonts, Directories.headGameDirTextures }); 
+            } 
+        }
+
+        public static AssetCacheDef ItemFaceTexture 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Decal", 
+                    new string[] { "Texture" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.facedirTextures }, 
+                    new string[] { Directories.faceGameDirTextures }); 
+            } 
+        }
+
+        public static AssetCacheDef ItemShirtTexture 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Shirt", 
+                    new string[] { "ShirtTemplate" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.shirtdirTextures }, 
+                    new string[] { Directories.shirtGameDirTextures }); 
+            } 
+        }
+
+        public static AssetCacheDef ItemTShirtTexture 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("ShirtGraphic", 
+                    new string[] { "Graphic" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.tshirtdirTextures }, 
+                    new string[] { Directories.tshirtGameDirTextures }); 
+            } 
+        }
+
+        public static AssetCacheDef ItemPantsTexture 
+        { 
+            get 
+            { 
+                return new AssetCacheDef("Pants", 
+                    new string[] { "PantsTemplate" }, 
+                    new string[] { ".png" }, 
+                    new string[] { Directories.pantsdirTextures }, 
+                    new string[] { Directories.pantsGameDirTextures }); 
+            } 
+        }
     }
     #endregion
 
diff --git a/Novetus/NovetusLauncher/NovetusLauncher.csproj b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
similarity index 98%
rename from Novetus/NovetusLauncher/NovetusLauncher.csproj
rename to Novetus/NovetusLauncher/Novetus.Launcher.csproj
index 5bfdc7f..5653b08 100644
--- a/Novetus/NovetusLauncher/NovetusLauncher.csproj
+++ b/Novetus/NovetusLauncher/Novetus.Launcher.csproj
@@ -17,7 +17,7 @@
     <NoStdLib>False</NoStdLib>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-	<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
     <SignAssembly>False</SignAssembly>
     <DelaySign>False</DelaySign>
@@ -134,7 +134,7 @@
     <Compile Include="CharacterCustomization\CharacterCustomization.Designer.cs">
       <DependentUpon>CharacterCustomization.cs</DependentUpon>
     </Compile>
-    <Compile Include="LocalVars.cs" />
+    <Compile Include="Classes\LocalVars.cs" />
     <Compile Include="MainForm\MainForm_legacy.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs b/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs
index 2597bc9..2e3fb83 100644
--- a/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs
+++ b/Novetus/NovetusLauncher/SDK/AssetLocalizer.cs
@@ -391,9 +391,9 @@ namespace NovetusLauncher
                         RobloxXMLLocalizer.DownloadFromNodes(path, RobloxDefs.ItemHatSound);
                         //scripts
                         worker.ReportProgress(50);
-                        RobloxXMLLocalizer.DownloadFromNodes(path, RobloxDefs.Script);
+                        RobloxXMLLocalizer.DownloadFromNodes(path, RobloxDefs.ItemHatScript);
                         worker.ReportProgress(75);
-                        RobloxXMLLocalizer.DownloadFromNodes(path, RobloxDefs.LocalScript);
+                        RobloxXMLLocalizer.DownloadFromNodes(path, RobloxDefs.ItemHatLocalScript);
                         worker.ReportProgress(100);
                         break;
                     case RobloxFileType.Head:
diff --git a/Novetus/NovetusURI/LocalVars.cs b/Novetus/NovetusURI/Classes/LocalVars.cs
similarity index 100%
rename from Novetus/NovetusURI/LocalVars.cs
rename to Novetus/NovetusURI/Classes/LocalVars.cs
diff --git a/Novetus/NovetusURI/NovetusURI.csproj b/Novetus/NovetusURI/Novetus.URI.csproj
similarity index 98%
rename from Novetus/NovetusURI/NovetusURI.csproj
rename to Novetus/NovetusURI/Novetus.URI.csproj
index b85cbd8..4dad0af 100644
--- a/Novetus/NovetusURI/NovetusURI.csproj
+++ b/Novetus/NovetusURI/Novetus.URI.csproj
@@ -91,7 +91,7 @@
     <Compile Include="Form1.Designer.cs">
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
-    <Compile Include="LocalVars.cs" />
+    <Compile Include="Classes\LocalVars.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="URI\LoaderForm.cs">
@@ -140,9 +140,9 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NovetusLauncher\NovetusLauncher.csproj">
+    <ProjectReference Include="..\NovetusLauncher\Novetus.Launcher.csproj">
       <Project>{F92FFBED-2767-4676-9711-BB89CDA58A43}</Project>
-      <Name>NovetusLauncher</Name>
+      <Name>Novetus.Launcher</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>