diff --git a/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs b/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs
index fbf54f4..40a4dd8 100644
--- a/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs
+++ b/AM2RLauncher/AM2RLauncher/LauncherUpdater.cs
@@ -1,5 +1,4 @@
 using AM2RLauncherLib;
-using AM2RLauncher;
 using Eto.Forms;
 using log4net;
 using System;
@@ -19,7 +18,7 @@ namespace AM2RLauncher
         // Auto updating is fun!
 
         /// <summary>The Version that identifies this current release.</summary>
-        public const string VERSION = AM2RLauncherLib.Core.Version;
+        public const string VERSION = Core.Version;
 
         /// <summary>The Path of the oldConfig. Only gets used Windows-only</summary>
         private static readonly string oldConfigPath = CrossPlatformOperations.CurrentPath + "/" + CrossPlatformOperations.LauncherName + ".oldCfg";
diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Events.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Events.cs
index 3de164d..aba5bdc 100644
--- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Events.cs
+++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.Events.cs
@@ -84,7 +84,7 @@ namespace AM2RLauncher
 
             WriteToConfig("Width", ClientSize.Width);
             WriteToConfig("Height", ClientSize.Height);
-            WriteToConfig("IsMaximized", this.WindowState == WindowState.Maximized);
+            WriteToConfig("IsMaximized", WindowState == WindowState.Maximized);
             WriteToConfig("ProfileIndex", profileIndex.ToString());
 
             switch (updateState)
@@ -126,8 +126,8 @@ namespace AM2RLauncher
         {
             log.Info("User has opened the launcher from system tray.");
 
-            this.Show();
-            this.BringToFront();
+            Show();
+            BringToFront();
         }
 
         #endregion
@@ -158,7 +158,7 @@ namespace AM2RLauncher
                 // TODO: why do we delete patchdata if user cancels pulling?
                 log.Info(ex.Message);
                 MessageBox.Show(this, Text.CorruptPatchData, Text.ErrorWindowTitle, MessageBoxType.Error);
-                HelperMethods.DeleteDirectory(AM2RLauncherLib.Core.PatchDataPath);
+                HelperMethods.DeleteDirectory(Core.PatchDataPath);
             }
             // This is for any exceptions from libgit
             catch (LibGit2SharpException ex)
@@ -202,7 +202,7 @@ namespace AM2RLauncher
             // Also, add a non-installable profile for it so people can access the older version or delete it from the mod manager.
             if ((profileList.Count > 0) && Profile.IsProfileInstalled(profileList[0]))
             {
-                ProfileXML installedUpdatesProfile = Serializer.Deserialize<ProfileXML>(File.ReadAllText(AM2RLauncherLib.Core.ProfilesPath + "/Community Updates (Latest)/profile.xml"));
+                ProfileXML installedUpdatesProfile = Serializer.Deserialize<ProfileXML>(File.ReadAllText(Core.ProfilesPath + "/Community Updates (Latest)/profile.xml"));
 
                 if (installedUpdatesProfile.Version != profileList[0].Version)
                 {
@@ -247,14 +247,14 @@ namespace AM2RLauncher
                     try
                     {
                         // Cleanup invalid PatchData directory if it exists
-                        if (Directory.Exists(AM2RLauncherLib.Core.PatchDataPath))
+                        if (Directory.Exists(Core.PatchDataPath))
                         {
                             log.Info("PatchData directory already exists, cleaning up...");
-                            HelperMethods.DeleteDirectory(AM2RLauncherLib.Core.PatchDataPath);
+                            HelperMethods.DeleteDirectory(Core.PatchDataPath);
                         }
 
                         // Separate thread so launcher doesn't get locked
-                        await Task.Run(() => Repository.Clone(currentMirror, AM2RLauncherLib.Core.PatchDataPath, cloneOptions));
+                        await Task.Run(() => Repository.Clone(currentMirror, Core.PatchDataPath, cloneOptions));
                     }
                     // We deliberately cancelled this, so no error handling
                     catch (UserCancelledException)
@@ -276,8 +276,8 @@ namespace AM2RLauncher
                         {
                             log.Error("LibGit2SharpException: " + ex.Message + "\n*****Stack Trace*****\n\n" + ex.StackTrace);
                             MessageBox.Show(this, ex.Message + "\n*****Stack Trace*****\n\n" + ex.StackTrace, Text.ErrorWindowTitle, MessageBoxType.Error);
-                            if (Directory.Exists(AM2RLauncherLib.Core.PatchDataPath))
-                                HelperMethods.DeleteDirectory(AM2RLauncherLib.Core.PatchDataPath);
+                            if (Directory.Exists(Core.PatchDataPath))
+                                HelperMethods.DeleteDirectory(Core.PatchDataPath);
                         }
                         successful = false;
                     }
@@ -288,7 +288,7 @@ namespace AM2RLauncher
                         MessageBox.Show(this, ex.Message + "\n*****Stack Trace*****\n\n" + ex.StackTrace, Text.ErrorWindowTitle, MessageBoxType.Error);
 
                         if (Directory.Exists(CrossPlatformOperations.CurrentPath + " / PatchData"))
-                            HelperMethods.DeleteDirectory(AM2RLauncherLib.Core.PatchDataPath);
+                            HelperMethods.DeleteDirectory(Core.PatchDataPath);
                         successful = false;
                     }
 
@@ -365,8 +365,8 @@ namespace AM2RLauncher
                     }
 
                     // We check if it exists first, because someone coughDRUIDcough might've copied it into here while on the showDialog
-                    if (fileFinder.FileName != AM2RLauncherLib.Core.AM2R11File)
-                        File.Copy(fileFinder.FileName, AM2RLauncherLib.Core.AM2R11File);
+                    if (fileFinder.FileName != Core.AM2R11File)
+                        File.Copy(fileFinder.FileName, Core.AM2R11File);
 
                     log.Info("AM2R_11.zip successfully imported.");
                     UpdateStateMachine();
@@ -428,9 +428,9 @@ namespace AM2RLauncher
                     UpdateApkState();
                     UpdateProfileState();
 
-                    this.ShowInTaskbar = false;
+                    ShowInTaskbar = false;
                     trayIndicator.Visible = true;
-                    WindowState windowStateBeforeLaunching = this.WindowState;
+                    WindowState windowStateBeforeLaunching = WindowState;
                     Minimize();
 
                     string envVarText = customEnvVarTextBox?.Text;
@@ -438,7 +438,7 @@ namespace AM2RLauncher
 
                     await Task.Run(() => Profile.RunGame(profile, createDebugLogs, envVarText));
 
-                    this.ShowInTaskbar = true;
+                    ShowInTaskbar = true;
                     trayIndicator.Visible = false;
                     Show();
                     BringToFront();
@@ -607,7 +607,7 @@ namespace AM2RLauncher
             log.Info("Overwriting mirror in gitconfig.");
 
             // Check if the gitConfig exists, if yes regex the gitURL, and replace it with the new current Mirror.
-            string gitConfigPath = AM2RLauncherLib.Core.PatchDataPath + "/.git/config";
+            string gitConfigPath = Core.PatchDataPath + "/.git/config";
             if (!File.Exists(gitConfigPath)) return;
 
             string gitConfig = File.ReadAllText(gitConfigPath);
@@ -660,7 +660,7 @@ namespace AM2RLauncher
             log.Info("Overwriting mirror in gitconfig.");
 
             // Check if the gitConfig exists, if yes regex the gitURL, and replace it with the new current Mirror.
-            string gitConfigPath = AM2RLauncherLib.Core.PatchDataPath + "/.git/config";
+            string gitConfigPath = Core.PatchDataPath + "/.git/config";
             if (!File.Exists(gitConfigPath)) return;
             string gitConfig = File.ReadAllText(gitConfigPath);
             Match match = gitURLRegex.Match(gitConfig);
@@ -712,7 +712,7 @@ namespace AM2RLauncher
 
             FileInfo modFile = new FileInfo(fileFinder.FileName);
             string modFileName = Path.GetFileNameWithoutExtension(modFile.Name);
-            string extractedModDir = AM2RLauncherLib.Core.ModsPath + "/" + modFileName;
+            string extractedModDir = Core.ModsPath + "/" + modFileName;
 
             // Check first, if the directory is already there, if yes, throw error
             if (Directory.Exists(extractedModDir))
@@ -795,7 +795,7 @@ namespace AM2RLauncher
                 updateModButton.ToolTip = HelperMethods.GetText(Text.UpdateModButtonToolTip, profileName);
             }
 
-            profileButton.Enabled = Directory.Exists(AM2RLauncherLib.Core.ProfilesPath + "/" + profileName);
+            profileButton.Enabled = Directory.Exists(Core.ProfilesPath + "/" + profileName);
             profileButton.ToolTip = HelperMethods.GetText(Text.OpenProfileFolderToolTip, profileName);
             saveButton.Enabled = true;
             saveButton.ToolTip = HelperMethods.GetText(Text.OpenSaveFolderToolTip, profileName);
@@ -816,7 +816,7 @@ namespace AM2RLauncher
                 return;
             ProfileXML profile = profileList[modSettingsProfileDropDown.SelectedIndex];
             log.Info("User opened the profile directory for profile " + profile.Name + ", which is " + profile.SaveLocation);
-            CrossPlatformOperations.OpenFolder(AM2RLauncherLib.Core.ProfilesPath + "/" + profile.Name);
+            CrossPlatformOperations.OpenFolder(Core.ProfilesPath + "/" + profile.Name);
         }
 
         /// <summary>
@@ -886,7 +886,7 @@ namespace AM2RLauncher
 
             FileInfo modFile = new FileInfo(fileFinder.FileName);
             string extractedName = Path.GetFileNameWithoutExtension(modFile.Name) + "_new";
-            string extractedModDir = AM2RLauncherLib.Core.ModsPath + "/" + extractedName;
+            string extractedModDir = Core.ModsPath + "/" + extractedName;
 
             // If for some reason old files remain, delete them so that extraction doesn't throw
             if (Directory.Exists(extractedModDir))
@@ -940,7 +940,7 @@ namespace AM2RLauncher
             DeleteProfileAndAdjustLists(currentProfile);
 
             // Rename directory to take the old one's place
-            string originalFolder = AM2RLauncherLib.Core.ModsPath + "/" + Path.GetFileNameWithoutExtension(modFile.Name);
+            string originalFolder = Core.ModsPath + "/" + Path.GetFileNameWithoutExtension(modFile.Name);
             Directory.Move(extractedModDir, originalFolder);
 
             // Adjust our lists so it gets recognized
diff --git a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs
index b3cf138..d56cc78 100644
--- a/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs
+++ b/AM2RLauncher/AM2RLauncher/MainForm/MainForm.UI.cs
@@ -78,9 +78,9 @@ namespace AM2RLauncher
         /// </summary>
         private static string currentMirror;
 
-        private static readonly bool isInternetThere = AM2RLauncherLib.Core.IsInternetThere;
+        private static readonly bool isInternetThere = Core.IsInternetThere;
 
-        private static readonly bool isThisRunningFromWine = AM2RLauncherLib.OS.IsThisRunningFromWine;
+        private static readonly bool isThisRunningFromWine = OS.IsThisRunningFromWine;
 
         private static bool singleInstance;
 
@@ -100,7 +100,7 @@ namespace AM2RLauncher
                     Process current = Process.GetCurrentProcess();
                     Process process = Process.GetProcessesByName(current.ProcessName).First(p => p.Id == current.Id);
                     if (process != null)
-                        AM2RLauncherLib.Core.SetForegroundWindow(process.MainWindowHandle);
+                        Core.SetForegroundWindow(process.MainWindowHandle);
                 }
                 Environment.Exit(0);
             }