finished moving around

PartyModes/PartyModeChallengeMedley/CPartyModeChallengeMedley.cs

@@ -21,8 +21,9 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Runtime.InteropServices;
+using VocaluxeLib.Game;
 using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 [assembly: ComVisible(false)]
 

PartyModes/PartyModeTicTacToe/CPartyScreenTicTacToeMain.cs

@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace VocaluxeLib.PartyModes.TicTacToe
 {

Vocaluxe/Base/CBackgroundMusic.cs

@@ -23,8 +23,8 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Vocaluxe.Base;
-using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CConfig.cs

@@ -28,6 +28,7 @@ using System.Windows.Forms;
 using System.Xml;
 using Vocaluxe.Lib.Sound;
 using Vocaluxe.Lib.Webcam;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base

Vocaluxe/Base/CController.cs

@@ -19,7 +19,7 @@
 
 using Vocaluxe.Lib.Input;
 using Vocaluxe.Lib.Input.WiiMote;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CCover.cs

@@ -23,6 +23,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base

Vocaluxe/Base/CDataBase.cs

@@ -35,8 +35,8 @@ using SQLiteCommand = Mono.Data.Sqlite.SqliteCommand;
 using SQLiteDataReader = Mono.Data.Sqlite.SqliteDataReader;
 #endif
 using Community.CsharpSqlite;
-using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CDraw.cs

@@ -22,6 +22,7 @@ using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
 using Vocaluxe.Lib.Draw;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base

Vocaluxe/Base/CGame.cs

@@ -20,9 +20,9 @@
 using System;
 using System.Collections.Generic;
 using Vocaluxe.SongQueue;
-using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SingNotes;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib;
+using VocaluxeLib.Game;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CGraphics.cs

@@ -24,6 +24,7 @@ using System.Drawing;
 using System.Windows.Forms;
 using Vocaluxe.Base.Font;
 using Vocaluxe.Screens;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 using VocaluxeLib.PartyModes;
 

Vocaluxe/Base/CLanguage.cs

@@ -23,6 +23,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base

Vocaluxe/Base/CMain.cs

@@ -22,8 +22,11 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Drawing;
 using Vocaluxe.Base.Font;
+using VocaluxeLib;
+using VocaluxeLib.Game;
 using VocaluxeLib.Menu;
 using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CParty.cs

@@ -22,6 +22,7 @@ using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 using VocaluxeLib.PartyModes;
 

Vocaluxe/Base/CPlaylists.cs

@@ -23,8 +23,9 @@ using System.Collections.ObjectModel;
 using System.IO;
 using System.Text;
 using Vocaluxe.Lib.Playlist;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CProfiles.cs

@@ -22,7 +22,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Xml;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
+using VocaluxeLib.Game;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSettings.cs

@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSongCategorizer.cs

@@ -20,8 +20,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSongFilter.cs

@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSongSorter.cs

@@ -20,8 +20,8 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSongs.cs

@@ -22,8 +22,10 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CSound.cs

@@ -22,7 +22,7 @@ using System.Collections.ObjectModel;
 using System.Diagnostics;
 using System.IO;
 using Vocaluxe.Lib.Sound;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CTheme.cs

@@ -24,6 +24,7 @@ using System.Text;
 using System.Windows.Forms;
 using System.Xml;
 using Vocaluxe.Base.Font;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base

Vocaluxe/Base/CUtility.cs

@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Windows.Forms;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CVideo.cs

@@ -20,7 +20,7 @@
 using System.Diagnostics;
 using System.Drawing;
 using Vocaluxe.Lib.Video;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/CWebcam.cs

@@ -19,7 +19,7 @@
 
 using System.Drawing;
 using Vocaluxe.Lib.Webcam;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Base
 {

Vocaluxe/Base/Font/CFont.cs

@@ -21,6 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Text;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base.Font

Vocaluxe/Base/Font/CFonts.cs

@@ -23,6 +23,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Xml;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base.Font

Vocaluxe/Base/Font/CGlyph.cs

@@ -22,6 +22,7 @@ using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Text;
 using System.Windows.Forms;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Base.Font

Vocaluxe/GameModes/CGameMode.cs

@@ -18,7 +18,7 @@
 #endregion
 
 using Vocaluxe.Base;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.GameModes
 {

Vocaluxe/GameModes/CGameModes.cs

@@ -19,8 +19,8 @@
 
 using System.Collections.Generic;
 using Vocaluxe.Base;
-using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.GameModes
 {

Vocaluxe/GameModes/IGameMode.cs

@@ -17,7 +17,7 @@
 //  */
 #endregion
 
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.GameModes
 {

Vocaluxe/Lib/Draw/CDirect3D.cs

@@ -32,6 +32,7 @@ using System.Windows.Forms;
 using SlimDX.Windows;
 using Vocaluxe.Base;
 using Vocaluxe.Base.Font;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Draw

Vocaluxe/Lib/Draw/CDrawWinForm.cs

@@ -28,6 +28,7 @@ using System.Threading;
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Base.Font;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Draw

Vocaluxe/Lib/Draw/COpenGL.cs

@@ -31,6 +31,7 @@ using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Base.Font;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 using BeginMode = OpenTK.Graphics.OpenGL.BeginMode;
 using BlendingFactorDest = OpenTK.Graphics.OpenGL.BlendingFactorDest;

Vocaluxe/Lib/Draw/IDraw.cs

@@ -19,6 +19,7 @@
 
 using System;
 using System.Drawing;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Lib.Draw

Vocaluxe/Lib/Input/IController.cs

@@ -20,7 +20,7 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Input
 {

Vocaluxe/Lib/Input/WiiMote/CWiiMote.cs

@@ -23,7 +23,7 @@ using System.Drawing;
 using System.Threading;
 using System.Windows.Forms;
 using Vocaluxe.Base;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Input.WiiMote
 {

Vocaluxe/Lib/Input/WiiMote/WiiMoteLib.cs

@@ -21,7 +21,7 @@ using System;
 using System.Drawing;
 using System.Threading;
 using Vocaluxe.Base;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Input.WiiMote
 {

Vocaluxe/Lib/Playlist/CPlaylistFile.cs

@@ -23,8 +23,9 @@ using System.IO;
 using System.Text;
 using System.Xml;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Lib.Playlist
 {

Vocaluxe/Lib/Video/CVideoDecoder.cs

@@ -19,7 +19,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Video
 {

Vocaluxe/Lib/Video/CVideoDecoderFFmpeg.cs

@@ -25,7 +25,7 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Video.Acinerella;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Video
 {

Vocaluxe/Lib/Video/CVideoDecoderGstreamer.cs

@@ -20,7 +20,7 @@
 using System;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Video.Gstreamer;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Video
 {

Vocaluxe/Lib/Video/IVideoDecoder.cs

@@ -17,7 +17,7 @@
 //  */
 #endregion
 
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Video
 {

Vocaluxe/Lib/Webcam/CAForgeNet.cs

@@ -24,7 +24,7 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Runtime.InteropServices;
 using Vocaluxe.Base;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Webcam
 {

Vocaluxe/Lib/Webcam/IWebcam.cs

@@ -19,7 +19,7 @@
 
 using System.Collections.Generic;
 using System.Drawing;
-using VocaluxeLib.Menu;
+using VocaluxeLib;
 
 namespace Vocaluxe.Lib.Webcam
 {

Vocaluxe/Screens/CPopupScreenPlayerControl.cs

@@ -20,6 +20,7 @@
 using System;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CPopupScreenVolumeControl.cs

@@ -18,6 +18,7 @@
 #endregion
 
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenCredits.cs

@@ -22,6 +22,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 enum EDirection

Vocaluxe/Screens/CScreenHighscore.cs

@@ -22,8 +22,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
+using VocaluxeLib.Game;
 using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenLoad.cs

@@ -21,6 +21,7 @@ using System.Diagnostics;
 using System.Threading;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenMain.cs

@@ -20,6 +20,7 @@
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Base.Font;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenNames.cs

@@ -21,6 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenOptions.cs

@@ -19,6 +19,7 @@
 
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenOptionsGame.cs

@@ -19,6 +19,7 @@
 
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenOptionsLyrics.cs

@@ -19,6 +19,7 @@
 
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenOptionsRecord.cs

@@ -23,6 +23,7 @@ using System.Diagnostics;
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Sound;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenOptionsSound.cs

@@ -19,6 +19,7 @@
 
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenOptionsTheme.cs

@@ -20,6 +20,7 @@
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Base.Font;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenOptionsVideo.cs

@@ -21,6 +21,7 @@ using System;
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Lib.Webcam;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenParty.cs

@@ -20,6 +20,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenProfiles.cs

@@ -23,6 +23,7 @@ using System.Drawing.Imaging;
 using System.IO;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/Screens/CScreenScore.cs

@@ -22,8 +22,10 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
+using VocaluxeLib.Game;
 using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenSing.cs

@@ -26,9 +26,11 @@ using System.Linq;
 using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Base.Font;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 using VocaluxeLib.Menu.SingNotes;
 using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenSong.cs

@@ -22,9 +22,11 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 using VocaluxeLib.Menu.SongMenu;
 using VocaluxeLib.PartyModes;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.Screens
 {

Vocaluxe/Screens/CScreenTest.cs

@@ -20,6 +20,7 @@
 using System;
 using System.Windows.Forms;
 using Vocaluxe.Base;
+using VocaluxeLib;
 using VocaluxeLib.Menu;
 
 namespace Vocaluxe.Screens

Vocaluxe/SongQueue/CSongQueue.cs

@@ -20,8 +20,9 @@
 using System.Collections.Generic;
 using Vocaluxe.Base;
 using Vocaluxe.GameModes;
-using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib;
+using VocaluxeLib.Game;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.SongQueue
 {

Vocaluxe/SongQueue/ISongQueue.cs

@@ -17,8 +17,9 @@
 //  */
 #endregion
 
-using VocaluxeLib.Menu;
-using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib;
+using VocaluxeLib.Game;
+using VocaluxeLib.Songs;
 
 namespace Vocaluxe.SongQueue
 {

VocaluxeLib/CBasic.cs

@@ -17,7 +17,9 @@
 //  */
 #endregion
 
-namespace VocaluxeLib.Menu
+using VocaluxeLib.Menu;
+
+namespace VocaluxeLib
 {
     public static class CBase
     {

VocaluxeLib/CHelper.cs

@@ -24,7 +24,7 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 
-namespace VocaluxeLib.Menu
+namespace VocaluxeLib
 {
     public static class CHelper
     {

VocaluxeLib/CXMLReader.cs

@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Xml.XPath;
 
-namespace VocaluxeLib.Menu
+namespace VocaluxeLib
 {
     public class CXMLReader
     {

VocaluxeLib/Enums.cs

@@ -19,7 +19,7 @@
 
 using System;
 
-namespace VocaluxeLib.Menu
+namespace VocaluxeLib
 {
 
     #region Inputs

VocaluxeLib/Game/CPoints.cs

@@ -19,7 +19,7 @@
 
 using System;
 
-namespace VocaluxeLib.Menu
+namespace VocaluxeLib.Game
 {
     public class CPoints
     {

VocaluxeLib/Menu/CLyric.cs

@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Xml;
-using VocaluxeLib.Menu.SingNotes;
+using VocaluxeLib.Songs;
 
 namespace VocaluxeLib.Menu
 {

VocaluxeLib/Menu/CPlaylist.cs

@@ -22,6 +22,7 @@ using System.Collections.Generic;
 using System.Windows.Forms;
 using System.Xml;
 using VocaluxeLib.Menu.SongMenu;
+using VocaluxeLib.Songs;
 
 namespace VocaluxeLib.Menu
 {

VocaluxeLib/Menu/IMenu.cs

@@ -21,8 +21,11 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Drawing;
+using VocaluxeLib;
+using VocaluxeLib.Game;
 using VocaluxeLib.Menu.SongMenu;
 using VocaluxeLib.PartyModes;
+using VocaluxeLib.Songs;
 
 namespace VocaluxeLib.Menu
 {

VocaluxeLib/Menu/SingNotes/CSingNotes.cs

@@ -22,6 +22,8 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Xml;
 
+using VocaluxeLib.Songs;
+
 namespace VocaluxeLib.Menu.SingNotes
 {
     struct SPlayerNotes

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -23,6 +23,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using VocaluxeLib.PartyModes;
+using VocaluxeLib.Songs;
 
 namespace VocaluxeLib.Menu.SongMenu
 {

VocaluxeLib/Songs/CCategory.cs

@@ -18,8 +18,9 @@
 #endregion
 
 using System.Collections.Generic;
+using VocaluxeLib;
 
-namespace VocaluxeLib.Menu.SongMenu
+namespace VocaluxeLib.Songs
 {
     public class CCategory
     {

VocaluxeLib/Songs/CNotes.cs

@@ -21,7 +21,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace VocaluxeLib.Menu.SingNotes
+namespace VocaluxeLib.Songs
 {
     public class CNotes
     {

VocaluxeLib/Songs/CSong.cs

@@ -22,9 +22,8 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Text.RegularExpressions;
-using VocaluxeLib.Menu.SingNotes;
 
-namespace VocaluxeLib.Menu.SongMenu
+namespace VocaluxeLib.Songs
 {
     public class CSongPointer
     {

VocaluxeLib/Structs.cs

@@ -20,9 +20,9 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
-using VocaluxeLib.Menu.SingNotes;
+using VocaluxeLib.Songs;
 
-namespace VocaluxeLib.Menu
+namespace VocaluxeLib
 {
 
     #region Drawing