diff --git a/.gitmodules b/.gitmodules
index 5e8c9f7..1a4de0f 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,10 +1,13 @@
 [submodule "JStudio"]
 	path = JStudio
-	url = https://github.com/LagoLunatic/JStudio.git
+	url = https://github.com/LordNed/JStudio.git
 [submodule "WCommon"]
 	path = WCommon
 	url = https://github.com/LordNed/WCommon.git
-[submodule "WArchiveTools"]
-	path = WArchiveTools
-	url = https://github.com/LordNed/WArchive-Tools.git
-	branch = ISO_Opening_Experiments
+[submodule "WArchive-Tools"]
+	path = WArchive-Tools
+	url = https://github.com/LagoLunatic/WArchive-Tools.git
+	branch = master
+[submodule "GameFormatReader"]
+	path = GameFormatReader
+	url = https://github.com/LagoLunatic/GameFormatReader
diff --git a/GameFormatReader b/GameFormatReader
new file mode 160000
index 0000000..62a940a
--- /dev/null
+++ b/GameFormatReader
@@ -0,0 +1 @@
+Subproject commit 62a940a902b603ff0ce858a3b8732a1785051739
diff --git a/J3DModelViewer.sln b/J3DModelViewer.sln
index 737b6c8..d9f8794 100644
--- a/J3DModelViewer.sln
+++ b/J3DModelViewer.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30002.166
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "J3DModelViewer", "J3DModelViewer\J3DModelViewer.csproj", "{9325A8F9-924C-4A20-982A-7142F14BF833}"
 EndProject
@@ -9,7 +9,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JStudio", "JStudio\JStudio.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WCommon", "WCommon\WCommon.csproj", "{E8AF46CC-76DC-4541-A578-5067EAD07087}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchiveToolsLib", "WArchiveTools\ArchiveToolsLib\ArchiveToolsLib.csproj", "{B715685D-1603-4CE3-8EA1-552B01C2BA4B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArchiveToolsLib", "WArchive-Tools\ArchiveToolsLib\ArchiveToolsLib.csproj", "{B715685D-1603-4CE3-8EA1-552B01C2BA4B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{E8AF46CC-76DC-4541-A578-5067EAD07087} = {E8AF46CC-76DC-4541-A578-5067EAD07087}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GameFormatReader", "GameFormatReader\GameFormatReader\GameFormatReader.csproj", "{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,8 +56,19 @@ Global
 		{B715685D-1603-4CE3-8EA1-552B01C2BA4B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B715685D-1603-4CE3-8EA1-552B01C2BA4B}.Release|x64.ActiveCfg = Release|Any CPU
 		{B715685D-1603-4CE3-8EA1-552B01C2BA4B}.Release|x64.Build.0 = Release|Any CPU
+		{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Debug|x64.Build.0 = Debug|Any CPU
+		{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Release|x64.ActiveCfg = Release|Any CPU
+		{AFCE536D-92FF-4EE5-8536-731D2CD5FBCA}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {70B6BC9C-21D8-44D3-9D8B-1C6C43F1BDE8}
+	EndGlobalSection
 EndGlobal
diff --git a/J3DModelViewer/App.config b/J3DModelViewer/App.config
index 12b463f..ee7d97a 100644
--- a/J3DModelViewer/App.config
+++ b/J3DModelViewer/App.config
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="J3DModelViewer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
-            <section name="J3DRenderer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="J3DModelViewer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="J3DRenderer.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
     <userSettings>
         <J3DModelViewer.Properties.Settings>
@@ -63,4 +63,4 @@
             </setting>
         </J3DRenderer.Properties.Settings>
     </userSettings>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/J3DModelViewer/J3DModelViewer.csproj b/J3DModelViewer/J3DModelViewer.csproj
index f44087f..c2f49cd 100644
--- a/J3DModelViewer/J3DModelViewer.csproj
+++ b/J3DModelViewer/J3DModelViewer.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>J3DModelViewer</RootNamespace>
     <AssemblyName>J3DModelViewer</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -28,6 +28,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -73,9 +74,10 @@
     <ApplicationIcon>resources\application_icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="GameFormatReader">
-      <HintPath>..\lib\GameFormatReader.dll</HintPath>
-    </Reference>
+    <ProjectReference Include="$(SolutionDir)\GameFormatReader\GameFormatReader\GameFormatReader.csproj">
+      <Project>{afce536d-92ff-4ee5-8536-731d2cd5fbca}</Project>
+      <Name>GameFormatReader</Name>
+    </ProjectReference>
     <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.WindowsAPICodePack.Core.1.1.0\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
       <Private>True</Private>
diff --git a/J3DModelViewer/Properties/Resources.Designer.cs b/J3DModelViewer/Properties/Resources.Designer.cs
index b34b451..fe486e1 100644
--- a/J3DModelViewer/Properties/Resources.Designer.cs
+++ b/J3DModelViewer/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace J3DModelViewer.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/J3DModelViewer/Properties/Settings.Designer.cs b/J3DModelViewer/Properties/Settings.Designer.cs
index 9b05f1e..cc7f744 100644
--- a/J3DModelViewer/Properties/Settings.Designer.cs
+++ b/J3DModelViewer/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace J3DModelViewer.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.5.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/JStudio b/JStudio
index 5b0f1f2..8be7556 160000
--- a/JStudio
+++ b/JStudio
@@ -1 +1 @@
-Subproject commit 5b0f1f20cbed4f47034049b40024d01323c1f980
+Subproject commit 8be75563931111b1f4fe0e16bd1ba89c7645d11e
diff --git a/WArchive-Tools b/WArchive-Tools
new file mode 160000
index 0000000..f5c0915
--- /dev/null
+++ b/WArchive-Tools
@@ -0,0 +1 @@
+Subproject commit f5c0915b537dbd2c9cd3951121c62ea964a5c09c
diff --git a/WArchiveTools b/WArchiveTools
deleted file mode 160000
index fe53925..0000000
--- a/WArchiveTools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fe53925d95e947e60874bf7dc51fda97ec450ebf