diff --git a/application/GW2 Addon Updater/GW2 Addon Manager.sln b/application/GW2 Addon Manager.sln
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Manager.sln
rename to application/GW2 Addon Manager.sln
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/App.config b/application/GW2 Addon Updater/App.config
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/App.config
rename to application/GW2 Addon Updater/App.config
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/App.xaml b/application/GW2 Addon Updater/App.xaml
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/App.xaml
rename to application/GW2 Addon Updater/App.xaml
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/App.xaml.cs b/application/GW2 Addon Updater/App.xaml.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/App.xaml.cs
rename to application/GW2 Addon Updater/App.xaml.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/GW2 Addon Manager.csproj b/application/GW2 Addon Updater/GW2 Addon Manager.csproj
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/GW2 Addon Manager.csproj
rename to application/GW2 Addon Updater/GW2 Addon Manager.csproj
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/MainWindow.xaml b/application/GW2 Addon Updater/MainWindow.xaml
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/MainWindow.xaml
rename to application/GW2 Addon Updater/MainWindow.xaml
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/MainWindow.xaml.cs b/application/GW2 Addon Updater/MainWindow.xaml.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/MainWindow.xaml.cs
rename to application/GW2 Addon Updater/MainWindow.xaml.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/OpeningView.xaml b/application/GW2 Addon Updater/OpeningView.xaml
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/OpeningView.xaml
rename to application/GW2 Addon Updater/OpeningView.xaml
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/OpeningView.xaml.cs b/application/GW2 Addon Updater/OpeningView.xaml.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/OpeningView.xaml.cs
rename to application/GW2 Addon Updater/OpeningView.xaml.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/OpeningViewModel.cs b/application/GW2 Addon Updater/OpeningViewModel.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/OpeningViewModel.cs
rename to application/GW2 Addon Updater/OpeningViewModel.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/PluginManagement.cs b/application/GW2 Addon Updater/PluginManagement.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/PluginManagement.cs
rename to application/GW2 Addon Updater/PluginManagement.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Properties/AssemblyInfo.cs b/application/GW2 Addon Updater/Properties/AssemblyInfo.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Properties/AssemblyInfo.cs
rename to application/GW2 Addon Updater/Properties/AssemblyInfo.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Properties/Resources.Designer.cs b/application/GW2 Addon Updater/Properties/Resources.Designer.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Properties/Resources.Designer.cs
rename to application/GW2 Addon Updater/Properties/Resources.Designer.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Properties/Resources.resx b/application/GW2 Addon Updater/Properties/Resources.resx
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Properties/Resources.resx
rename to application/GW2 Addon Updater/Properties/Resources.resx
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Properties/Settings.Designer.cs b/application/GW2 Addon Updater/Properties/Settings.Designer.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Properties/Settings.Designer.cs
rename to application/GW2 Addon Updater/Properties/Settings.Designer.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Properties/Settings.settings b/application/GW2 Addon Updater/Properties/Settings.settings
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Properties/Settings.settings
rename to application/GW2 Addon Updater/Properties/Settings.settings
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Resources/Components/styles.xaml b/application/GW2 Addon Updater/Resources/Components/styles.xaml
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Resources/Components/styles.xaml
rename to application/GW2 Addon Updater/Resources/Components/styles.xaml
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Resources/GW2-UOAOU-UI.png b/application/GW2 Addon Updater/Resources/GW2-UOAOU-UI.png
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Resources/GW2-UOAOU-UI.png
rename to application/GW2 Addon Updater/Resources/GW2-UOAOU-UI.png
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Resources/GitHub-Mark-32px.png b/application/GW2 Addon Updater/Resources/GitHub-Mark-32px.png
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Resources/GitHub-Mark-32px.png
rename to application/GW2 Addon Updater/Resources/GitHub-Mark-32px.png
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Resources/logo.ico b/application/GW2 Addon Updater/Resources/logo.ico
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Resources/logo.ico
rename to application/GW2 Addon Updater/Resources/logo.ico
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/SelfUpdate.cs b/application/GW2 Addon Updater/SelfUpdate.cs
similarity index 94%
rename from application/GW2 Addon Updater/GW2 Addon Updater/SelfUpdate.cs
rename to application/GW2 Addon Updater/SelfUpdate.cs
index b74ebc1..5ff3694 100644
--- a/application/GW2 Addon Updater/GW2 Addon Updater/SelfUpdate.cs	
+++ b/application/GW2 Addon Updater/SelfUpdate.cs	
@@ -54,8 +54,6 @@ void selfUpdate_DownloadProgress(object sender, DownloadProgressChangedEventArgs
         {
             viewModel.UpdateDownloadProgress = e.ProgressPercentage;
         }
-
-        //TODO: Add reference to a special method that launches the updater to each place the program exits (x button, finish button, etc)
         public static void startUpdater()
         {
             Process.Start("UOAOM Updater.exe");
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/UpdateHelpers.cs b/application/GW2 Addon Updater/UpdateHelpers.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/UpdateHelpers.cs
rename to application/GW2 Addon Updater/UpdateHelpers.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/Updates.cs b/application/GW2 Addon Updater/Updates.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/Updates.cs
rename to application/GW2 Addon Updater/Updates.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/UpdatingView.xaml b/application/GW2 Addon Updater/UpdatingView.xaml
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/UpdatingView.xaml
rename to application/GW2 Addon Updater/UpdatingView.xaml
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/UpdatingView.xaml.cs b/application/GW2 Addon Updater/UpdatingView.xaml.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/UpdatingView.xaml.cs
rename to application/GW2 Addon Updater/UpdatingView.xaml.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/UpdatingViewModel.cs b/application/GW2 Addon Updater/UpdatingViewModel.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/UpdatingViewModel.cs
rename to application/GW2 Addon Updater/UpdatingViewModel.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/arcdps.cs b/application/GW2 Addon Updater/arcdps.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/arcdps.cs
rename to application/GW2 Addon Updater/arcdps.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/configuration.cs b/application/GW2 Addon Updater/configuration.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/configuration.cs
rename to application/GW2 Addon Updater/configuration.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/d912pxy.cs b/application/GW2 Addon Updater/d912pxy.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/d912pxy.cs
rename to application/GW2 Addon Updater/d912pxy.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/gw2radial.cs b/application/GW2 Addon Updater/gw2radial.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/gw2radial.cs
rename to application/GW2 Addon Updater/gw2radial.cs
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/packages.config b/application/GW2 Addon Updater/packages.config
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/packages.config
rename to application/GW2 Addon Updater/packages.config
diff --git a/application/GW2 Addon Updater/GW2 Addon Updater/potential features/gw2hook.cs b/application/GW2 Addon Updater/potential features/gw2hook.cs
similarity index 100%
rename from application/GW2 Addon Updater/GW2 Addon Updater/potential features/gw2hook.cs
rename to application/GW2 Addon Updater/potential features/gw2hook.cs
diff --git a/application/GW2 Addon Updater/UOAOM Updater/Program.cs b/application/UOAOM Updater/Program.cs
similarity index 65%
rename from application/GW2 Addon Updater/UOAOM Updater/Program.cs
rename to application/UOAOM Updater/Program.cs
index f74b5cf..40ca269 100644
--- a/application/GW2 Addon Updater/UOAOM Updater/Program.cs	
+++ b/application/UOAOM Updater/Program.cs	
@@ -14,6 +14,8 @@ static void Main(string[] args)
         {
             //race condition handicap. TODO: um, MAKE THIS NOT A RACE CONDITION lol
             //(idk, have another helper process that starts on close button pressed in main app, waits until main app's process is closed, then starts this updater and closes itself?)
+            //
+            //add clause to retry an extraction if it doesn't work?
             System.Threading.Thread.Sleep(3000);
 
             if (Directory.Exists(update_folder))
@@ -26,7 +28,19 @@ static void Main(string[] args)
                         if (string.IsNullOrEmpty(entry.Name))
                             Directory.CreateDirectory(entry.FullName);
                         else if (entry.FullName != "UOAOM updater.exe")
-                            entry.ExtractToFile(Path.Combine(Directory.GetCurrentDirectory(), entry.FullName), true);
+                        {
+                            try
+                            {
+                                entry.ExtractToFile(Path.Combine(Directory.GetCurrentDirectory(), entry.FullName), true);
+                            }
+                            catch (IOException e)
+                            {
+                                System.Threading.Thread.Sleep(3000);
+                                entry.ExtractToFile(Path.Combine(Directory.GetCurrentDirectory(), entry.FullName), true);
+                            }
+                            
+                        }
+                            
                     }
                     zip.Close();
                 }
diff --git a/application/GW2 Addon Updater/UOAOM Updater/Properties/AssemblyInfo.cs b/application/UOAOM Updater/Properties/AssemblyInfo.cs
similarity index 100%
rename from application/GW2 Addon Updater/UOAOM Updater/Properties/AssemblyInfo.cs
rename to application/UOAOM Updater/Properties/AssemblyInfo.cs
diff --git a/application/GW2 Addon Updater/UOAOM Updater/UOAOM Updater.csproj b/application/UOAOM Updater/UOAOM Updater.csproj
similarity index 100%
rename from application/GW2 Addon Updater/UOAOM Updater/UOAOM Updater.csproj
rename to application/UOAOM Updater/UOAOM Updater.csproj