diff --git a/.gitmodules b/.gitmodules
index bc03f17..f6c0007 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "submodules/OsuStatePresenter"]
-	path = submodules/OsuStatePresenter
-	url = git@github.com:ceilingwaffle/OsuStatePresenter.git
 [submodule "submodules/DependentValuePresentationFramework"]
 	path = submodules/DependentValuePresentationFramework
 	url = git@github.com:ceilingwaffle/DependentValuePresentationFramework.git
+[submodule "submodules/OsuStatePresenter"]
+	path = submodules/OsuStatePresenter
+	url = git@github.com:ceilingwaffle/OsuStatePresenter.git
 [submodule "submodules/ProcessMemoryDataFinder"]
 	path = submodules/ProcessMemoryDataFinder
 	url = git@github.com:Piotrekol/ProcessMemoryDataFinder.git
diff --git a/Focusu.GUI/Focusu.GUI.csproj b/Focusu.GUI/Focusu.GUI.csproj
index e959c0b..d77d0e9 100644
--- a/Focusu.GUI/Focusu.GUI.csproj
+++ b/Focusu.GUI/Focusu.GUI.csproj
@@ -35,10 +35,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\dvpf\DVPF.Core\DVPF.Core.csproj" />
-    <ProjectReference Include="..\..\osu-state-presenter\OsuStatePresenter\OsuStatePresenter.csproj" />
+    <ProjectReference Include="..\..\DependentValuePresentationFramework\DVPF.Core\DVPF.Core.csproj" />
+    <ProjectReference Include="..\..\OsuStatePresenter\OsuStatePresenter\OsuStatePresenter.csproj" />
   </ItemGroup>
 
+  <!--<Target Name="BuildOtherProjects">
+    <MSBuild Projects="@(ProjectReference)" Targets="Build">
+      <Output TaskParameter="TargetOutputs" ItemName="AssembliesBuiltByChildProjects" />
+    </MSBuild>
+  </Target>-->
+
   <ItemGroup>
     <Resource Include="resources\images\small\Monitor_black.png" />
     <Resource Include="resources\images\small\Monitor_white.png" />
diff --git a/Focusu.GUI/Properties/PublishProfiles/FolderProfile.pubxml b/Focusu.GUI/Properties/PublishProfiles/FolderProfile.pubxml
index 3ffacfe..b56418f 100644
--- a/Focusu.GUI/Properties/PublishProfiles/FolderProfile.pubxml
+++ b/Focusu.GUI/Properties/PublishProfiles/FolderProfile.pubxml
@@ -9,7 +9,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Platform>x86</Platform>
     <TargetFramework>netcoreapp3.0</TargetFramework>
     <PublishDir>bin\Release\netcoreapp3.0\publish\</PublishDir>
-    <SelfContained>false</SelfContained>
-    <_IsPortable>true</_IsPortable>
+    <SelfContained>true</SelfContained>
+    <_IsPortable>false</_IsPortable>
+    <RuntimeIdentifier>win-x86</RuntimeIdentifier>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Focusu.sln b/Focusu.sln
index 8c1e103..55eed33 100644
--- a/Focusu.sln
+++ b/Focusu.sln
@@ -7,9 +7,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Focusu.GUI", "Focusu.GUI\Fo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "submodules", "submodules", "{EF004CBC-C8BC-4DB6-A7AA-72D3063B75B1}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OsuStatePresenter", "..\osu-state-presenter\OsuStatePresenter\OsuStatePresenter.csproj", "{7D1D9BA3-8300-4048-AA67-CA9FD91199FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DVPF.Core", "..\DependentValuePresentationFramework\DVPF.Core\DVPF.Core.csproj", "{EDE10745-1D26-4250-B887-7A6665687150}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DVPF.Core", "..\dvpf\DVPF.Core\DVPF.Core.csproj", "{E9E5A94A-2912-4262-83DD-8DC8A72C435B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OsuStatePresenter", "..\OsuStatePresenter\OsuStatePresenter\OsuStatePresenter.csproj", "{1612D59E-2701-4421-875D-4D723D66C206}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ProcessMemoryDataFinder", "submodules\ProcessMemoryDataFinder\ProcessMemoryDataFinder\ProcessMemoryDataFinder.csproj", "{9960D641-300A-432C-AA04-C351A99B9ADB}"
 EndProject
@@ -31,22 +31,22 @@ Global
 		{E2648F48-16DF-4B2C-A602-E9503A09D19C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E2648F48-16DF-4B2C-A602-E9503A09D19C}.Release|x86.ActiveCfg = Release|Any CPU
 		{E2648F48-16DF-4B2C-A602-E9503A09D19C}.Release|x86.Build.0 = Release|Any CPU
-		{7D1D9BA3-8300-4048-AA67-CA9FD91199FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7D1D9BA3-8300-4048-AA67-CA9FD91199FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7D1D9BA3-8300-4048-AA67-CA9FD91199FC}.Debug|x86.ActiveCfg = Debug|x86
-		{7D1D9BA3-8300-4048-AA67-CA9FD91199FC}.Debug|x86.Build.0 = Debug|x86
-		{7D1D9BA3-8300-4048-AA67-CA9FD91199FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7D1D9BA3-8300-4048-AA67-CA9FD91199FC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7D1D9BA3-8300-4048-AA67-CA9FD91199FC}.Release|x86.ActiveCfg = Release|x86
-		{7D1D9BA3-8300-4048-AA67-CA9FD91199FC}.Release|x86.Build.0 = Release|x86
-		{E9E5A94A-2912-4262-83DD-8DC8A72C435B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E9E5A94A-2912-4262-83DD-8DC8A72C435B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E9E5A94A-2912-4262-83DD-8DC8A72C435B}.Debug|x86.ActiveCfg = Debug|x86
-		{E9E5A94A-2912-4262-83DD-8DC8A72C435B}.Debug|x86.Build.0 = Debug|x86
-		{E9E5A94A-2912-4262-83DD-8DC8A72C435B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E9E5A94A-2912-4262-83DD-8DC8A72C435B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E9E5A94A-2912-4262-83DD-8DC8A72C435B}.Release|x86.ActiveCfg = Release|x86
-		{E9E5A94A-2912-4262-83DD-8DC8A72C435B}.Release|x86.Build.0 = Release|x86
+		{EDE10745-1D26-4250-B887-7A6665687150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDE10745-1D26-4250-B887-7A6665687150}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDE10745-1D26-4250-B887-7A6665687150}.Debug|x86.ActiveCfg = Debug|x86
+		{EDE10745-1D26-4250-B887-7A6665687150}.Debug|x86.Build.0 = Debug|x86
+		{EDE10745-1D26-4250-B887-7A6665687150}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDE10745-1D26-4250-B887-7A6665687150}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDE10745-1D26-4250-B887-7A6665687150}.Release|x86.ActiveCfg = Release|x86
+		{EDE10745-1D26-4250-B887-7A6665687150}.Release|x86.Build.0 = Release|x86
+		{1612D59E-2701-4421-875D-4D723D66C206}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1612D59E-2701-4421-875D-4D723D66C206}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1612D59E-2701-4421-875D-4D723D66C206}.Debug|x86.ActiveCfg = Debug|x86
+		{1612D59E-2701-4421-875D-4D723D66C206}.Debug|x86.Build.0 = Debug|x86
+		{1612D59E-2701-4421-875D-4D723D66C206}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1612D59E-2701-4421-875D-4D723D66C206}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1612D59E-2701-4421-875D-4D723D66C206}.Release|x86.ActiveCfg = Release|x86
+		{1612D59E-2701-4421-875D-4D723D66C206}.Release|x86.Build.0 = Release|x86
 		{9960D641-300A-432C-AA04-C351A99B9ADB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9960D641-300A-432C-AA04-C351A99B9ADB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9960D641-300A-432C-AA04-C351A99B9ADB}.Debug|x86.ActiveCfg = Debug|Any CPU
@@ -68,8 +68,8 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{7D1D9BA3-8300-4048-AA67-CA9FD91199FC} = {EF004CBC-C8BC-4DB6-A7AA-72D3063B75B1}
-		{E9E5A94A-2912-4262-83DD-8DC8A72C435B} = {EF004CBC-C8BC-4DB6-A7AA-72D3063B75B1}
+		{EDE10745-1D26-4250-B887-7A6665687150} = {EF004CBC-C8BC-4DB6-A7AA-72D3063B75B1}
+		{1612D59E-2701-4421-875D-4D723D66C206} = {EF004CBC-C8BC-4DB6-A7AA-72D3063B75B1}
 		{9960D641-300A-432C-AA04-C351A99B9ADB} = {EF004CBC-C8BC-4DB6-A7AA-72D3063B75B1}
 		{D117800F-072D-4AE4-9679-3E2A129A1A3C} = {EF004CBC-C8BC-4DB6-A7AA-72D3063B75B1}
 	EndGlobalSection
diff --git a/submodules/DependentValuePresentationFramework b/submodules/DependentValuePresentationFramework
deleted file mode 160000
index 01c3bf5..0000000
--- a/submodules/DependentValuePresentationFramework
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 01c3bf574c9d8185adb52c0b628073adbdd09c61
diff --git a/submodules/OsuStatePresenter b/submodules/OsuStatePresenter
deleted file mode 160000
index 753cedf..0000000
--- a/submodules/OsuStatePresenter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 753cedff2b4746d538d593d37b701496948d197d