diff --git a/Novetus/Novetus.sln b/Novetus/Novetus.sln
index d1e167d..c19a3fd 100644
--- a/Novetus/Novetus.sln
+++ b/Novetus/Novetus.sln
@@ -7,12 +7,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.Launcher", "Novetus
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.CMD", "NovetusCMD\Novetus.CMD.csproj", "{BAC99C87-F6C1-4ED0-AA2E-05C6AE8979EA}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Novetus.Core", "NovetusCore\Novetus.Core.shproj", "{54856A61-1EE2-40C3-85AE-C54B8DE7CC30}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Novetus.URI", "NovetusURI\Novetus.URI.csproj", "{2070EAA6-7606-4006-A628-5705C24A3644}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Novetus.Core", "NovetusCore\Novetus.Core.shproj", "{323F300A-3E26-43CA-A783-A0DAE56CB842}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		NovetusCore\NovetusCore.projitems*{323f300a-3e26-43ca-a783-a0dae56cb842}*SharedItemsImports = 13
 		NovetusCore\NovetusCore.projitems*{bac99c87-f6c1-4ed0-aa2e-05c6ae8979ea}*SharedItemsImports = 4
 		NovetusCore\NovetusCore.projitems*{f92ffbed-2767-4676-9711-bb89cda58a43}*SharedItemsImports = 4
 	EndGlobalSection
diff --git a/Novetus/NovetusCor/Novetus.Core.shproj b/Novetus/NovetusCor/Novetus.Core.shproj
new file mode 100644
index 0000000..301b419
--- /dev/null
+++ b/Novetus/NovetusCor/Novetus.Core.shproj
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>54856a61-1ee2-40c3-85ae-c54b8de7cc30</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="NovetusFuncs.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>
diff --git a/Novetus/NovetusCor/NovetusCore.projitems b/Novetus/NovetusCor/NovetusCore.projitems
new file mode 100644
index 0000000..f6f98c8
--- /dev/null
+++ b/Novetus/NovetusCor/NovetusCore.projitems
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>54856a61-1ee2-40c3-85ae-c54b8de7cc30</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>NovetusCore</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)CryptoRandom.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)FileFormat.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)GlobalPaths.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)GlobalVars.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IDiscordRPC.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)INIFile.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NETExt.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)NetFuncs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SimpleHTTPServer.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ScriptFuncs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)LauncherFuncs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SecurityFuncs.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Settings.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)TextLineRemover.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)VarStorage.cs" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/Novetus/NovetusCore/Novetus.Core.shproj b/Novetus/NovetusCore/Novetus.Core.shproj
index 301b419..8f6410a 100644
--- a/Novetus/NovetusCore/Novetus.Core.shproj
+++ b/Novetus/NovetusCore/Novetus.Core.shproj
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-    <ProjectGuid>54856a61-1ee2-40c3-85ae-c54b8de7cc30</ProjectGuid>
+    <ProjectGuid>323f300a-3e26-43ca-a783-a0dae56cb842</ProjectGuid>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
   <PropertyGroup />
-  <Import Project="NovetusFuncs.projitems" Label="Shared" />
+  <Import Project="NovetusCore.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
 </Project>
diff --git a/Novetus/NovetusCore/NovetusCore.projitems b/Novetus/NovetusCore/NovetusCore.projitems
index 2e15436..eb692e6 100644
--- a/Novetus/NovetusCore/NovetusCore.projitems
+++ b/Novetus/NovetusCore/NovetusCore.projitems
@@ -3,10 +3,10 @@
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
     <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>54856a61-1ee2-40c3-85ae-c54b8de7cc30</SharedGUID>
+    <SharedGUID>323f300a-3e26-43ca-a783-a0dae56cb842</SharedGUID>
   </PropertyGroup>
   <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>NovetusFuncs</Import_RootNamespace>
+    <Import_RootNamespace>NovetusCore</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)CryptoRandom.cs" />
@@ -15,13 +15,13 @@
     <Compile Include="$(MSBuildThisFileDirectory)GlobalVars.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IDiscordRPC.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)INIFile.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)LauncherFuncs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)NETExt.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)NetFuncs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SimpleHTTPServer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ScriptFuncs.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)LauncherFuncs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SecurityFuncs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Settings.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SimpleHTTPServer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)TextLineRemover.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)VarStorage.cs" />
   </ItemGroup>