66 files changed, 66 insertions, 66 deletions
diff --git a/src/classes/TextGL.pas b/src/base/TextGL.pas
index f7b3ac95..f7b3ac95 100644
--- a/src/classes/TextGL.pas
+++ b/src/base/TextGL.pas
diff --git a/src/classes/UAudioConverter.pas b/src/base/UAudioConverter.pas
index 5647f27b..5647f27b 100644
--- a/src/classes/UAudioConverter.pas
+++ b/src/base/UAudioConverter.pas
diff --git a/src/classes/UAudioCore_Bass.pas b/src/base/UAudioCore_Bass.pas
index beb2db16..beb2db16 100644
--- a/src/classes/UAudioCore_Bass.pas
+++ b/src/base/UAudioCore_Bass.pas
diff --git a/src/classes/UAudioCore_Portaudio.pas b/src/base/UAudioCore_Portaudio.pas
index bcc8a001..bcc8a001 100644
--- a/src/classes/UAudioCore_Portaudio.pas
+++ b/src/base/UAudioCore_Portaudio.pas
diff --git a/src/classes/UAudioDecoder_Bass.pas b/src/base/UAudioDecoder_Bass.pas
index dba1fde4..dba1fde4 100644
--- a/src/classes/UAudioDecoder_Bass.pas
+++ b/src/base/UAudioDecoder_Bass.pas
diff --git a/src/classes/UAudioDecoder_FFmpeg.pas b/src/base/UAudioDecoder_FFmpeg.pas
index d9b4c93c..d9b4c93c 100644
--- a/src/classes/UAudioDecoder_FFmpeg.pas
+++ b/src/base/UAudioDecoder_FFmpeg.pas
diff --git a/src/classes/UAudioInput_Bass.pas b/src/base/UAudioInput_Bass.pas
index 65a4704d..65a4704d 100644
--- a/src/classes/UAudioInput_Bass.pas
+++ b/src/base/UAudioInput_Bass.pas
diff --git a/src/classes/UAudioInput_Portaudio.pas b/src/base/UAudioInput_Portaudio.pas
index 9a1c3e99..9a1c3e99 100644
--- a/src/classes/UAudioInput_Portaudio.pas
+++ b/src/base/UAudioInput_Portaudio.pas
diff --git a/src/classes/UAudioPlaybackBase.pas b/src/base/UAudioPlaybackBase.pas
index 2337d43f..2337d43f 100644
--- a/src/classes/UAudioPlaybackBase.pas
+++ b/src/base/UAudioPlaybackBase.pas
diff --git a/src/classes/UAudioPlayback_Bass.pas b/src/base/UAudioPlayback_Bass.pas
index 41a91173..41a91173 100644
--- a/src/classes/UAudioPlayback_Bass.pas
+++ b/src/base/UAudioPlayback_Bass.pas
diff --git a/src/classes/UAudioPlayback_Portaudio.pas b/src/base/UAudioPlayback_Portaudio.pas
index c3717ba6..c3717ba6 100644
--- a/src/classes/UAudioPlayback_Portaudio.pas
+++ b/src/base/UAudioPlayback_Portaudio.pas
diff --git a/src/classes/UAudioPlayback_SDL.pas b/src/base/UAudioPlayback_SDL.pas
index deef91e8..deef91e8 100644
--- a/src/classes/UAudioPlayback_SDL.pas
+++ b/src/base/UAudioPlayback_SDL.pas
diff --git a/src/classes/UAudioPlayback_SoftMixer.pas b/src/base/UAudioPlayback_SoftMixer.pas
index 6ddae980..6ddae980 100644
--- a/src/classes/UAudioPlayback_SoftMixer.pas
+++ b/src/base/UAudioPlayback_SoftMixer.pas
diff --git a/src/classes/UCatCovers.pas b/src/base/UCatCovers.pas
index d8f6cdb0..d8f6cdb0 100644
--- a/src/classes/UCatCovers.pas
+++ b/src/base/UCatCovers.pas
diff --git a/src/classes/UCommandLine.pas b/src/base/UCommandLine.pas
index 8bdc4f5a..8bdc4f5a 100644
--- a/src/classes/UCommandLine.pas
+++ b/src/base/UCommandLine.pas
diff --git a/src/classes/UCommon.pas b/src/base/UCommon.pas
index 41e3c1f1..41e3c1f1 100644
--- a/src/classes/UCommon.pas
+++ b/src/base/UCommon.pas
diff --git a/src/classes/UConfig.pas b/src/base/UConfig.pas
index b77c2a5a..b77c2a5a 100644
--- a/src/classes/UConfig.pas
+++ b/src/base/UConfig.pas
diff --git a/src/classes/UCore.pas b/src/base/UCore.pas
index fe23a68e..fe23a68e 100644
--- a/src/classes/UCore.pas
+++ b/src/base/UCore.pas
diff --git a/src/classes/UCoreModule.pas b/src/base/UCoreModule.pas
index 031fb04e..031fb04e 100644
--- a/src/classes/UCoreModule.pas
+++ b/src/base/UCoreModule.pas
diff --git a/src/classes/UCovers.pas b/src/base/UCovers.pas
index 7bb57b4a..7bb57b4a 100644
--- a/src/classes/UCovers.pas
+++ b/src/base/UCovers.pas
diff --git a/src/classes/UDLLManager.pas b/src/base/UDLLManager.pas
index 3d32a72a..3d32a72a 100644
--- a/src/classes/UDLLManager.pas
+++ b/src/base/UDLLManager.pas
diff --git a/src/classes/UDataBase.pas b/src/base/UDataBase.pas
index cd315df3..cd315df3 100644
--- a/src/classes/UDataBase.pas
+++ b/src/base/UDataBase.pas
diff --git a/src/classes/UDraw.pas b/src/base/UDraw.pas
index ff0920f5..ff0920f5 100644
--- a/src/classes/UDraw.pas
+++ b/src/base/UDraw.pas
diff --git a/src/classes/UEditorLyrics.pas b/src/base/UEditorLyrics.pas
index 25e8423e..25e8423e 100644
--- a/src/classes/UEditorLyrics.pas
+++ b/src/base/UEditorLyrics.pas
diff --git a/src/classes/UFiles.pas b/src/base/UFiles.pas
index ca43bb21..ca43bb21 100644
--- a/src/classes/UFiles.pas
+++ b/src/base/UFiles.pas
diff --git a/src/classes/UGraphic.pas b/src/base/UGraphic.pas
index 2432503c..2432503c 100644
--- a/src/classes/UGraphic.pas
+++ b/src/base/UGraphic.pas
diff --git a/src/classes/UGraphicClasses.pas b/src/base/UGraphicClasses.pas
index b7174991..b7174991 100644
--- a/src/classes/UGraphicClasses.pas
+++ b/src/base/UGraphicClasses.pas
diff --git a/src/classes/UHooks.pas b/src/base/UHooks.pas
index f0ba3276..f0ba3276 100644
--- a/src/classes/UHooks.pas
+++ b/src/base/UHooks.pas
diff --git a/src/classes/UImage.pas b/src/base/UImage.pas
index d33c0d38..d33c0d38 100644
--- a/src/classes/UImage.pas
+++ b/src/base/UImage.pas
diff --git a/src/classes/UIni.pas b/src/base/UIni.pas
index b286c917..b286c917 100644
--- a/src/classes/UIni.pas
+++ b/src/base/UIni.pas
diff --git a/src/classes/UJoystick.pas b/src/base/UJoystick.pas
index 0ca7ba09..0ca7ba09 100644
--- a/src/classes/UJoystick.pas
+++ b/src/base/UJoystick.pas
diff --git a/src/classes/ULCD.pas b/src/base/ULCD.pas
index 82f7ba2f..82f7ba2f 100644
--- a/src/classes/ULCD.pas
+++ b/src/base/ULCD.pas
diff --git a/src/classes/ULanguage.pas b/src/base/ULanguage.pas
index d534b4e1..d534b4e1 100644
--- a/src/classes/ULanguage.pas
+++ b/src/base/ULanguage.pas
diff --git a/src/classes/ULight.pas b/src/base/ULight.pas
index a0a399ab..a0a399ab 100644
--- a/src/classes/ULight.pas
+++ b/src/base/ULight.pas
diff --git a/src/classes/ULog.pas b/src/base/ULog.pas
index a9a2f3c4..a9a2f3c4 100644
--- a/src/classes/ULog.pas
+++ b/src/base/ULog.pas
diff --git a/src/classes/ULyrics.pas b/src/base/ULyrics.pas
index 305cb91f..305cb91f 100644
--- a/src/classes/ULyrics.pas
+++ b/src/base/ULyrics.pas
diff --git a/src/classes/UMain.pas b/src/base/UMain.pas
index 5dacd5f8..5dacd5f8 100644
--- a/src/classes/UMain.pas
+++ b/src/base/UMain.pas
diff --git a/src/classes/UMediaCore_FFmpeg.pas b/src/base/UMediaCore_FFmpeg.pas
index cdd320ac..cdd320ac 100644
--- a/src/classes/UMediaCore_FFmpeg.pas
+++ b/src/base/UMediaCore_FFmpeg.pas
diff --git a/src/classes/UMediaCore_SDL.pas b/src/base/UMediaCore_SDL.pas
index 252f72a0..252f72a0 100644
--- a/src/classes/UMediaCore_SDL.pas
+++ b/src/base/UMediaCore_SDL.pas
diff --git a/src/classes/UMedia_dummy.pas b/src/base/UMedia_dummy.pas
index 438b89ab..438b89ab 100644
--- a/src/classes/UMedia_dummy.pas
+++ b/src/base/UMedia_dummy.pas
diff --git a/src/classes/UModules.pas b/src/base/UModules.pas
index 554a24c4..554a24c4 100644
--- a/src/classes/UModules.pas
+++ b/src/base/UModules.pas
diff --git a/src/classes/UMusic.pas b/src/base/UMusic.pas
index 6476f629..6476f629 100644
--- a/src/classes/UMusic.pas
+++ b/src/base/UMusic.pas
diff --git a/src/classes/UParty.pas b/src/base/UParty.pas
index 01a182b1..01a182b1 100644
--- a/src/classes/UParty.pas
+++ b/src/base/UParty.pas
diff --git a/src/classes/UPlatform.pas b/src/base/UPlatform.pas
index 1dcdb5b9..1dcdb5b9 100644
--- a/src/classes/UPlatform.pas
+++ b/src/base/UPlatform.pas
diff --git a/src/classes/UPlatformLinux.pas b/src/base/UPlatformLinux.pas
index 3227e4f8..3227e4f8 100644
--- a/src/classes/UPlatformLinux.pas
+++ b/src/base/UPlatformLinux.pas
diff --git a/src/classes/UPlatformMacOSX.pas b/src/base/UPlatformMacOSX.pas
index 2ab2a390..2ab2a390 100644
--- a/src/classes/UPlatformMacOSX.pas
+++ b/src/base/UPlatformMacOSX.pas
diff --git a/src/classes/UPlatformWindows.pas b/src/base/UPlatformWindows.pas
index 029e8d33..029e8d33 100644
--- a/src/classes/UPlatformWindows.pas
+++ b/src/base/UPlatformWindows.pas
diff --git a/src/classes/UPlaylist.pas b/src/base/UPlaylist.pas
index c867c356..c867c356 100644
--- a/src/classes/UPlaylist.pas
+++ b/src/base/UPlaylist.pas
diff --git a/src/classes/UPluginInterface.pas b/src/base/UPluginInterface.pas
index 77693d0f..77693d0f 100644
--- a/src/classes/UPluginInterface.pas
+++ b/src/base/UPluginInterface.pas
diff --git a/src/classes/URecord.pas b/src/base/URecord.pas
index 8a537dc9..8a537dc9 100644
--- a/src/classes/URecord.pas
+++ b/src/base/URecord.pas
diff --git a/src/classes/URingBuffer.pas b/src/base/URingBuffer.pas
index ce51e209..ce51e209 100644
--- a/src/classes/URingBuffer.pas
+++ b/src/base/URingBuffer.pas
diff --git a/src/classes/UServices.pas b/src/base/UServices.pas
index 6325444c..6325444c 100644
--- a/src/classes/UServices.pas
+++ b/src/base/UServices.pas
diff --git a/src/classes/USingNotes.pas b/src/base/USingNotes.pas
index 3b268d10..3b268d10 100644
--- a/src/classes/USingNotes.pas
+++ b/src/base/USingNotes.pas
diff --git a/src/classes/USingScores.pas b/src/base/USingScores.pas
index 77d40b84..77d40b84 100644
--- a/src/classes/USingScores.pas
+++ b/src/base/USingScores.pas
diff --git a/src/classes/USkins.pas b/src/base/USkins.pas
index 88549c9f..88549c9f 100644
--- a/src/classes/USkins.pas
+++ b/src/base/USkins.pas
diff --git a/src/classes/USong.pas b/src/base/USong.pas
index 3517bce6..3517bce6 100644
--- a/src/classes/USong.pas
+++ b/src/base/USong.pas
diff --git a/src/classes/USongs.pas b/src/base/USongs.pas
index 710cd44f..710cd44f 100644
--- a/src/classes/USongs.pas
+++ b/src/base/USongs.pas
diff --git a/src/classes/UTextClasses.pas b/src/base/UTextClasses.pas
index 9a12e1f5..9a12e1f5 100644
--- a/src/classes/UTextClasses.pas
+++ b/src/base/UTextClasses.pas
diff --git a/src/classes/UTexture.pas b/src/base/UTexture.pas
index 4879760a..4879760a 100644
--- a/src/classes/UTexture.pas
+++ b/src/base/UTexture.pas
diff --git a/src/classes/UThemes.pas b/src/base/UThemes.pas
index fca75c24..fca75c24 100644
--- a/src/classes/UThemes.pas
+++ b/src/base/UThemes.pas
diff --git a/src/classes/UTime.pas b/src/base/UTime.pas
index f8ae91c4..f8ae91c4 100644
--- a/src/classes/UTime.pas
+++ b/src/base/UTime.pas
diff --git a/src/classes/UVideo.pas b/src/base/UVideo.pas
index 0ab1d350..0ab1d350 100644
--- a/src/classes/UVideo.pas
+++ b/src/base/UVideo.pas
diff --git a/src/classes/UVisualizer.pas b/src/base/UVisualizer.pas
index e2125201..e2125201 100644
--- a/src/classes/UVisualizer.pas
+++ b/src/base/UVisualizer.pas
diff --git a/src/classes/UXMLSong.pas b/src/base/UXMLSong.pas
index 1a1fe6bc..1a1fe6bc 100644
--- a/src/classes/UXMLSong.pas
+++ b/src/base/UXMLSong.pas
diff --git a/src/classes/uPluginLoader.pas b/src/base/uPluginLoader.pas
index b2142702..b2142702 100644
--- a/src/classes/uPluginLoader.pas
+++ b/src/base/uPluginLoader.pas
diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr
index d9d380ab..3cb32279 100644
--- a/src/ultrastardx.dpr
+++ b/src/ultrastardx.dpr
@@ -48,18 +48,18 @@ uses
   sdl_image              in 'lib\JEDI-SDL\SDL_Image\Pas\sdl_image.pas',
   //sdl_ttf                in 'lib\JEDI-SDL\SDL_ttf\Pas\sdl_ttf.pas',
   sdlutils               in 'lib\JEDI-SDL\SDL\Pas\sdlutils.pas',
-  UMediaCore_SDL         in 'classes\UMediaCore_SDL.pas',
+  UMediaCore_SDL         in 'base\UMediaCore_SDL.pas',
 
   zlib                   in 'lib\zlib\zlib.pas',
   png                    in 'lib\libpng\png.pas',
 
   {$IFDEF UseBass}
   bass                   in 'lib\bass\delphi\bass.pas',
-  UAudioCore_Bass        in 'classes\UAudioCore_Bass.pas',
+  UAudioCore_Bass        in 'base\UAudioCore_Bass.pas',
   {$ENDIF}
   {$IFDEF UsePortaudio}
   portaudio              in 'lib\portaudio\portaudio.pas',
-  UAudioCore_Portaudio   in 'classes\UAudioCore_Portaudio.pas',
+  UAudioCore_Portaudio   in 'base\UAudioCore_Portaudio.pas',
   {$ENDIF}
   {$IFDEF UsePortmixer}
   portmixer              in 'lib\portmixer\portmixer.pas',
@@ -73,7 +73,7 @@ uses
   opt                    in 'lib\ffmpeg\opt.pas',
   avio                   in 'lib\ffmpeg\avio.pas',
   mathematics            in 'lib\ffmpeg\mathematics.pas',
-  UMediaCore_FFmpeg      in 'classes\UMediaCore_FFmpeg.pas',
+  UMediaCore_FFmpeg      in 'base\UMediaCore_FFmpeg.pas',
   {$IFDEF UseSWScale}
   swscale                in 'lib\ffmpeg\swscale.pas',
   {$ENDIF}
@@ -126,74 +126,74 @@ uses
   UMenuButtonCollection  in 'menu\UMenuButtonCollection.pas',
 
   //------------------------------
-  //Includes - Classes
+  //Includes - base
   //------------------------------
-  UConfig           in 'classes\UConfig.pas',
+  UConfig           in 'base\UConfig.pas',
   
-  UCommon           in 'classes\UCommon.pas',
-  UGraphic          in 'classes\UGraphic.pas',
-  UTexture          in 'classes\UTexture.pas',
-  ULanguage         in 'classes\ULanguage.pas',
-  UMain             in 'classes\UMain.pas',
-  UDraw             in 'classes\UDraw.pas',
-  URecord           in 'classes\URecord.pas',
-  UTime             in 'classes\UTime.pas',
-  TextGL            in 'classes\TextGL.pas',
-  USong             in 'classes\USong.pas',
-  UXMLSong          in 'classes\UXMLSong.pas',
-  USongs            in 'classes\USongs.pas',
-  UIni              in 'classes\UIni.pas',
-  UImage            in 'classes\UImage.pas',
-  ULyrics           in 'classes\ULyrics.pas',
-  UEditorLyrics     in 'classes\UEditorLyrics.pas',
-  USkins            in 'classes\USkins.pas',
-  UThemes           in 'classes\UThemes.pas',
-  ULog              in 'classes\ULog.pas',
-  UJoystick         in 'classes\UJoystick.pas',
-  UDataBase         in 'classes\UDataBase.pas',
-  UCovers           in 'classes\UCovers.pas',
-  UCatCovers        in 'classes\UCatCovers.pas',
-  UFiles            in 'classes\UFiles.pas',
-  UGraphicClasses   in 'classes\UGraphicClasses.pas',
-  UDLLManager       in 'classes\UDLLManager.pas',
-  UPlaylist         in 'classes\UPlaylist.pas',
-  UCommandLine      in 'classes\UCommandLine.pas',
-  URingBuffer       in 'classes\URingBuffer.pas',
-  UTextClasses      in 'classes\UTextClasses.pas',
-  USingScores       in 'classes\USingScores.pas',
-  USingNotes        in 'classes\USingNotes.pas',
-
-  UModules          in 'classes\UModules.pas',          //List of Modules to Load
-  UHooks            in 'classes\UHooks.pas',            //Hook Managing
-  UServices         in 'classes\UServices.pas',         //Service Managing
-  UCore             in 'classes\UCore.pas',             //Core, Maybe remove this
-  UCoreModule       in 'classes\UCoreModule.pas',       //^
-  UPluginInterface  in 'classes\UPluginInterface.pas',  //Interface offered by Core to Plugins
-  uPluginLoader     in 'classes\uPluginLoader.pas',     //New Plugin Loader Module
-
-  UParty            in 'classes\UParty.pas',            // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin
-  UPlatform         in 'classes\UPlatform.pas',
+  UCommon           in 'base\UCommon.pas',
+  UGraphic          in 'base\UGraphic.pas',
+  UTexture          in 'base\UTexture.pas',
+  ULanguage         in 'base\ULanguage.pas',
+  UMain             in 'base\UMain.pas',
+  UDraw             in 'base\UDraw.pas',
+  URecord           in 'base\URecord.pas',
+  UTime             in 'base\UTime.pas',
+  TextGL            in 'base\TextGL.pas',
+  USong             in 'base\USong.pas',
+  UXMLSong          in 'base\UXMLSong.pas',
+  USongs            in 'base\USongs.pas',
+  UIni              in 'base\UIni.pas',
+  UImage            in 'base\UImage.pas',
+  ULyrics           in 'base\ULyrics.pas',
+  UEditorLyrics     in 'base\UEditorLyrics.pas',
+  USkins            in 'base\USkins.pas',
+  UThemes           in 'base\UThemes.pas',
+  ULog              in 'base\ULog.pas',
+  UJoystick         in 'base\UJoystick.pas',
+  UDataBase         in 'base\UDataBase.pas',
+  UCovers           in 'base\UCovers.pas',
+  UCatCovers        in 'base\UCatCovers.pas',
+  UFiles            in 'base\UFiles.pas',
+  UGraphicClasses   in 'base\UGraphicClasses.pas',
+  UDLLManager       in 'base\UDLLManager.pas',
+  UPlaylist         in 'base\UPlaylist.pas',
+  UCommandLine      in 'base\UCommandLine.pas',
+  URingBuffer       in 'base\URingBuffer.pas',
+  UTextClasses      in 'base\UTextClasses.pas',
+  USingScores       in 'base\USingScores.pas',
+  USingNotes        in 'base\USingNotes.pas',
+
+  UModules          in 'base\UModules.pas',          //List of Modules to Load
+  UHooks            in 'base\UHooks.pas',            //Hook Managing
+  UServices         in 'base\UServices.pas',         //Service Managing
+  UCore             in 'base\UCore.pas',             //Core, Maybe remove this
+  UCoreModule       in 'base\UCoreModule.pas',       //^
+  UPluginInterface  in 'base\UPluginInterface.pas',  //Interface offered by Core to Plugins
+  uPluginLoader     in 'base\uPluginLoader.pas',     //New Plugin Loader Module
+
+  UParty            in 'base\UParty.pas',            // TODO: rewrite Party Manager as Module, reomplent ability to offer party Mody by Plugin
+  UPlatform         in 'base\UPlatform.pas',
 {$IFDEF MSWINDOWS}
-  UPlatformWindows  in 'classes\UPlatformWindows.pas',
+  UPlatformWindows  in 'base\UPlatformWindows.pas',
 {$ENDIF}
 {$IFDEF LINUX}
-  UPlatformLinux    in 'classes\UPlatformLinux.pas',
+  UPlatformLinux    in 'base\UPlatformLinux.pas',
 {$ENDIF}
 {$IFDEF DARWIN}
-  UPlatformMacOSX   in 'classes/UPlatformMacOSX.pas',
+  UPlatformMacOSX   in 'base/UPlatformMacOSX.pas',
 {$ENDIF}
 
   //------------------------------
   //Includes - Media
   //------------------------------
 
-  UMusic          in 'classes\UMusic.pas',
-  UAudioPlaybackBase in 'classes\UAudioPlaybackBase.pas',
+  UMusic          in 'base\UMusic.pas',
+  UAudioPlaybackBase in 'base\UAudioPlaybackBase.pas',
 {$IF Defined(UsePortaudioPlayback) or Defined(UseSDLPlayback)}
   UFFT                      in 'lib\fft\UFFT.pas',
-  UAudioPlayback_Softmixer  in 'classes\UAudioPlayback_SoftMixer.pas',
+  UAudioPlayback_Softmixer  in 'base\UAudioPlayback_SoftMixer.pas',
 {$IFEND}
-  UAudioConverter           in 'classes\UAudioConverter.pas',
+  UAudioConverter           in 'base\UAudioConverter.pas',
 
   //******************************
   //Pluggable media modules
@@ -204,36 +204,36 @@ uses
   // TODO :  these all should be moved to a media folder
 
 {$IFDEF UseFFmpegVideo}
-  UVideo                    in 'classes\UVideo.pas',
+  UVideo                    in 'base\UVideo.pas',
 {$ENDIF}
 {$IFDEF UseProjectM}
   // must be after UVideo, so it will not be the default video module
-  UVisualizer               in 'classes\UVisualizer.pas',
+  UVisualizer               in 'base\UVisualizer.pas',
 {$ENDIF}
 {$IFDEF UseBASSInput}
-  UAudioInput_Bass          in 'classes\UAudioInput_Bass.pas',
+  UAudioInput_Bass          in 'base\UAudioInput_Bass.pas',
 {$ENDIF}
 {$IFDEF UseBASSDecoder}
   // prefer Bass to FFmpeg if possible
-  UAudioDecoder_Bass        in 'classes\UAudioDecoder_Bass.pas',
+  UAudioDecoder_Bass        in 'base\UAudioDecoder_Bass.pas',
 {$ENDIF}
 {$IFDEF UseBASSPlayback}
-  UAudioPlayback_Bass       in 'classes\UAudioPlayback_Bass.pas',
+  UAudioPlayback_Bass       in 'base\UAudioPlayback_Bass.pas',
 {$ENDIF}
 {$IFDEF UseSDLPlayback}
-  UAudioPlayback_SDL        in 'classes\UAudioPlayback_SDL.pas',
+  UAudioPlayback_SDL        in 'base\UAudioPlayback_SDL.pas',
 {$ENDIF}
 {$IFDEF UsePortaudioInput}
-  UAudioInput_Portaudio     in 'classes\UAudioInput_Portaudio.pas',
+  UAudioInput_Portaudio     in 'base\UAudioInput_Portaudio.pas',
 {$ENDIF}
 {$IFDEF UsePortaudioPlayback}
-  UAudioPlayback_Portaudio  in 'classes\UAudioPlayback_Portaudio.pas',
+  UAudioPlayback_Portaudio  in 'base\UAudioPlayback_Portaudio.pas',
 {$ENDIF}
 {$IFDEF UseFFmpegDecoder}
-  UAudioDecoder_FFmpeg      in 'classes\UAudioDecoder_FFmpeg.pas',
+  UAudioDecoder_FFmpeg      in 'base\UAudioDecoder_FFmpeg.pas',
 {$ENDIF}
   // fallback dummy, must be last
-  UMedia_dummy              in 'classes\UMedia_dummy.pas',
+  UMedia_dummy              in 'base\UMedia_dummy.pas',
 
 
   //------------------------------