Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 316 insertions, 158 deletions

diff --git a/Makefile.in b/Makefile.in
index b36a01cf60..da64665a96 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,7 @@
 AUTOGENERATED_MAKEFILES=@OUTPUT_FILES@
 BIN_DIRS=	\
-	guilib \
-	guilib/common \
-	guilib/tinyXML \
+	xbmc/guilib \
+	lib/tinyXML \
 	xbmc \
 	xbmc/addons \
 	xbmc/cdrip \
@@ -24,32 +23,73 @@ BIN_DIRS=	\
 	xbmc/cores/VideoRenderers/VideoShaders \
 	xbmc/cores/ExternalPlayer \
 	xbmc/cores/playercorefactory \
-	xbmc/FileSystem \
-	xbmc/FileSystem/MusicDatabaseDirectory \
-	xbmc/FileSystem/VideoDatabaseDirectory \
-	xbmc/karaoke \
-	xbmc/lib/cmyth/libcmyth \
-	xbmc/lib/cmyth/librefmem \
-	xbmc/lib/libhts \
-	xbmc/lib/libjsonrpc \
-	xbmc/lib/libhttpapi \
-	xbmc/lib/libPython \
-	xbmc/lib/libPython/xbmcmodule \
-	xbmc/lib/libRTV \
-	xbmc/lib/libscrobbler \
-	xbmc/lib/libUPnP \
-	xbmc/lib/libXBMS \
-	xbmc/lib/libXDAAP \
-	xbmc/lib/sqLite \
-	xbmc/lib/UnrarXLib \
-	xbmc/lib/libsquish \
+	xbmc/filesystem \
+	xbmc/filesystem/MusicDatabaseDirectory \
+	xbmc/filesystem/VideoDatabaseDirectory \
+	xbmc/dialogs \
+	xbmc/music \
+	xbmc/music/dialogs \
+	xbmc/music/infoscanner \
+	xbmc/music/karaoke \
+	xbmc/music/tags \
+	xbmc/music/windows \
+	xbmc/pictures \
+	xbmc/programs \
+	xbmc/video \
+	xbmc/video/dialogs \
+	xbmc/video/windows \
+	xbmc/windows \
+	xbmc/network \
+	xbmc/playlists \
+	xbmc/powermanagement \
+        xbmc/powermanagement/linux \
+	xbmc/storage \
+	xbmc/storage/linux \
+	xbmc/storage/osx \
+	lib/cmyth/libcmyth \
+	lib/cmyth/librefmem \
+	lib/libhts \
+	xbmc/interfaces \
+	xbmc/interfaces/http-api \
+	xbmc/interfaces/json-rpc \
+	xbmc/interfaces/python \
+	xbmc/interfaces/python/xbmcmodule \
+	lib/libRTV \
+	xbmc/network/libscrobbler \
+	lib/libUPnP \
+	lib/libXBMS \
+	lib/libXDAAP \
+	xbmc/dbwrappers \
+	lib/UnrarXLib \
+	lib/libsquish \
 	xbmc/visualizations \
 	xbmc/screensavers \
 	xbmc/utils \
 	xbmc/settings \
 	xbmc/linux \
+        xbmc/input \
+	xbmc/input/linux \
 	xbmc/osx \
-	xbmc/posix
+	xbmc/threads \
+	xbmc/threads/posix \
+	xbmc/windowing \
+
+ifeq (@USE_OPENGL@,1)
+BIN_DIRS += xbmc/rendering/gl
+endif
+ifeq (@USE_OPENGLES@,1)
+BIN_DIRS += xbmc/rendering/gles
+BIN_DIRS += xbmc/windowing/gles
+endif
+
+ifeq ($(findstring osx,$(ARCH)),osx)
+BIN_DIRS += xbmc/windowing/osx
+BIN_DIRS += xbmc/network/osx
+BIN_DIRS += xbmc/storage/osx
+BIN_DIRS += xbmc/powermanagement/osx
+else
+BIN_DIRS += xbmc/windowing/X11
+endif
 
 EC_DIRS= \
 	tools/EventClients
@@ -58,21 +98,21 @@ XBMCTEX_DIRS= \
 	tools/TexturePacker
 
 DVDPCODECS_DIRS= \
-	xbmc/cores/dvdplayer/Codecs \
-	xbmc/cores/dvdplayer/Codecs/libdvd \
+	lib \
+	lib/libdvd \
 
 ifneq (@USE_EXTERNAL_LIBASS@,1)
 DVDPCODECS_DIRS+=lib/libass/xbmc
 endif
 
 PAPCODECS_DIRS= \
-	xbmc/cores/paplayer/ADPCMCodec \
-	xbmc/cores/paplayer/NSFCodec \
-	xbmc/cores/paplayer/timidity \
-	xbmc/cores/paplayer/SIDCodec \
-	xbmc/cores/paplayer/YMCodec/StSoundLibrary \
-	xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU \
-	xbmc/cores/paplayer/vgmstream \
+	lib/xbadpcm \
+	lib/nosefart \
+	lib/timidity \
+	lib/libsidplay2 \
+	lib/stsound/StSoundLibrary \
+	lib/snesapu/SNES/SNESAPU \
+	lib/vgmstream \
 
 ifeq (@USE_INTERNAL_LIBA52@,1)
 PAPCODECS_DIRS+= \
@@ -81,25 +121,25 @@ endif
 
 ifeq (@USE_ASAP_CODEC@,1)
 PAPCODEC_DIRS+= \
-	xbmc/cores/paplayer/asap
+	lib/asap
 endif
 
 ifeq ($(findstring osx,$(ARCH)),osx)
 PAPCODEC_DIRS+= \
-	xbmc/cores/paplayer/FLACCodec
+	lib/libflac
 endif
 
 LIB_DIRS=\
-	xbmc/lib/cximage-6.0 \
-	xbmc/lib/libexif \
-	xbmc/lib/libhdhomerun \
-	xbmc/lib/libid3tag \
-	xbmc/lib/libapetag \
-	xbmc/lib/libPython/linux \
+	lib/cximage-6.0 \
+	lib/libexif \
+	lib/libhdhomerun \
+	lib/libid3tag \
+	lib/libapetag \
+	xbmc/interfaces/python/linux \
 	lib/cpluff \
 	lib/libmodplug \
 	lib/xbmc-dll-symbols \
-	lib/jsoncpp/jsoncpp/src/lib_json
+	lib/jsoncpp/src/lib_json
 ifeq ($(findstring osx,$(ARCH)), osx)
 LIB_DIRS+=lib/libmicrohttpd
 endif
@@ -107,15 +147,21 @@ endif
 SS_DIRS=\
 	xbmc/screensavers/rsxs-0.9/xbmc
 
-VIS_DIRS=\
+VIS_DIRS=
+ifeq (@USE_OPENGL@,1)
+VIS_DIRS+=\
 	xbmc/visualizations/OpenGLSpectrum \
 	xbmc/visualizations/WaveForm \
-	xbmc/visualizations/XBMCProjectM
+	xbmc/visualizations/XBMCProjectM \
+
+endif
 ifeq ($(findstring osx,$(ARCH)), osx)
-VIS_DIRS+=xbmc/visualizations/iTunes
+VIS_DIRS+=xbmc/visualizations/iTunes \
+
 endif
 ifneq (@BUILD_GOOM@,1)
-VIS_DIRS+=xbmc/visualizations/Goom
+VIS_DIRS+=xbmc/visualizations/Goom \
+
 endif
 
 CONFLUENCE_MEDIA=addons/skin.confluence/media
@@ -139,9 +185,9 @@ CLEAN_FILES=xbmc.bin xbmc-xrandr
 
 DISTCLEAN_FILES=config.h config.log config.status tools/Linux/xbmc.sh \
         tools/Linux/xbmc-standalone.sh autom4te.cache config.h.in~ \
-        xbmc/lib/libPython/Python/Include/pyconfig.h \
-        xbmc/lib/libPython/Python/configure.lineno \
-        xbmc/lib/libPython/Python/libpython2.4.so.1.0 \
+        lib/python/Include/pyconfig.h \
+        lib/python/configure.lineno \
+        lib/python/libpython2.4.so.1.0 \
         system/libcpluff-$(ARCH).so
 
 all : Makefile externals xbmc.bin xbmc-xrandr skins
@@ -172,12 +218,10 @@ ifneq (arm, $(ARCH))
 	 $(MAKE) -C $(CONFLUENCE_MEDIA)
 endif
 
-guilib/guilib.a: force
-	$(MAKE) -C guilib
-guilib/common/gui_common.a: force
-	$(MAKE) -C guilib/common
-guilib/tinyXML/tinyxml.a: force
-	$(MAKE) -C guilib/tinyXML
+xbmc/guilib/guilib.a: force
+	$(MAKE) -C xbmc/guilib
+lib/tinyXML/tinyxml.a: force
+	$(MAKE) -C lib/tinyXML
 xbmc/xbmc.a: force
 	$(MAKE) -C xbmc
 xbmc/cdrip/cdrip.a: force
@@ -218,50 +262,118 @@ xbmc/cores/ExternalPlayer/ExternalPlayer.a: force
 	$(MAKE) -C xbmc/cores/ExternalPlayer
 xbmc/cores/playercorefactory/playercorefactory.a: force
 	$(MAKE) -C xbmc/cores/playercorefactory
-xbmc/FileSystem/filesystem.a: force
-	$(MAKE) -C xbmc/FileSystem
-xbmc/FileSystem/MusicDatabaseDirectory/musicdatabasedirectory.a: force
-	$(MAKE) -C xbmc/FileSystem/MusicDatabaseDirectory
-xbmc/FileSystem/VideoDatabaseDirectory/videodatabasedirectory.a: force
-	$(MAKE) -C xbmc/FileSystem/VideoDatabaseDirectory
-xbmc/karaoke/karaoke.a: force
-	$(MAKE) -C xbmc/karaoke
-xbmc/lib/cmyth/libcmyth/libcmyth.a: force
-	$(MAKE) -C xbmc/lib/cmyth/libcmyth
-xbmc/lib/cmyth/librefmem/librefmem.a: force
-	$(MAKE) -C xbmc/lib/cmyth/librefmem
-xbmc/lib/libhts/libhts.a: force
-	$(MAKE) -C xbmc/lib/libhts
-xbmc/lib/libPython/python.a: force
-	$(MAKE) -C xbmc/lib/libPython
-xbmc/lib/libPython/xbmcmodule/xbmcmodule.a: force
-	$(MAKE) -C xbmc/lib/libPython/xbmcmodule
-xbmc/lib/libscrobbler/scrobbler.a: force
-	$(MAKE) -C xbmc/lib/libscrobbler
-xbmc/lib/libRTV/librtv-@ARCH@.a: force
-	$(MAKE) -C xbmc/lib/libRTV
-xbmc/lib/libUPnP/libupnp-@ARCH@.a: force
-	$(MAKE) -C xbmc/lib/libUPnP
-xbmc/lib/libXBMS/libxbms-@ARCH@.a: force
-	$(MAKE) -C xbmc/lib/libXBMS
-xbmc/lib/libXDAAP/libxdaap-@ARCH@.a: force
-	$(MAKE) -C xbmc/lib/libXDAAP
-lib/jsoncpp/jsoncpp/src/lib_json/libjsoncpp.a: force
-	$(MAKE) -C lib/jsoncpp/jsoncpp/src/lib_json
-xbmc/lib/libjsonrpc/libjsonrpc.a: force
-	$(MAKE) -C xbmc/lib/libjsonrpc
-xbmc/lib/libhttpapi/libhttpapi.a: force
-	$(MAKE) -C xbmc/lib/libhttpapi
-xbmc/lib/sqLite/sqllite.a: force
-	$(MAKE) -C xbmc/lib/sqLite
-xbmc/lib/UnrarXLib/UnrarXLib.a: force
-	$(MAKE) -C xbmc/lib/UnrarXLib
-xbmc/lib/libsquish/libsquish-@ARCH@.a: force
-	$(MAKE) -C xbmc/lib/libsquish
+xbmc/filesystem/filesystem.a: force
+	$(MAKE) -C xbmc/filesystem
+xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a: force
+	$(MAKE) -C xbmc/filesystem/MusicDatabaseDirectory
+xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a: force
+	$(MAKE) -C xbmc/filesystem/VideoDatabaseDirectory
+xbmc/input/input.a: force
+	$(MAKE) -C xbmc/input
+xbmc/input/linux/input_linux.a: force
+	$(MAKE) -C xbmc/input/linux
+xbmc/music/karaoke/karaoke.a: force
+	$(MAKE) -C xbmc/music/karaoke
+xbmc/network/network.a: force
+	$(MAKE) -C xbmc/network
+xbmc/network/osx/network.a: force
+	$(MAKE) -C xbmc/network/osx
+xbmc/pictures/pictures.a: force
+	$(MAKE) -C xbmc/pictures
+xbmc/programs/programs.a: force
+	$(MAKE) -C xbmc/programs
+xbmc/network/linux/network_linux.a: force
+	$(MAKE) -C xbmc/network/linux
+xbmc/playlists/playlists.a: force
+	$(MAKE) -C xbmc/playlists
+xbmc/powermanagement/powermanagement.a: force
+	$(MAKE) -C xbmc/powermanagement
+xbmc/powermanagement/linux/powermanagement_linux.a: force
+	$(MAKE) -C xbmc/powermanagement/linux
+xbmc/powermanagement/osx/powermanagement.a: force
+	$(MAKE) -C xbmc/powermanagement/osx
+xbmc/rendering/rendering.a: force
+	$(MAKE) -C xbmc/rendering
+xbmc/rendering/gl/rendering_gl.a: force
+	$(MAKE) -C xbmc/rendering/gl
+xbmc/rendering/gles/rendering_gles.a: force
+	$(MAKE) -C xbmc/rendering/gles
+xbmc/windowing/windowing.a: force
+	$(MAKE) -C xbmc/windowing
+xbmc/windowing/gles/windowing_gles.a: force
+	$(MAKE) -C xbmc/windowing/gles
+xbmc/windowing/X11/windowing_X11.a: force
+	$(MAKE) -C xbmc/windowing/X11
+xbmc/windowing/osx/windowing_osx.a: force
+	$(MAKE) -C xbmc/windowing/osx
+xbmc/storage/storage.a: force
+	$(MAKE) -C xbmc/storage
+xbmc/storage/linux/storage_linux.a: force
+	$(MAKE) -C xbmc/storage/linux
+xbmc/storage/osx/storage.a: force
+	$(MAKE) -C xbmc/storage/osx
+xbmc/threads/threads.a: force
+	$(MAKE) -C xbmc/threads
+xbmc/music/music.a: force
+	$(MAKE) -C xbmc/music
+xbmc/music/tags/musictags.a: force
+	$(MAKE) -C xbmc/music/tags
+xbmc/music/dialogs/musicdialogs.a: force
+	$(MAKE) -C xbmc/music/dialogs
+xbmc/music/windows/musicwindows.a: force
+	$(MAKE) -C xbmc/music/windows
+xbmc/music/infoscanner/musicscanner.a: force
+	$(MAKE) -C xbmc/music/infoscanner
+xbmc/video/video.a: force
+	$(MAKE) -C xbmc/video
+xbmc/video/dialogs/videodialogs.a: force
+	$(MAKE) -C xbmc/video/dialogs
+xbmc/video/windows/videowindows.a: force
+	$(MAKE) -C xbmc/video/windows
+xbmc/dialogs/dialogs.a: force
+	$(MAKE) -C xbmc/dialogs
+xbmc/windows/windows.a: force
+	$(MAKE) -C xbmc/windows
+lib/cmyth/libcmyth/libcmyth.a: force
+	$(MAKE) -C lib/cmyth/libcmyth
+lib/cmyth/librefmem/librefmem.a: force
+	$(MAKE) -C lib/cmyth/librefmem
+lib/libhts/libhts.a: force
+	$(MAKE) -C lib/libhts
+xbmc/interfaces/interfaces.a: force
+	$(MAKE) -C xbmc/interfaces
+xbmc/interfaces/python/python.a: force
+	$(MAKE) -C xbmc/interfaces/python
+xbmc/interfaces/python/xbmcmodule/xbmcmodule.a: force
+	$(MAKE) -C xbmc/interfaces/python/xbmcmodule
+xbmc/network/libscrobbler/scrobbler.a: force
+	$(MAKE) -C xbmc/network/libscrobbler
+lib/libRTV/librtv-@ARCH@.a: force
+	$(MAKE) -C lib/libRTV
+lib/libUPnP/libupnp-@ARCH@.a: force
+	$(MAKE) -C lib/libUPnP
+lib/libXBMS/libxbms-@ARCH@.a: force
+	$(MAKE) -C lib/libXBMS
+lib/libXDAAP/libxdaap-@ARCH@.a: force
+	$(MAKE) -C lib/libXDAAP
+lib/jsoncpp/src/lib_json/libjsoncpp.a: force
+	$(MAKE) -C lib/jsoncpp/src/lib_json
+xbmc/interfaces/http-api/http-api.a: force
+	$(MAKE) -C xbmc/interfaces/http-api
+xbmc/interfaces/json-rpc/json-rpc.a: force
+	$(MAKE) -C xbmc/interfaces/json-rpc
+xbmc/dbwrappers/dbwrappers.a: force
+	$(MAKE) -C xbmc/dbwrappers
+lib/UnrarXLib/UnrarXLib.a: force
+	$(MAKE) -C lib/UnrarXLib
+lib/libsquish/libsquish-@ARCH@.a: force
+	$(MAKE) -C lib/libsquish
 xbmc/linux/linux.a: force
 	$(MAKE) -C xbmc/linux
-xbmc/posix/posix.a: force
-	$(MAKE) -C xbmc/posix
+xbmc/threads/posix/threads_posix.a: force
+	$(MAKE) -C xbmc/threads/posix
+xbmc/threads/darwin/threads_darwin.a: force
+	$(MAKE) -C xbmc/threads/darwin
 xbmc/addons/addons.a: force
 	$(MAKE) -C xbmc/addons
 xbmc/settings/settings.a: force
@@ -270,8 +382,8 @@ xbmc/utils/utils.a: force
 	$(MAKE) -C xbmc/utils
 xbmc/osx/osx.a: force
 	$(MAKE) -C xbmc/osx
-xbmc/lib/libapetag/.libs/libapetag.a: force
-	$(MAKE) -C xbmc/lib/libapetag
+lib/libapetag/.libs/libapetag.a: force
+	$(MAKE) -C lib/libapetag
 lib/cpluff/libcpluff/.libs/libcpluff.a: force
 	$(MAKE) -C lib/cpluff/libcpluff
 system/libcpluff-$(ARCH).so: lib/cpluff/libcpluff/.libs/libcpluff.a
@@ -322,13 +434,13 @@ ifneq (arm, $(ARCH))
 	$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
 endif
 libpython: dllloader
-	$(MAKE) -C xbmc/lib/libPython
-	$(MAKE) -C xbmc/lib/libPython/xbmcmodule
+	$(MAKE) -C xbmc/interfaces/python
+	$(MAKE) -C xbmc/interfaces/python/xbmcmodule
 python: dllloader
-	$(MAKE) -C xbmc/lib/libPython/linux
+	$(MAKE) -C xbmc/interfaces/python/linux
 dvdpcodecs: dllloader
-	$(MAKE) -C xbmc/cores/dvdplayer/Codecs
-	$(MAKE) -C xbmc/cores/dvdplayer/Codecs/libdvd
+	$(MAKE) -C lib 
+	$(MAKE) -C lib/libdvd
 ifneq (@USE_EXTERNAL_LIBASS@,1)
 	$(MAKE) -C lib/libass/xbmc
 endif
@@ -339,34 +451,34 @@ else
 	$(MAKE) -C tools/EventClients
 endif
 libexif: dllloader
-	$(MAKE) -C xbmc/lib/libexif
+	$(MAKE) -C lib/libexif
 libhdhomerun: dllloader
-	$(MAKE) -C xbmc/lib/libhdhomerun
+	$(MAKE) -C lib/libhdhomerun
 libid3tag: dllloader
-	$(MAKE) -C xbmc/lib/libid3tag
+	$(MAKE) -C lib/libid3tag
 papcodecs: dllloader dvdpcodecs
 ifeq (@USE_INTERNAL_LIBA52@,1)
 	$(MAKE) -C xbmc/cores/paplayer/AC3Codec
 endif
-	$(MAKE) -C xbmc/cores/paplayer/ADPCMCodec
+	$(MAKE) -C lib/xbadpcm
 ifeq ($(findstring osx,$(ARCH)), osx)
-	$(MAKE) -C xbmc/cores/paplayer/FLACCodec
+	$(MAKE) -C lib/libflac
 endif
-	$(MAKE) -C xbmc/cores/paplayer/vgmstream
-	$(MAKE) -C xbmc/cores/paplayer/timidity
-	$(MAKE) -C xbmc/cores/paplayer/NSFCodec
-	$(MAKE) -C xbmc/cores/paplayer/SIDCodec
+	$(MAKE) -C lib/vgmstream
+	$(MAKE) -C lib/timidity
+	$(MAKE) -C lib/nosefart 
+	$(MAKE) -C lib/libsidplay2 
 ifeq (@USE_ASAP_CODEC@,1)
   ifneq ($(findstring osx,$(ARCH)), osx)
-	$(MAKE) -C xbmc/cores/paplayer/asap asap-xbmc
+	$(MAKE) -C lib/asap asap-xbmc
   endif
 endif
-	$(MAKE) -C xbmc/cores/paplayer/YMCodec/StSoundLibrary	
+	$(MAKE) -C lib/stsound/StSoundLibrary	
 ifeq ($(or $(findstring powerpc,$(ARCH)),$(findstring x86_64-linux,$(ARCH)),$(findstring arm, $(ARCH))),)
-	$(MAKE) -C xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU
+	$(MAKE) -C lib/snesapu/SNES/SNESAPU
 endif
 imagelib: dllloader
-	$(MAKE) -C xbmc/lib/cximage-6.0
+	$(MAKE) -C lib/cximage-6.0
 
 codecs: papcodecs dvdpcodecs
 ifeq ($(findstring osx,$(ARCH)), osx)
@@ -378,16 +490,17 @@ externals: codecs libs python visualizations screensavers
 
 xcode_depends: \
 	codecs libs python visualizations screensavers eventclients skins \
-	xbmc/lib/libsquish/libsquish-@ARCH@.a \
-	xbmc/lib/libapetag/.libs/libapetag.a \
-	xbmc/lib/cmyth/libcmyth/libcmyth.a \
-	xbmc/lib/cmyth/librefmem/librefmem.a \
-	xbmc/lib/libXBMS/libxbms-@ARCH@.a \
-	xbmc/lib/libRTV/librtv-@ARCH@.a \
-	xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
-	xbmc/lib/libjsonrpc/libjsonrpc.a \
-	xbmc/lib/libhttpapi/libhttpapi.a \
-	lib/jsoncpp/jsoncpp/src/lib_json/libjsoncpp.a \
+	lib/libsquish/libsquish-@ARCH@.a \
+	lib/libapetag/.libs/libapetag.a \
+	lib/cmyth/libcmyth/libcmyth.a \
+	lib/cmyth/librefmem/librefmem.a \
+	lib/libXBMS/libxbms-@ARCH@.a \
+	lib/libRTV/librtv-@ARCH@.a \
+	lib/libXDAAP/libxdaap-@ARCH@.a \
+	xbmc/interfaces/interfaces.a \
+	xbmc/interfaces/http-api/http-api.a \
+	xbmc/interfaces/json-rpc/json-rpc.a \
+	lib/jsoncpp/src/lib_json/libjsoncpp.a \
 	lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a
 
 # platform independend objects
@@ -399,12 +512,10 @@ OBJSXBMC=	\
 	xbmc/cores/paplayer/paplayer.a \
 	xbmc/cores/VideoRenderers/VideoRenderer.a \
 	xbmc/cores/VideoRenderers/VideoShaders/VideoShaders.a \
-	guilib/guilib.a \
-	guilib/common/gui_common.a \
-	guilib/tinyXML/tinyxml.a \
-	xbmc/cdrip/cdrip.a \
+	xbmc/guilib/guilib.a \
+	lib/tinyXML/tinyxml.a \
 	xbmc/cores/cores.a \
-	xbmc/lib/libPython/python.a \
+	xbmc/interfaces/python/python.a \
 	xbmc/cores/DllLoader/dllloader.a \
 	xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.a \
 	xbmc/cores/dvdplayer/DVDCodecs/Audio/Audio.a \
@@ -415,55 +526,102 @@ OBJSXBMC=	\
 	xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitles.a \
 	xbmc/cores/AudioRenderers/audiorenderers.a \
 	xbmc/cores/ExternalPlayer/ExternalPlayer.a \
-	xbmc/FileSystem/filesystem.a \
-	xbmc/FileSystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
-	xbmc/FileSystem/VideoDatabaseDirectory/videodatabasedirectory.a \
-	xbmc/karaoke/karaoke.a \
-	xbmc/lib/libPython/xbmcmodule/xbmcmodule.a \
-	xbmc/lib/libscrobbler/scrobbler.a \
-	xbmc/lib/libRTV/librtv-@ARCH@.a \
-	xbmc/lib/libUPnP/libupnp-@ARCH@.a \
-	xbmc/lib/libXDAAP/libxdaap-@ARCH@.a \
-	xbmc/lib/libjsonrpc/libjsonrpc.a \
-	lib/jsoncpp/jsoncpp/src/lib_json/libjsoncpp.a \
-	xbmc/lib/libhttpapi/libhttpapi.a \
-	xbmc/lib/sqLite/sqllite.a \
-	xbmc/lib/libsquish/libsquish-@ARCH@.a \
-	xbmc/lib/libapetag/.libs/libapetag.a \
+	xbmc/filesystem/filesystem.a \
+	xbmc/filesystem/MusicDatabaseDirectory/musicdatabasedirectory.a \
+	xbmc/filesystem/VideoDatabaseDirectory/videodatabasedirectory.a \
+	xbmc/input/input.a \
+	xbmc/dialogs/dialogs.a \
+	xbmc/music/karaoke/karaoke.a \
+	xbmc/music/music.a \
+	xbmc/music/dialogs/musicdialogs.a \
+	xbmc/music/infoscanner/musicscanner.a \
+	xbmc/music/tags/musictags.a \
+	xbmc/music/windows/musicwindows.a \
+	xbmc/video/dialogs/videodialogs.a \
+	xbmc/pictures/pictures.a \
+	xbmc/playlists/playlists.a \
+	xbmc/programs/programs.a \
+	xbmc/powermanagement/powermanagement.a \
+	xbmc/storage/storage.a \
+	xbmc/threads/threads.a \
+	xbmc/windows/windows.a \
+	xbmc/interfaces/python/xbmcmodule/xbmcmodule.a \
+	xbmc/network/libscrobbler/scrobbler.a \
+	lib/libRTV/librtv-@ARCH@.a \
+	lib/libUPnP/libupnp-@ARCH@.a \
+	lib/libXDAAP/libxdaap-@ARCH@.a \
+	xbmc/interfaces/interfaces.a \
+	xbmc/cdrip/cdrip.a \
+	xbmc/interfaces/json-rpc/json-rpc.a \
+	lib/jsoncpp/src/lib_json/libjsoncpp.a \
+	xbmc/interfaces/http-api/http-api.a \
+	xbmc/dbwrappers/dbwrappers.a \
+	lib/libsquish/libsquish-@ARCH@.a \
+	lib/libapetag/.libs/libapetag.a \
 	lib/xbmc-dll-symbols/dll-symbols.a \
-	xbmc/settings/settings.a
+        xbmc/rendering/rendering.a \
+        xbmc/windowing/windowing.a \
+
+ifeq (@USE_OPENGL@,1)
+OBJSXBMC+= \
+	xbmc/rendering/gl/rendering_gl.a
+endif
+ifeq (@USE_OPENGLES@,1)
+OBJSXBMC+= \
+	xbmc/rendering/gles/rendering_gles.a \
+	xbmc/windowing/gles/windowing_gles.a
+endif
 
 ifeq (@HAVE_XBMC_NONFREE@,1)
 OBJSXBMC+= \
-	xbmc/lib/libXBMS/libxbms-@ARCH@.a \
-	xbmc/lib/UnrarXLib/UnrarXLib.a
+	lib/libXBMS/libxbms-@ARCH@.a \
+	lib/UnrarXLib/UnrarXLib.a
 endif
 
 ifneq (arm, $(ARCH))
 # Can't include libhts for arm due to GPLv3
 OBJSXBMC+= \
-	xbmc/lib/libhts/libhts.a
+	lib/libhts/libhts.a
 endif
 
 # platform dependend objects
 ifeq ($(findstring osx,$(ARCH)), osx)
 OBJSXBMC += \
 	xbmc/osx/osx.a \
-	lib/libSDL-OSX/libSDL-@ARCH@.a \
-	lib/libSDL-OSX/libSDL_mixer-@ARCH@.a \
-	lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a
+	xbmc/windowing/osx/windowing_osx.a \
+	lib/darwin/libSDL-OSX/libSDL-@ARCH@.a \
+	lib/darwin/libSDL-OSX/libSDL_mixer-@ARCH@.a \
+	lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a \
+	xbmc/threads/darwin/threads_darwin.a \
+	xbmc/powermanagement/osx/powermanagement.a \
+	xbmc/network/osx/network.a \
+	xbmc/storage/osx/storage.a \
+	xbmc/network/linux/network_linux.a \
+
 else
 OBJSXBMC += \
-	xbmc/posix/posix.a
+	xbmc/threads/posix/threads_posix.a \
+	xbmc/input/linux/input_linux.a \
+	xbmc/network/linux/network_linux.a \
+	xbmc/powermanagement/linux/powermanagement_linux.a \
+	xbmc/storage/linux/storage_linux.a
+ifeq (@USE_OPENGL@,1)
+OBJSXBMC+= \
+	xbmc/windowing/X11/windowing_X11.a
+endif
 endif
 
 DYNOBJSXBMC= \
-	xbmc/lib/cmyth/libcmyth/libcmyth.a \
-	xbmc/lib/cmyth/librefmem/librefmem.a \
+	lib/cmyth/libcmyth/libcmyth.a \
+	lib/cmyth/librefmem/librefmem.a \
 	xbmc/linux/linux.a \
+	xbmc/network/network.a \
+	xbmc/video/windows/videowindows.a \
 	xbmc/utils/utils.a \
 	xbmc/cores/DllLoader/exports/util/exports_utils.a \
-	xbmc/cores/DllLoader/exports/exports.a
+	xbmc/cores/DllLoader/exports/exports.a \
+	xbmc/settings/settings.a \
+	xbmc/video/video.a \
 
 ifeq (arm, $(ARCH))
 # Force external python2.5 for now!
@@ -494,7 +652,7 @@ else
 	$(MAKE) -C tools/XBMCTex/
 endif
 
-tools/TexturePacker/TexturePacker: guilib/guilib.a xbmc/lib/libsquish/libsquish-@ARCH@.a
+tools/TexturePacker/TexturePacker: xbmc/guilib/guilib.a lib/libsquish/libsquish-@ARCH@.a
 	$(MAKE) -C tools/TexturePacker/
 
 livedatas: