diff --git a/RhythmBullet/Zer01HD/Audio/MusicController.cs b/RhythmBullet/Audio/MusicController.cs
similarity index 98%
rename from RhythmBullet/Zer01HD/Audio/MusicController.cs
rename to RhythmBullet/Audio/MusicController.cs
index 299e0eb..675e3a6 100644
--- a/RhythmBullet/Zer01HD/Audio/MusicController.cs
+++ b/RhythmBullet/Audio/MusicController.cs
@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Audio
+namespace RhythmBullet.Audio
{
internal class MusicController : IDisposable
{
diff --git a/RhythmBullet/Zer01HD/Audio/MusicList.cs b/RhythmBullet/Audio/MusicList.cs
similarity index 98%
rename from RhythmBullet/Zer01HD/Audio/MusicList.cs
rename to RhythmBullet/Audio/MusicList.cs
index 877c6ef..414615f 100644
--- a/RhythmBullet/Zer01HD/Audio/MusicList.cs
+++ b/RhythmBullet/Audio/MusicList.cs
@@ -8,7 +8,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Audio
+namespace RhythmBullet.Audio
{
internal delegate void SearchListener(MusicList musicList);
diff --git a/RhythmBullet/Zer01HD/Audio/SupportedFormats.cs b/RhythmBullet/Audio/SupportedFormats.cs
similarity index 83%
rename from RhythmBullet/Zer01HD/Audio/SupportedFormats.cs
rename to RhythmBullet/Audio/SupportedFormats.cs
index d18944d..7fbf9ff 100644
--- a/RhythmBullet/Zer01HD/Audio/SupportedFormats.cs
+++ b/RhythmBullet/Audio/SupportedFormats.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Audio
+namespace RhythmBullet.Audio
{
public enum SupportedFormats
{
diff --git a/RhythmBullet/Zer01HD/Audio/TransparentSampleProvider.cs b/RhythmBullet/Audio/TransparentSampleProvider.cs
similarity index 98%
rename from RhythmBullet/Zer01HD/Audio/TransparentSampleProvider.cs
rename to RhythmBullet/Audio/TransparentSampleProvider.cs
index 7e530c5..fef6c01 100644
--- a/RhythmBullet/Zer01HD/Audio/TransparentSampleProvider.cs
+++ b/RhythmBullet/Audio/TransparentSampleProvider.cs
@@ -7,7 +7,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Audio
+namespace RhythmBullet.Audio
{
public class TransparentSampleProvider : ISampleProvider
{
diff --git a/RhythmBullet/Zer01HD/Audio/Visualizer/HorizontalVisualizer.cs b/RhythmBullet/Audio/Visualizer/HorizontalVisualizer.cs
similarity index 97%
rename from RhythmBullet/Zer01HD/Audio/Visualizer/HorizontalVisualizer.cs
rename to RhythmBullet/Audio/Visualizer/HorizontalVisualizer.cs
index 3d4c180..4f5bf08 100644
--- a/RhythmBullet/Zer01HD/Audio/Visualizer/HorizontalVisualizer.cs
+++ b/RhythmBullet/Audio/Visualizer/HorizontalVisualizer.cs
@@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-using RhythmBullet.Zer01HD.UI.Modular;
+using RhythmBullet.UI.Modular;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Audio.Visualizer
+namespace RhythmBullet.Audio.Visualizer
{
internal class HorizontalVisualizer : UIModule, IDisposable
{
diff --git a/RhythmBullet/Zer01HD/ContentResolvers/FontContentResolver.cs b/RhythmBullet/ContentResolvers/FontContentResolver.cs
similarity index 82%
rename from RhythmBullet/Zer01HD/ContentResolvers/FontContentResolver.cs
rename to RhythmBullet/ContentResolvers/FontContentResolver.cs
index 05fd46d..975e926 100644
--- a/RhythmBullet/Zer01HD/ContentResolvers/FontContentResolver.cs
+++ b/RhythmBullet/ContentResolvers/FontContentResolver.cs
@@ -1,11 +1,11 @@
-using RhythmBullet.Zer01HD.Utilities.ContentSystem;
+using RhythmBullet.Utilities.ContentSystem;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.ContentResolvers
+namespace RhythmBullet.ContentResolvers
{
class FontContentResolver : IContentPathModifier
{
diff --git a/RhythmBullet/Zer01HD/ContentResolvers/ResolutionContentResolver.cs b/RhythmBullet/ContentResolvers/ResolutionContentResolver.cs
similarity index 91%
rename from RhythmBullet/Zer01HD/ContentResolvers/ResolutionContentResolver.cs
rename to RhythmBullet/ContentResolvers/ResolutionContentResolver.cs
index 0dbb8b1..265c455 100644
--- a/RhythmBullet/Zer01HD/ContentResolvers/ResolutionContentResolver.cs
+++ b/RhythmBullet/ContentResolvers/ResolutionContentResolver.cs
@@ -1,14 +1,14 @@
-using RhythmBullet.Zer01HD.Preferences;
-using RhythmBullet.Zer01HD.Utilities;
-using RhythmBullet.Zer01HD.Utilities.ContentSystem;
-using RhythmBullet.Zer01HD.Utilities.DataTypes;
+using RhythmBullet.Preferences;
+using RhythmBullet.Utilities;
+using RhythmBullet.Utilities.ContentSystem;
+using RhythmBullet.Utilities.DataTypes;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.ContentResolvers
+namespace RhythmBullet.ContentResolvers
{
class ResolutionContentResolver : IContentPathModifier
{
diff --git a/RhythmBullet/Zer01HD/Preferences/Controls.cs b/RhythmBullet/Preferences/Controls.cs
similarity index 77%
rename from RhythmBullet/Zer01HD/Preferences/Controls.cs
rename to RhythmBullet/Preferences/Controls.cs
index f5e29d8..176d4db 100644
--- a/RhythmBullet/Zer01HD/Preferences/Controls.cs
+++ b/RhythmBullet/Preferences/Controls.cs
@@ -1,7 +1,7 @@
using Microsoft.Xna.Framework.Input;
-using RhythmBullet.Zer01HD.Utilities.Persistence;
+using RhythmBullet.Utilities.Persistence;
-namespace RhythmBullet.Zer01HD.Preferences
+namespace RhythmBullet.Preferences
{
public class Controls : Utilities.Persistence.Preferences
{
diff --git a/RhythmBullet/Zer01HD/Preferences/General.cs b/RhythmBullet/Preferences/General.cs
similarity index 74%
rename from RhythmBullet/Zer01HD/Preferences/General.cs
rename to RhythmBullet/Preferences/General.cs
index bc0f105..7de677a 100644
--- a/RhythmBullet/Zer01HD/Preferences/General.cs
+++ b/RhythmBullet/Preferences/General.cs
@@ -1,9 +1,9 @@
using System;
using System.Xml.Serialization;
-using RhythmBullet.Zer01HD.Utilities.DataTypes;
-using RhythmBullet.Zer01HD.Utilities.Persistence;
+using RhythmBullet.Utilities.DataTypes;
+using RhythmBullet.Utilities.Persistence;
-namespace RhythmBullet.Zer01HD.Preferences
+namespace RhythmBullet.Preferences
{
public class General : Utilities.Persistence.Preferences
{
diff --git a/RhythmBullet/RhythmBullet.csproj b/RhythmBullet/RhythmBullet.csproj
index 15c2cfe..ce45fae 100644
--- a/RhythmBullet/RhythmBullet.csproj
+++ b/RhythmBullet/RhythmBullet.csproj
@@ -47,44 +47,44 @@
true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/RhythmBullet/RhythmBulletGame.cs b/RhythmBullet/RhythmBulletGame.cs
index 56a5484..d94d17e 100644
--- a/RhythmBullet/RhythmBulletGame.cs
+++ b/RhythmBullet/RhythmBulletGame.cs
@@ -1,17 +1,17 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
-using RhythmBullet.Zer01HD.Audio;
-using RhythmBullet.Zer01HD.ContentResolvers;
-using RhythmBullet.Zer01HD.Preferences;
-using RhythmBullet.Zer01HD.Screens.MainMenu;
-using RhythmBullet.Zer01HD.Utilities;
-using RhythmBullet.Zer01HD.Utilities.Camera;
-using RhythmBullet.Zer01HD.Utilities.ContentSystem;
-using RhythmBullet.Zer01HD.Utilities.DataTypes;
-using RhythmBullet.Zer01HD.Utilities.Input;
-using RhythmBullet.Zer01HD.Utilities.Persistence;
-using RhythmBullet.Zer01HD.Utilities.ScreenSystem;
+using RhythmBullet.Audio;
+using RhythmBullet.ContentResolvers;
+using RhythmBullet.Preferences;
+using RhythmBullet.Screens.MainMenu;
+using RhythmBullet.Utilities;
+using RhythmBullet.Utilities.Camera;
+using RhythmBullet.Utilities.ContentSystem;
+using RhythmBullet.Utilities.DataTypes;
+using RhythmBullet.Utilities.Input;
+using RhythmBullet.Utilities.Persistence;
+using RhythmBullet.Utilities.ScreenSystem;
using System;
using System.Diagnostics;
diff --git a/RhythmBullet/Zer01HD/Screens/MainMenu/MainPage.cs b/RhythmBullet/Screens/MainMenu/MainPage.cs
similarity index 79%
rename from RhythmBullet/Zer01HD/Screens/MainMenu/MainPage.cs
rename to RhythmBullet/Screens/MainMenu/MainPage.cs
index c216d60..adecf65 100644
--- a/RhythmBullet/Zer01HD/Screens/MainMenu/MainPage.cs
+++ b/RhythmBullet/Screens/MainMenu/MainPage.cs
@@ -1,10 +1,10 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-using RhythmBullet.Zer01HD.UI.Book;
-using RhythmBullet.Zer01HD.Utilities.ContentSystem;
-using RhythmBullet.Zer01HD.Utilities.UI.Modular.Modules;
+using RhythmBullet.UI.Book;
+using RhythmBullet.Utilities.ContentSystem;
+using RhythmBullet.Utilities.UI.Modular.Modules;
-namespace RhythmBullet.Zer01HD.Screens.MainMenu
+namespace RhythmBullet.Screens.MainMenu
{
internal class MainPage : Page
{
diff --git a/RhythmBullet/Zer01HD/Screens/MainMenu/MainScreen.cs b/RhythmBullet/Screens/MainMenu/MainScreen.cs
similarity index 83%
rename from RhythmBullet/Zer01HD/Screens/MainMenu/MainScreen.cs
rename to RhythmBullet/Screens/MainMenu/MainScreen.cs
index 3da8810..8c9df39 100644
--- a/RhythmBullet/Zer01HD/Screens/MainMenu/MainScreen.cs
+++ b/RhythmBullet/Screens/MainMenu/MainScreen.cs
@@ -3,14 +3,14 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
-using RhythmBullet.Zer01HD.Screens.Transitions;
-using RhythmBullet.Zer01HD.UI.Book;
-using RhythmBullet.Zer01HD.Utilities.Camera;
-using RhythmBullet.Zer01HD.Utilities.ContentSystem;
-using RhythmBullet.Zer01HD.Utilities.ScreenSystem;
+using RhythmBullet.Screens.Transitions;
+using RhythmBullet.UI.Book;
+using RhythmBullet.Utilities.Camera;
+using RhythmBullet.Utilities.ContentSystem;
+using RhythmBullet.Utilities.ScreenSystem;
using System;
-namespace RhythmBullet.Zer01HD.Screens.MainMenu
+namespace RhythmBullet.Screens.MainMenu
{
class MainScreen : Screen
{
diff --git a/RhythmBullet/Zer01HD/Screens/Transitions/FadeAwayTransition.cs b/RhythmBullet/Screens/Transitions/FadeAwayTransition.cs
similarity index 94%
rename from RhythmBullet/Zer01HD/Screens/Transitions/FadeAwayTransition.cs
rename to RhythmBullet/Screens/Transitions/FadeAwayTransition.cs
index 710bbb5..cd8df53 100644
--- a/RhythmBullet/Zer01HD/Screens/Transitions/FadeAwayTransition.cs
+++ b/RhythmBullet/Screens/Transitions/FadeAwayTransition.cs
@@ -1,7 +1,7 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-using RhythmBullet.Zer01HD.Utilities.UI;
-using RhythmBullet.Zer01HD.Utilities.ScreenSystem;
+using RhythmBullet.Utilities.UI;
+using RhythmBullet.Utilities.ScreenSystem;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -9,7 +9,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Screens.Transitions
+namespace RhythmBullet.Screens.Transitions
{
internal class FadeAwayTransition : IDisposable, ITransition
{
diff --git a/RhythmBullet/Zer01HD/Utilities/Camera/Camera2D.cs b/RhythmBullet/Utilities/Camera/Camera2D.cs
similarity index 96%
rename from RhythmBullet/Zer01HD/Utilities/Camera/Camera2D.cs
rename to RhythmBullet/Utilities/Camera/Camera2D.cs
index efe9039..904bc05 100644
--- a/RhythmBullet/Zer01HD/Utilities/Camera/Camera2D.cs
+++ b/RhythmBullet/Utilities/Camera/Camera2D.cs
@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.Camera
+namespace RhythmBullet.Utilities.Camera
{
public class Camera2D
{
diff --git a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentLoad.cs b/RhythmBullet/Utilities/ContentSystem/ContentLoad.cs
similarity index 89%
rename from RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentLoad.cs
rename to RhythmBullet/Utilities/ContentSystem/ContentLoad.cs
index 3ffcb04..52e1318 100644
--- a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentLoad.cs
+++ b/RhythmBullet/Utilities/ContentSystem/ContentLoad.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
+namespace RhythmBullet.Utilities.ContentSystem
{
struct LoadableContent
{
diff --git a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentManagerController.cs b/RhythmBullet/Utilities/ContentSystem/ContentManagerController.cs
similarity index 98%
rename from RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentManagerController.cs
rename to RhythmBullet/Utilities/ContentSystem/ContentManagerController.cs
index b83e28c..06babc2 100644
--- a/RhythmBullet/Zer01HD/Utilities/ContentSystem/ContentManagerController.cs
+++ b/RhythmBullet/Utilities/ContentSystem/ContentManagerController.cs
@@ -9,7 +9,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
+namespace RhythmBullet.Utilities.ContentSystem
{
public class ContentManagerController
{
diff --git a/RhythmBullet/Zer01HD/Utilities/ContentSystem/IContentPathModifier.cs b/RhythmBullet/Utilities/ContentSystem/IContentPathModifier.cs
similarity index 88%
rename from RhythmBullet/Zer01HD/Utilities/ContentSystem/IContentPathModifier.cs
rename to RhythmBullet/Utilities/ContentSystem/IContentPathModifier.cs
index b864e0d..7ef1219 100644
--- a/RhythmBullet/Zer01HD/Utilities/ContentSystem/IContentPathModifier.cs
+++ b/RhythmBullet/Utilities/ContentSystem/IContentPathModifier.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
+namespace RhythmBullet.Utilities.ContentSystem
{
public interface IContentPathModifier
{
diff --git a/RhythmBullet/Zer01HD/Utilities/ContentSystem/NormalContentResolver.cs b/RhythmBullet/Utilities/ContentSystem/NormalContentResolver.cs
similarity index 83%
rename from RhythmBullet/Zer01HD/Utilities/ContentSystem/NormalContentResolver.cs
rename to RhythmBullet/Utilities/ContentSystem/NormalContentResolver.cs
index 158cf2e..b470c50 100644
--- a/RhythmBullet/Zer01HD/Utilities/ContentSystem/NormalContentResolver.cs
+++ b/RhythmBullet/Utilities/ContentSystem/NormalContentResolver.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.ContentSystem
+namespace RhythmBullet.Utilities.ContentSystem
{
class NormalContentResolver : IContentPathModifier
{
diff --git a/RhythmBullet/Zer01HD/Utilities/DataTypes/Resolution.cs b/RhythmBullet/Utilities/DataTypes/Resolution.cs
similarity index 93%
rename from RhythmBullet/Zer01HD/Utilities/DataTypes/Resolution.cs
rename to RhythmBullet/Utilities/DataTypes/Resolution.cs
index 19f7fc9..230e732 100644
--- a/RhythmBullet/Zer01HD/Utilities/DataTypes/Resolution.cs
+++ b/RhythmBullet/Utilities/DataTypes/Resolution.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.DataTypes
+namespace RhythmBullet.Utilities.DataTypes
{
public class Resolution : IComparable
{
diff --git a/RhythmBullet/Zer01HD/Utilities/Input/IInputListener.cs b/RhythmBullet/Utilities/Input/IInputListener.cs
similarity index 87%
rename from RhythmBullet/Zer01HD/Utilities/Input/IInputListener.cs
rename to RhythmBullet/Utilities/Input/IInputListener.cs
index bd8423e..bfe33a4 100644
--- a/RhythmBullet/Zer01HD/Utilities/Input/IInputListener.cs
+++ b/RhythmBullet/Utilities/Input/IInputListener.cs
@@ -5,7 +5,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.Input
+namespace RhythmBullet.Utilities.Input
{
public interface IInputListener
{
diff --git a/RhythmBullet/Zer01HD/Utilities/Input/InputListener.cs b/RhythmBullet/Utilities/Input/InputListener.cs
similarity index 90%
rename from RhythmBullet/Zer01HD/Utilities/Input/InputListener.cs
rename to RhythmBullet/Utilities/Input/InputListener.cs
index 4da5d1c..95280f1 100644
--- a/RhythmBullet/Zer01HD/Utilities/Input/InputListener.cs
+++ b/RhythmBullet/Utilities/Input/InputListener.cs
@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using Microsoft.Xna.Framework.Input;
-namespace RhythmBullet.Zer01HD.Utilities.Input
+namespace RhythmBullet.Utilities.Input
{
class InputListener : IInputListener
{
diff --git a/RhythmBullet/Zer01HD/Utilities/Input/InputUtilities.cs b/RhythmBullet/Utilities/Input/InputUtilities.cs
similarity index 96%
rename from RhythmBullet/Zer01HD/Utilities/Input/InputUtilities.cs
rename to RhythmBullet/Utilities/Input/InputUtilities.cs
index 3425c60..d36788e 100644
--- a/RhythmBullet/Zer01HD/Utilities/Input/InputUtilities.cs
+++ b/RhythmBullet/Utilities/Input/InputUtilities.cs
@@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Input;
-using RhythmBullet.Zer01HD.Utilities.Input;
+using RhythmBullet.Utilities.Input;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.Input
+namespace RhythmBullet.Utilities.Input
{
public static class InputUtilities
{
diff --git a/RhythmBullet/Zer01HD/Utilities/ParticleSystem/Particle.cs b/RhythmBullet/Utilities/ParticleSystem/Particle.cs
similarity index 73%
rename from RhythmBullet/Zer01HD/Utilities/ParticleSystem/Particle.cs
rename to RhythmBullet/Utilities/ParticleSystem/Particle.cs
index 76db402..e61266a 100644
--- a/RhythmBullet/Zer01HD/Utilities/ParticleSystem/Particle.cs
+++ b/RhythmBullet/Utilities/ParticleSystem/Particle.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.ParticleSystem
+namespace RhythmBullet.Utilities.ParticleSystem
{
class Particle
{
diff --git a/RhythmBullet/Zer01HD/Utilities/Persistence/Preferences.cs b/RhythmBullet/Utilities/Persistence/Preferences.cs
similarity index 78%
rename from RhythmBullet/Zer01HD/Utilities/Persistence/Preferences.cs
rename to RhythmBullet/Utilities/Persistence/Preferences.cs
index 7583b0e..85dbe2c 100644
--- a/RhythmBullet/Zer01HD/Utilities/Persistence/Preferences.cs
+++ b/RhythmBullet/Utilities/Persistence/Preferences.cs
@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using System.Xml.Serialization;
-namespace RhythmBullet.Zer01HD.Utilities.Persistence
+namespace RhythmBullet.Utilities.Persistence
{
public class Preferences
{
diff --git a/RhythmBullet/Zer01HD/Utilities/Persistence/PreferencesManager.cs b/RhythmBullet/Utilities/Persistence/PreferencesManager.cs
similarity index 96%
rename from RhythmBullet/Zer01HD/Utilities/Persistence/PreferencesManager.cs
rename to RhythmBullet/Utilities/Persistence/PreferencesManager.cs
index 0d59932..397afc1 100644
--- a/RhythmBullet/Zer01HD/Utilities/Persistence/PreferencesManager.cs
+++ b/RhythmBullet/Utilities/Persistence/PreferencesManager.cs
@@ -1,11 +1,11 @@
-using RhythmBullet.Zer01HD.Preferences;
+using RhythmBullet.Preferences;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Xml.Serialization;
-namespace RhythmBullet.Zer01HD.Utilities.Persistence
+namespace RhythmBullet.Utilities.Persistence
{
public class PreferencesManager
{
diff --git a/RhythmBullet/Zer01HD/Utilities/ScreenSystem/ITransition.cs b/RhythmBullet/Utilities/ScreenSystem/ITransition.cs
similarity index 97%
rename from RhythmBullet/Zer01HD/Utilities/ScreenSystem/ITransition.cs
rename to RhythmBullet/Utilities/ScreenSystem/ITransition.cs
index 3ae93a3..a2a58fb 100644
--- a/RhythmBullet/Zer01HD/Utilities/ScreenSystem/ITransition.cs
+++ b/RhythmBullet/Utilities/ScreenSystem/ITransition.cs
@@ -6,7 +6,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.ScreenSystem
+namespace RhythmBullet.Utilities.ScreenSystem
{
public interface ITransition
{
diff --git a/RhythmBullet/Zer01HD/Utilities/ScreenSystem/LoadingScreen.cs b/RhythmBullet/Utilities/ScreenSystem/LoadingScreen.cs
similarity index 98%
rename from RhythmBullet/Zer01HD/Utilities/ScreenSystem/LoadingScreen.cs
rename to RhythmBullet/Utilities/ScreenSystem/LoadingScreen.cs
index 029643f..3d79dae 100644
--- a/RhythmBullet/Zer01HD/Utilities/ScreenSystem/LoadingScreen.cs
+++ b/RhythmBullet/Utilities/ScreenSystem/LoadingScreen.cs
@@ -5,7 +5,7 @@ using Microsoft.Xna.Framework.Graphics;
using System;
using System.Diagnostics;
-namespace RhythmBullet.Zer01HD.Utilities.ScreenSystem
+namespace RhythmBullet.Utilities.ScreenSystem
{
public class LoadingScreen : Screen, ITransition
{
diff --git a/RhythmBullet/Zer01HD/Utilities/ScreenSystem/Screen.cs b/RhythmBullet/Utilities/ScreenSystem/Screen.cs
similarity index 97%
rename from RhythmBullet/Zer01HD/Utilities/ScreenSystem/Screen.cs
rename to RhythmBullet/Utilities/ScreenSystem/Screen.cs
index 7268ca6..4c0ae13 100644
--- a/RhythmBullet/Zer01HD/Utilities/ScreenSystem/Screen.cs
+++ b/RhythmBullet/Utilities/ScreenSystem/Screen.cs
@@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-using RhythmBullet.Zer01HD.Utilities.Camera;
+using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.ScreenSystem
+namespace RhythmBullet.Utilities.ScreenSystem
{
public enum ScreenState { EnterTransition, ExitTransition, Normal }
diff --git a/RhythmBullet/Zer01HD/Utilities/ScreenSystem/ScreenManager.cs b/RhythmBullet/Utilities/ScreenSystem/ScreenManager.cs
similarity index 98%
rename from RhythmBullet/Zer01HD/Utilities/ScreenSystem/ScreenManager.cs
rename to RhythmBullet/Utilities/ScreenSystem/ScreenManager.cs
index c4778c3..18db349 100644
--- a/RhythmBullet/Zer01HD/Utilities/ScreenSystem/ScreenManager.cs
+++ b/RhythmBullet/Utilities/ScreenSystem/ScreenManager.cs
@@ -1,6 +1,6 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-using RhythmBullet.Zer01HD.Utilities.Camera;
+using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -8,7 +8,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.ScreenSystem
+namespace RhythmBullet.Utilities.ScreenSystem
{
public delegate void FirstScreenChange(Screen screen);
diff --git a/RhythmBullet/Zer01HD/Utilities/UI/Book/Book.cs b/RhythmBullet/Utilities/UI/Book/Book.cs
similarity index 97%
rename from RhythmBullet/Zer01HD/Utilities/UI/Book/Book.cs
rename to RhythmBullet/Utilities/UI/Book/Book.cs
index ac005e2..34fba0a 100644
--- a/RhythmBullet/Zer01HD/Utilities/UI/Book/Book.cs
+++ b/RhythmBullet/Utilities/UI/Book/Book.cs
@@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-using RhythmBullet.Zer01HD.Utilities.Camera;
+using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.UI.Book
+namespace RhythmBullet.UI.Book
{
class Book
{
diff --git a/RhythmBullet/Zer01HD/Utilities/UI/Book/Page.cs b/RhythmBullet/Utilities/UI/Book/Page.cs
similarity index 86%
rename from RhythmBullet/Zer01HD/Utilities/UI/Book/Page.cs
rename to RhythmBullet/Utilities/UI/Book/Page.cs
index d4f7645..0fe333c 100644
--- a/RhythmBullet/Zer01HD/Utilities/UI/Book/Page.cs
+++ b/RhythmBullet/Utilities/UI/Book/Page.cs
@@ -1,14 +1,14 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-using RhythmBullet.Zer01HD.UI.Modular;
-using RhythmBullet.Zer01HD.Utilities.Camera;
+using RhythmBullet.UI.Modular;
+using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.UI.Book
+namespace RhythmBullet.UI.Book
{
class Page : UIModuleGroup
{
diff --git a/RhythmBullet/Zer01HD/Utilities/UI/Modular/Modules/Image.cs b/RhythmBullet/Utilities/UI/Modular/Modules/Image.cs
similarity index 93%
rename from RhythmBullet/Zer01HD/Utilities/UI/Modular/Modules/Image.cs
rename to RhythmBullet/Utilities/UI/Modular/Modules/Image.cs
index 9827f75..1cc8f8c 100644
--- a/RhythmBullet/Zer01HD/Utilities/UI/Modular/Modules/Image.cs
+++ b/RhythmBullet/Utilities/UI/Modular/Modules/Image.cs
@@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-using RhythmBullet.Zer01HD.UI.Modular;
+using RhythmBullet.UI.Modular;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.UI.Modular.Modules
+namespace RhythmBullet.Utilities.UI.Modular.Modules
{
class Image : UIModule
{
diff --git a/RhythmBullet/Zer01HD/Utilities/UI/Modular/Modules/Interactive/BasicButton.cs b/RhythmBullet/Utilities/UI/Modular/Modules/Interactive/BasicButton.cs
similarity index 87%
rename from RhythmBullet/Zer01HD/Utilities/UI/Modular/Modules/Interactive/BasicButton.cs
rename to RhythmBullet/Utilities/UI/Modular/Modules/Interactive/BasicButton.cs
index dd8165d..9554432 100644
--- a/RhythmBullet/Zer01HD/Utilities/UI/Modular/Modules/Interactive/BasicButton.cs
+++ b/RhythmBullet/Utilities/UI/Modular/Modules/Interactive/BasicButton.cs
@@ -1,13 +1,13 @@
using Microsoft.Xna.Framework.Input;
-using RhythmBullet.Zer01HD.UI.Modular;
-using RhythmBullet.Zer01HD.Utilities.Input;
+using RhythmBullet.UI.Modular;
+using RhythmBullet.Utilities.Input;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.Utilities.UI.Modular.Modules.Interactive
+namespace RhythmBullet.Utilities.UI.Modular.Modules.Interactive
{
public delegate bool Clicked();
diff --git a/RhythmBullet/Zer01HD/Utilities/UI/Modular/Modules/TextLabel.cs b/RhythmBullet/Utilities/UI/Modular/Modules/TextLabel.cs
similarity index 97%
rename from RhythmBullet/Zer01HD/Utilities/UI/Modular/Modules/TextLabel.cs
rename to RhythmBullet/Utilities/UI/Modular/Modules/TextLabel.cs
index 5543a27..075f879 100644
--- a/RhythmBullet/Zer01HD/Utilities/UI/Modular/Modules/TextLabel.cs
+++ b/RhythmBullet/Utilities/UI/Modular/Modules/TextLabel.cs
@@ -1,13 +1,13 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
-using RhythmBullet.Zer01HD.Utilities.Camera;
+using RhythmBullet.Utilities.Camera;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.UI.Modular.Modules
+namespace RhythmBullet.UI.Modular.Modules
{
public class TextLabel : UIModule
{
diff --git a/RhythmBullet/Zer01HD/Utilities/UI/Modular/UIModule.cs b/RhythmBullet/Utilities/UI/Modular/UIModule.cs
similarity index 92%
rename from RhythmBullet/Zer01HD/Utilities/UI/Modular/UIModule.cs
rename to RhythmBullet/Utilities/UI/Modular/UIModule.cs
index f959a8d..62695d6 100644
--- a/RhythmBullet/Zer01HD/Utilities/UI/Modular/UIModule.cs
+++ b/RhythmBullet/Utilities/UI/Modular/UIModule.cs
@@ -1,15 +1,15 @@
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
-using RhythmBullet.Zer01HD.Utilities.Camera;
-using RhythmBullet.Zer01HD.Utilities.Input;
+using RhythmBullet.Utilities.Camera;
+using RhythmBullet.Utilities.Input;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace RhythmBullet.Zer01HD.UI.Modular
+namespace RhythmBullet.UI.Modular
{
public class UIModule : IInputListener
{
diff --git a/RhythmBullet/Zer01HD/Utilities/UI/Modular/UIModuleGroup.cs b/RhythmBullet/Utilities/UI/Modular/UIModuleGroup.cs
similarity index 96%
rename from RhythmBullet/Zer01HD/Utilities/UI/Modular/UIModuleGroup.cs
rename to RhythmBullet/Utilities/UI/Modular/UIModuleGroup.cs
index 55f6aed..e5a233c 100644
--- a/RhythmBullet/Zer01HD/Utilities/UI/Modular/UIModuleGroup.cs
+++ b/RhythmBullet/Utilities/UI/Modular/UIModuleGroup.cs
@@ -6,10 +6,10 @@ using System.Threading.Tasks;
using Microsoft.Xna.Framework;
using Microsoft.Xna.Framework.Graphics;
using Microsoft.Xna.Framework.Input;
-using RhythmBullet.Zer01HD.Utilities.Camera;
-using RhythmBullet.Zer01HD.Utilities.Input;
+using RhythmBullet.Utilities.Camera;
+using RhythmBullet.Utilities.Input;
-namespace RhythmBullet.Zer01HD.UI.Modular
+namespace RhythmBullet.UI.Modular
{
public class UIModuleGroup : UIModule
{