diff --git a/Compression.BSA.Test/BSATests.cs b/Compression.BSA.Test/BSATests.cs
index b7d21aa6..92d1aa63 100644
--- a/Compression.BSA.Test/BSATests.cs
+++ b/Compression.BSA.Test/BSATests.cs
@@ -5,7 +5,6 @@ using System.Linq;
using System.Threading.Tasks;
using Newtonsoft.Json;
using Wabbajack.Common;
-using Wabbajack.Compression.BSA;
using Wabbajack.Lib.Downloaders;
using Wabbajack.Lib.NexusApi;
using Wabbajack.VirtualFileSystem;
diff --git a/Compression.BSA.Test/Compression.BSA.Test.csproj b/Compression.BSA.Test/Compression.BSA.Test.csproj
index 3b3f1ad9..1797506d 100644
--- a/Compression.BSA.Test/Compression.BSA.Test.csproj
+++ b/Compression.BSA.Test/Compression.BSA.Test.csproj
@@ -19,9 +19,9 @@
+
-
diff --git a/Wabbajack.Compression.BSA/BA2Builder.cs b/Compression.BSA/BA2Builder.cs
similarity index 99%
rename from Wabbajack.Compression.BSA/BA2Builder.cs
rename to Compression.BSA/BA2Builder.cs
index 234fc6d6..c182bd7c 100644
--- a/Wabbajack.Compression.BSA/BA2Builder.cs
+++ b/Compression.BSA/BA2Builder.cs
@@ -9,7 +9,7 @@ using ICSharpCode.SharpZipLib.Zip.Compression;
using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
using Wabbajack.Common;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
interface IFileBuilder
{
diff --git a/Wabbajack.Compression.BSA/BA2Reader.cs b/Compression.BSA/BA2Reader.cs
similarity index 99%
rename from Wabbajack.Compression.BSA/BA2Reader.cs
rename to Compression.BSA/BA2Reader.cs
index fd0ce5d1..b5d20ed9 100644
--- a/Wabbajack.Compression.BSA/BA2Reader.cs
+++ b/Compression.BSA/BA2Reader.cs
@@ -9,7 +9,7 @@ using Wabbajack.Common;
using Wabbajack.Common.Serialization.Json;
using File = Alphaleonis.Win32.Filesystem.File;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
public enum EntryType
{
diff --git a/Wabbajack.Compression.BSA/BSABuilder.cs b/Compression.BSA/BSABuilder.cs
similarity index 99%
rename from Wabbajack.Compression.BSA/BSABuilder.cs
rename to Compression.BSA/BSABuilder.cs
index 7bd71e5b..dbc5dc56 100644
--- a/Wabbajack.Compression.BSA/BSABuilder.cs
+++ b/Compression.BSA/BSABuilder.cs
@@ -11,7 +11,7 @@ using Wabbajack.Common;
using File = Alphaleonis.Win32.Filesystem.File;
using Path = Alphaleonis.Win32.Filesystem.Path;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
public class BSABuilder : IBSABuilder
{
diff --git a/Wabbajack.Compression.BSA/BSADispatch.cs b/Compression.BSA/BSADispatch.cs
similarity index 97%
rename from Wabbajack.Compression.BSA/BSADispatch.cs
rename to Compression.BSA/BSADispatch.cs
index 0e8cd684..fec3073c 100644
--- a/Wabbajack.Compression.BSA/BSADispatch.cs
+++ b/Compression.BSA/BSADispatch.cs
@@ -4,7 +4,7 @@ using System.Text;
using System.Threading.Tasks;
using Wabbajack.Common;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
public static class BSADispatch
{
diff --git a/Wabbajack.Compression.BSA/BSAReader.cs b/Compression.BSA/BSAReader.cs
similarity index 99%
rename from Wabbajack.Compression.BSA/BSAReader.cs
rename to Compression.BSA/BSAReader.cs
index 8770edd0..6858c4a8 100644
--- a/Wabbajack.Compression.BSA/BSAReader.cs
+++ b/Compression.BSA/BSAReader.cs
@@ -9,7 +9,7 @@ using Wabbajack.Common;
using Wabbajack.Common.Serialization.Json;
using File = Alphaleonis.Win32.Filesystem.File;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
public enum VersionType : uint
{
diff --git a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj b/Compression.BSA/Compression.BSA.csproj
similarity index 67%
rename from Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj
rename to Compression.BSA/Compression.BSA.csproj
index e8bfd06d..cf206971 100644
--- a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj
+++ b/Compression.BSA/Compression.BSA.csproj
@@ -5,15 +5,11 @@
true
x64
win10-x64
- 2.1.0.0
+ 3.0
true
- https://github.com/wabbajack-tools/wabbajack
- https://raw.githubusercontent.com/wabbajack-tools/wabbajack/master/LICENSE.txt
- https://www.wabbajack.org/favicon.ico
- https://github.com/wabbajack-tools/wabbajack
- Wabbajack.Compression.BSA.xml
+ Compression.BSA.xml
diff --git a/Wabbajack.Compression.BSA/DDS.cs b/Compression.BSA/DDS.cs
similarity index 99%
rename from Wabbajack.Compression.BSA/DDS.cs
rename to Compression.BSA/DDS.cs
index 309af7d2..01ca931e 100644
--- a/Wabbajack.Compression.BSA/DDS.cs
+++ b/Compression.BSA/DDS.cs
@@ -1,6 +1,6 @@
using System.Runtime.InteropServices;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
/*
* Copied from https://raw.githubusercontent.com/AlexxEG/BSA_Browser/master/Sharp.BSA.BA2/BA2Util/DDS.cs
diff --git a/Wabbajack.Compression.BSA/IBSAReader.cs b/Compression.BSA/IBSAReader.cs
similarity index 97%
rename from Wabbajack.Compression.BSA/IBSAReader.cs
rename to Compression.BSA/IBSAReader.cs
index cb731931..46f6ca4b 100644
--- a/Wabbajack.Compression.BSA/IBSAReader.cs
+++ b/Compression.BSA/IBSAReader.cs
@@ -4,7 +4,7 @@ using System.IO;
using System.Threading.Tasks;
using Wabbajack.Common;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
public interface IBSAReader
{
diff --git a/Wabbajack.Compression.BSA/Readme.md b/Compression.BSA/Readme.md
similarity index 100%
rename from Wabbajack.Compression.BSA/Readme.md
rename to Compression.BSA/Readme.md
diff --git a/Wabbajack.Compression.BSA/TES3Builder.cs b/Compression.BSA/TES3Builder.cs
similarity index 98%
rename from Wabbajack.Compression.BSA/TES3Builder.cs
rename to Compression.BSA/TES3Builder.cs
index c7f39a98..78a42178 100644
--- a/Wabbajack.Compression.BSA/TES3Builder.cs
+++ b/Compression.BSA/TES3Builder.cs
@@ -5,7 +5,7 @@ using System.Threading.Tasks;
using Wabbajack.Common;
using File = Alphaleonis.Win32.Filesystem.File;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
public class TES3Builder : IBSABuilder
{
diff --git a/Wabbajack.Compression.BSA/TES3Reader.cs b/Compression.BSA/TES3Reader.cs
similarity index 99%
rename from Wabbajack.Compression.BSA/TES3Reader.cs
rename to Compression.BSA/TES3Reader.cs
index 6d4939c6..45ffecdc 100644
--- a/Wabbajack.Compression.BSA/TES3Reader.cs
+++ b/Compression.BSA/TES3Reader.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using Wabbajack.Common;
using Wabbajack.Common.Serialization.Json;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
public class TES3Reader : IBSAReader
{
diff --git a/Wabbajack.Compression.BSA/Utils.cs b/Compression.BSA/Utils.cs
similarity index 99%
rename from Wabbajack.Compression.BSA/Utils.cs
rename to Compression.BSA/Utils.cs
index e266fe2b..32893261 100644
--- a/Wabbajack.Compression.BSA/Utils.cs
+++ b/Compression.BSA/Utils.cs
@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using Wabbajack.Common;
using Path = Alphaleonis.Win32.Filesystem.Path;
-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
{
internal static class Utils
{
diff --git a/Wabbajack.CLI/Verbs/BSADump.cs b/Wabbajack.CLI/Verbs/BSADump.cs
index 59c1e7ff..0c1c55ca 100644
--- a/Wabbajack.CLI/Verbs/BSADump.cs
+++ b/Wabbajack.CLI/Verbs/BSADump.cs
@@ -1,7 +1,7 @@
using System;
using System.Threading.Tasks;
using CommandLine;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
using Wabbajack.Common;
namespace Wabbajack.CLI.Verbs
diff --git a/Wabbajack.Common/FileSignatures/Definitions/GKA_software_license.pdf b/Wabbajack.Common/FileSignatures/Definitions/GKA_software_license.pdf
deleted file mode 100644
index 9d9245fc..00000000
Binary files a/Wabbajack.Common/FileSignatures/Definitions/GKA_software_license.pdf and /dev/null differ
diff --git a/Wabbajack.Common/Wabbajack.Common.csproj b/Wabbajack.Common/Wabbajack.Common.csproj
index e7298fce..247751cb 100644
--- a/Wabbajack.Common/Wabbajack.Common.csproj
+++ b/Wabbajack.Common/Wabbajack.Common.csproj
@@ -6,7 +6,7 @@
win10-x64
enable
true
- 2.1.0.0
+ 3.0
Wabbajack Common Lib
Wabbajack Team
2020
@@ -14,7 +14,7 @@
https://raw.githubusercontent.com/wabbajack-tools/wabbajack/master/LICENSE.txt
https://www.wabbajack.org/favicon.ico
https://github.com/wabbajack-tools/wabbajack
- 2.1.0.0
+ 3.0
Wabbajack.Common.xml
diff --git a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.xml b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.xml
deleted file mode 100644
index df9cd0af..00000000
--- a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
- Wabbajack.Compression.BSA
-
-
-
-
- The files defined by the archive
-
-
-
-
- The path of the file inside the archive
-
-
-
-
- The uncompressed file size
-
-
-
-
- Get the metadata for the file.
-
-
-
-
- Copies this entry to the given stream. 100% thread safe, the .bsa will be opened multiple times
- in order to maintain thread-safe access.
-
-
-
-
-
- Returns bytes for a \0 terminated string
-
-
-
-
-
-
- Returns bytes for unterminated string with a count at the start
-
-
-
-
-
-
- Returns bytes for a \0 terminated string prefixed by a length
-
-
-
-
-
-
diff --git a/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs b/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs
index 52fc3759..daa6abc9 100644
--- a/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs
+++ b/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Alphaleonis.Win32.Filesystem;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
using Newtonsoft.Json;
using Wabbajack.Common;
using Wabbajack.Common.StatusFeed.Errors;
diff --git a/Wabbajack.Lib/Data.cs b/Wabbajack.Lib/Data.cs
index 8eea94a4..cc0cab5e 100644
--- a/Wabbajack.Lib/Data.cs
+++ b/Wabbajack.Lib/Data.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
using Newtonsoft.Json;
using Wabbajack.Common;
using Wabbajack.Common.Serialization.Json;
diff --git a/Wabbajack.Lib/MO2Compiler.cs b/Wabbajack.Lib/MO2Compiler.cs
index 891acd7e..2cbfb1ea 100644
--- a/Wabbajack.Lib/MO2Compiler.cs
+++ b/Wabbajack.Lib/MO2Compiler.cs
@@ -1,4 +1,4 @@
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
diff --git a/Wabbajack.Lib/Wabbajack.Lib.csproj b/Wabbajack.Lib/Wabbajack.Lib.csproj
index 612006de..067f9f91 100644
--- a/Wabbajack.Lib/Wabbajack.Lib.csproj
+++ b/Wabbajack.Lib/Wabbajack.Lib.csproj
@@ -72,8 +72,8 @@
+
-
diff --git a/Wabbajack.Test/SanityTests.cs b/Wabbajack.Test/SanityTests.cs
index a332b176..a4fa2a78 100644
--- a/Wabbajack.Test/SanityTests.cs
+++ b/Wabbajack.Test/SanityTests.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
using Wabbajack.Common;
using Wabbajack.Lib;
using Wabbajack.Lib.CompilationSteps.CompilationErrors;
diff --git a/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs b/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs
index 055983ec..694a5a2a 100644
--- a/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs
+++ b/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
using Wabbajack.Common;
namespace Wabbajack.VirtualFileSystem
diff --git a/Wabbajack.VirtualFileSystem/FileExtractor.cs b/Wabbajack.VirtualFileSystem/FileExtractor.cs
index 5f53c6b4..41bc64bd 100644
--- a/Wabbajack.VirtualFileSystem/FileExtractor.cs
+++ b/Wabbajack.VirtualFileSystem/FileExtractor.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Reactive.Linq;
using System.Threading.Tasks;
using Alphaleonis.Win32.Filesystem;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
using OMODFramework;
using Wabbajack.Common.StatusFeed;
using Wabbajack.Common.StatusFeed.Errors;
diff --git a/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj b/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj
index 146fa16b..8fe0e7fc 100644
--- a/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj
+++ b/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj
@@ -9,8 +9,8 @@
Wabbajack.VirtualFileSystem.xml
+
-
diff --git a/Wabbajack.sln b/Wabbajack.sln
index 16757883..745caef4 100644
--- a/Wabbajack.sln
+++ b/Wabbajack.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29102.190
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wabbajack.Common", "Wabbajack.Common\Wabbajack.Common.csproj", "{B3F3FB6E-B9EB-4F49-9875-D78578BC7AE5}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wabbajack.Compression.BSA", "Wabbajack.Compression.BSA\Wabbajack.Compression.BSA.csproj", "{FF5D892F-8FF4-44FC-8F7F-CD58F307AD1B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compression.BSA", "Compression.BSA\Compression.BSA.csproj", "{FF5D892F-8FF4-44FC-8F7F-CD58F307AD1B}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4EDEF6CC-2F5C-439B-BEAF-9D03895099F1}"
ProjectSection(SolutionItems) = preProject
diff --git a/Wabbajack/Wabbajack.csproj b/Wabbajack/Wabbajack.csproj
index 6266da13..bde3bcf8 100644
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@@ -80,9 +80,9 @@
+
-