diff --git a/src/AppParamParser.cpp b/xbmc/AppParamParser.cpp similarity index 100% rename from src/AppParamParser.cpp rename to xbmc/AppParamParser.cpp diff --git a/src/AppParamParser.h b/xbmc/AppParamParser.h similarity index 100% rename from src/AppParamParser.h rename to xbmc/AppParamParser.h diff --git a/src/Application.cpp b/xbmc/Application.cpp similarity index 100% rename from src/Application.cpp rename to xbmc/Application.cpp diff --git a/src/Application.h b/xbmc/Application.h similarity index 100% rename from src/Application.h rename to xbmc/Application.h diff --git a/src/ApplicationMessenger.cpp b/xbmc/ApplicationMessenger.cpp similarity index 100% rename from src/ApplicationMessenger.cpp rename to xbmc/ApplicationMessenger.cpp diff --git a/src/ApplicationMessenger.h b/xbmc/ApplicationMessenger.h similarity index 100% rename from src/ApplicationMessenger.h rename to xbmc/ApplicationMessenger.h diff --git a/src/ApplicationPlayer.cpp b/xbmc/ApplicationPlayer.cpp similarity index 100% rename from src/ApplicationPlayer.cpp rename to xbmc/ApplicationPlayer.cpp diff --git a/src/ApplicationPlayer.h b/xbmc/ApplicationPlayer.h similarity index 100% rename from src/ApplicationPlayer.h rename to xbmc/ApplicationPlayer.h diff --git a/src/AutoSwitch.cpp b/xbmc/AutoSwitch.cpp similarity index 100% rename from src/AutoSwitch.cpp rename to xbmc/AutoSwitch.cpp diff --git a/src/AutoSwitch.h b/xbmc/AutoSwitch.h similarity index 100% rename from src/AutoSwitch.h rename to xbmc/AutoSwitch.h diff --git a/src/Autorun.cpp b/xbmc/Autorun.cpp similarity index 100% rename from src/Autorun.cpp rename to xbmc/Autorun.cpp diff --git a/src/Autorun.h b/xbmc/Autorun.h similarity index 100% rename from src/Autorun.h rename to xbmc/Autorun.h diff --git a/src/BackgroundInfoLoader.cpp b/xbmc/BackgroundInfoLoader.cpp similarity index 100% rename from src/BackgroundInfoLoader.cpp rename to xbmc/BackgroundInfoLoader.cpp diff --git a/src/BackgroundInfoLoader.h b/xbmc/BackgroundInfoLoader.h similarity index 100% rename from src/BackgroundInfoLoader.h rename to xbmc/BackgroundInfoLoader.h diff --git a/src/CompileInfo.cpp.in b/xbmc/CompileInfo.cpp.in similarity index 100% rename from src/CompileInfo.cpp.in rename to xbmc/CompileInfo.cpp.in diff --git a/src/CompileInfo.h b/xbmc/CompileInfo.h similarity index 100% rename from src/CompileInfo.h rename to xbmc/CompileInfo.h diff --git a/src/CueDocument.cpp b/xbmc/CueDocument.cpp similarity index 100% rename from src/CueDocument.cpp rename to xbmc/CueDocument.cpp diff --git a/src/CueDocument.h b/xbmc/CueDocument.h similarity index 100% rename from src/CueDocument.h rename to xbmc/CueDocument.h diff --git a/src/DatabaseManager.cpp b/xbmc/DatabaseManager.cpp similarity index 100% rename from src/DatabaseManager.cpp rename to xbmc/DatabaseManager.cpp diff --git a/src/DatabaseManager.h b/xbmc/DatabaseManager.h similarity index 100% rename from src/DatabaseManager.h rename to xbmc/DatabaseManager.h diff --git a/src/DbUrl.cpp b/xbmc/DbUrl.cpp similarity index 100% rename from src/DbUrl.cpp rename to xbmc/DbUrl.cpp diff --git a/src/DbUrl.h b/xbmc/DbUrl.h similarity index 100% rename from src/DbUrl.h rename to xbmc/DbUrl.h diff --git a/src/DllPaths.h b/xbmc/DllPaths.h similarity index 100% rename from src/DllPaths.h rename to xbmc/DllPaths.h diff --git a/src/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in similarity index 100% rename from src/DllPaths_generated.h.in rename to xbmc/DllPaths_generated.h.in diff --git a/src/DllPaths_generated_android.h.in b/xbmc/DllPaths_generated_android.h.in similarity index 100% rename from src/DllPaths_generated_android.h.in rename to xbmc/DllPaths_generated_android.h.in diff --git a/src/DllPaths_win32.h b/xbmc/DllPaths_win32.h similarity index 100% rename from src/DllPaths_win32.h rename to xbmc/DllPaths_win32.h diff --git a/src/DynamicDll.cpp b/xbmc/DynamicDll.cpp similarity index 100% rename from src/DynamicDll.cpp rename to xbmc/DynamicDll.cpp diff --git a/src/DynamicDll.h b/xbmc/DynamicDll.h similarity index 100% rename from src/DynamicDll.h rename to xbmc/DynamicDll.h diff --git a/src/FileItem.cpp b/xbmc/FileItem.cpp similarity index 100% rename from src/FileItem.cpp rename to xbmc/FileItem.cpp diff --git a/src/FileItem.h b/xbmc/FileItem.h similarity index 100% rename from src/FileItem.h rename to xbmc/FileItem.h diff --git a/src/FileItemListModification.cpp b/xbmc/FileItemListModification.cpp similarity index 100% rename from src/FileItemListModification.cpp rename to xbmc/FileItemListModification.cpp diff --git a/src/FileItemListModification.h b/xbmc/FileItemListModification.h similarity index 100% rename from src/FileItemListModification.h rename to xbmc/FileItemListModification.h diff --git a/src/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp similarity index 100% rename from src/GUIInfoManager.cpp rename to xbmc/GUIInfoManager.cpp diff --git a/src/GUIInfoManager.h b/xbmc/GUIInfoManager.h similarity index 100% rename from src/GUIInfoManager.h rename to xbmc/GUIInfoManager.h diff --git a/src/GUILargeTextureManager.cpp b/xbmc/GUILargeTextureManager.cpp similarity index 100% rename from src/GUILargeTextureManager.cpp rename to xbmc/GUILargeTextureManager.cpp diff --git a/src/GUILargeTextureManager.h b/xbmc/GUILargeTextureManager.h similarity index 100% rename from src/GUILargeTextureManager.h rename to xbmc/GUILargeTextureManager.h diff --git a/src/GUIPassword.cpp b/xbmc/GUIPassword.cpp similarity index 100% rename from src/GUIPassword.cpp rename to xbmc/GUIPassword.cpp diff --git a/src/GUIPassword.h b/xbmc/GUIPassword.h similarity index 100% rename from src/GUIPassword.h rename to xbmc/GUIPassword.h diff --git a/src/GUIUserMessages.h b/xbmc/GUIUserMessages.h similarity index 100% rename from src/GUIUserMessages.h rename to xbmc/GUIUserMessages.h diff --git a/src/IFileItemListModifier.h b/xbmc/IFileItemListModifier.h similarity index 100% rename from src/IFileItemListModifier.h rename to xbmc/IFileItemListModifier.h diff --git a/src/IProgressCallback.h b/xbmc/IProgressCallback.h similarity index 100% rename from src/IProgressCallback.h rename to xbmc/IProgressCallback.h diff --git a/src/LangInfo.cpp b/xbmc/LangInfo.cpp similarity index 100% rename from src/LangInfo.cpp rename to xbmc/LangInfo.cpp diff --git a/src/LangInfo.h b/xbmc/LangInfo.h similarity index 100% rename from src/LangInfo.h rename to xbmc/LangInfo.h diff --git a/src/Makefile.in b/xbmc/Makefile.in similarity index 100% rename from src/Makefile.in rename to xbmc/Makefile.in diff --git a/src/MediaSource.cpp b/xbmc/MediaSource.cpp similarity index 100% rename from src/MediaSource.cpp rename to xbmc/MediaSource.cpp diff --git a/src/MediaSource.h b/xbmc/MediaSource.h similarity index 100% rename from src/MediaSource.h rename to xbmc/MediaSource.h diff --git a/src/NfoFile.cpp b/xbmc/NfoFile.cpp similarity index 100% rename from src/NfoFile.cpp rename to xbmc/NfoFile.cpp diff --git a/src/NfoFile.h b/xbmc/NfoFile.h similarity index 100% rename from src/NfoFile.h rename to xbmc/NfoFile.h diff --git a/src/PartyModeManager.cpp b/xbmc/PartyModeManager.cpp similarity index 100% rename from src/PartyModeManager.cpp rename to xbmc/PartyModeManager.cpp diff --git a/src/PartyModeManager.h b/xbmc/PartyModeManager.h similarity index 100% rename from src/PartyModeManager.h rename to xbmc/PartyModeManager.h diff --git a/src/PasswordManager.cpp b/xbmc/PasswordManager.cpp similarity index 100% rename from src/PasswordManager.cpp rename to xbmc/PasswordManager.cpp diff --git a/src/PasswordManager.h b/xbmc/PasswordManager.h similarity index 100% rename from src/PasswordManager.h rename to xbmc/PasswordManager.h diff --git a/src/PlayListPlayer.cpp b/xbmc/PlayListPlayer.cpp similarity index 100% rename from src/PlayListPlayer.cpp rename to xbmc/PlayListPlayer.cpp diff --git a/src/PlayListPlayer.h b/xbmc/PlayListPlayer.h similarity index 100% rename from src/PlayListPlayer.h rename to xbmc/PlayListPlayer.h diff --git a/src/SectionLoader.cpp b/xbmc/SectionLoader.cpp similarity index 100% rename from src/SectionLoader.cpp rename to xbmc/SectionLoader.cpp diff --git a/src/SectionLoader.h b/xbmc/SectionLoader.h similarity index 100% rename from src/SectionLoader.h rename to xbmc/SectionLoader.h diff --git a/src/SortFileItem.h b/xbmc/SortFileItem.h similarity index 100% rename from src/SortFileItem.h rename to xbmc/SortFileItem.h diff --git a/src/SystemGlobals.cpp b/xbmc/SystemGlobals.cpp similarity index 100% rename from src/SystemGlobals.cpp rename to xbmc/SystemGlobals.cpp diff --git a/src/Temperature.cpp b/xbmc/Temperature.cpp similarity index 100% rename from src/Temperature.cpp rename to xbmc/Temperature.cpp diff --git a/src/Temperature.h b/xbmc/Temperature.h similarity index 100% rename from src/Temperature.h rename to xbmc/Temperature.h diff --git a/src/TextureCache.cpp b/xbmc/TextureCache.cpp similarity index 100% rename from src/TextureCache.cpp rename to xbmc/TextureCache.cpp diff --git a/src/TextureCache.h b/xbmc/TextureCache.h similarity index 100% rename from src/TextureCache.h rename to xbmc/TextureCache.h diff --git a/src/TextureCacheJob.cpp b/xbmc/TextureCacheJob.cpp similarity index 100% rename from src/TextureCacheJob.cpp rename to xbmc/TextureCacheJob.cpp diff --git a/src/TextureCacheJob.h b/xbmc/TextureCacheJob.h similarity index 100% rename from src/TextureCacheJob.h rename to xbmc/TextureCacheJob.h diff --git a/src/TextureDatabase.cpp b/xbmc/TextureDatabase.cpp similarity index 100% rename from src/TextureDatabase.cpp rename to xbmc/TextureDatabase.cpp diff --git a/src/TextureDatabase.h b/xbmc/TextureDatabase.h similarity index 100% rename from src/TextureDatabase.h rename to xbmc/TextureDatabase.h diff --git a/src/ThumbLoader.cpp b/xbmc/ThumbLoader.cpp similarity index 100% rename from src/ThumbLoader.cpp rename to xbmc/ThumbLoader.cpp diff --git a/src/ThumbLoader.h b/xbmc/ThumbLoader.h similarity index 100% rename from src/ThumbLoader.h rename to xbmc/ThumbLoader.h diff --git a/src/ThumbnailCache.cpp b/xbmc/ThumbnailCache.cpp similarity index 100% rename from src/ThumbnailCache.cpp rename to xbmc/ThumbnailCache.cpp diff --git a/src/ThumbnailCache.h b/xbmc/ThumbnailCache.h similarity index 100% rename from src/ThumbnailCache.h rename to xbmc/ThumbnailCache.h diff --git a/src/URL.cpp b/xbmc/URL.cpp similarity index 100% rename from src/URL.cpp rename to xbmc/URL.cpp diff --git a/src/URL.h b/xbmc/URL.h similarity index 100% rename from src/URL.h rename to xbmc/URL.h diff --git a/src/Util.cpp b/xbmc/Util.cpp similarity index 100% rename from src/Util.cpp rename to xbmc/Util.cpp diff --git a/src/Util.h b/xbmc/Util.h similarity index 100% rename from src/Util.h rename to xbmc/Util.h diff --git a/src/XBApplicationEx.cpp b/xbmc/XBApplicationEx.cpp similarity index 100% rename from src/XBApplicationEx.cpp rename to xbmc/XBApplicationEx.cpp diff --git a/src/XBApplicationEx.h b/xbmc/XBApplicationEx.h similarity index 100% rename from src/XBApplicationEx.h rename to xbmc/XBApplicationEx.h diff --git a/src/XBDateTime.cpp b/xbmc/XBDateTime.cpp similarity index 100% rename from src/XBDateTime.cpp rename to xbmc/XBDateTime.cpp diff --git a/src/XBDateTime.h b/xbmc/XBDateTime.h similarity index 100% rename from src/XBDateTime.h rename to xbmc/XBDateTime.h diff --git a/src/XbmcContext.cpp b/xbmc/XbmcContext.cpp similarity index 100% rename from src/XbmcContext.cpp rename to xbmc/XbmcContext.cpp diff --git a/src/XbmcContext.h b/xbmc/XbmcContext.h similarity index 100% rename from src/XbmcContext.h rename to xbmc/XbmcContext.h diff --git a/src/addons/Addon.cpp b/xbmc/addons/Addon.cpp similarity index 100% rename from src/addons/Addon.cpp rename to xbmc/addons/Addon.cpp diff --git a/src/addons/Addon.h b/xbmc/addons/Addon.h similarity index 100% rename from src/addons/Addon.h rename to xbmc/addons/Addon.h diff --git a/src/addons/AddonCallbacks.cpp b/xbmc/addons/AddonCallbacks.cpp similarity index 100% rename from src/addons/AddonCallbacks.cpp rename to xbmc/addons/AddonCallbacks.cpp diff --git a/src/addons/AddonCallbacks.h b/xbmc/addons/AddonCallbacks.h similarity index 100% rename from src/addons/AddonCallbacks.h rename to xbmc/addons/AddonCallbacks.h diff --git a/src/addons/AddonCallbacksAddon.cpp b/xbmc/addons/AddonCallbacksAddon.cpp similarity index 100% rename from src/addons/AddonCallbacksAddon.cpp rename to xbmc/addons/AddonCallbacksAddon.cpp diff --git a/src/addons/AddonCallbacksAddon.h b/xbmc/addons/AddonCallbacksAddon.h similarity index 100% rename from src/addons/AddonCallbacksAddon.h rename to xbmc/addons/AddonCallbacksAddon.h diff --git a/src/addons/AddonCallbacksCodec.cpp b/xbmc/addons/AddonCallbacksCodec.cpp similarity index 100% rename from src/addons/AddonCallbacksCodec.cpp rename to xbmc/addons/AddonCallbacksCodec.cpp diff --git a/src/addons/AddonCallbacksCodec.h b/xbmc/addons/AddonCallbacksCodec.h similarity index 100% rename from src/addons/AddonCallbacksCodec.h rename to xbmc/addons/AddonCallbacksCodec.h diff --git a/src/addons/AddonCallbacksGUI.cpp b/xbmc/addons/AddonCallbacksGUI.cpp similarity index 100% rename from src/addons/AddonCallbacksGUI.cpp rename to xbmc/addons/AddonCallbacksGUI.cpp diff --git a/src/addons/AddonCallbacksGUI.h b/xbmc/addons/AddonCallbacksGUI.h similarity index 100% rename from src/addons/AddonCallbacksGUI.h rename to xbmc/addons/AddonCallbacksGUI.h diff --git a/src/addons/AddonCallbacksPVR.cpp b/xbmc/addons/AddonCallbacksPVR.cpp similarity index 100% rename from src/addons/AddonCallbacksPVR.cpp rename to xbmc/addons/AddonCallbacksPVR.cpp diff --git a/src/addons/AddonCallbacksPVR.h b/xbmc/addons/AddonCallbacksPVR.h similarity index 100% rename from src/addons/AddonCallbacksPVR.h rename to xbmc/addons/AddonCallbacksPVR.h diff --git a/src/addons/AddonDatabase.cpp b/xbmc/addons/AddonDatabase.cpp similarity index 100% rename from src/addons/AddonDatabase.cpp rename to xbmc/addons/AddonDatabase.cpp diff --git a/src/addons/AddonDatabase.h b/xbmc/addons/AddonDatabase.h similarity index 100% rename from src/addons/AddonDatabase.h rename to xbmc/addons/AddonDatabase.h diff --git a/src/addons/AddonDll.h b/xbmc/addons/AddonDll.h similarity index 100% rename from src/addons/AddonDll.h rename to xbmc/addons/AddonDll.h diff --git a/src/addons/AddonInstaller.cpp b/xbmc/addons/AddonInstaller.cpp similarity index 100% rename from src/addons/AddonInstaller.cpp rename to xbmc/addons/AddonInstaller.cpp diff --git a/src/addons/AddonInstaller.h b/xbmc/addons/AddonInstaller.h similarity index 100% rename from src/addons/AddonInstaller.h rename to xbmc/addons/AddonInstaller.h diff --git a/src/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp similarity index 100% rename from src/addons/AddonManager.cpp rename to xbmc/addons/AddonManager.cpp diff --git a/src/addons/AddonManager.h b/xbmc/addons/AddonManager.h similarity index 100% rename from src/addons/AddonManager.h rename to xbmc/addons/AddonManager.h diff --git a/src/addons/AddonStatusHandler.cpp b/xbmc/addons/AddonStatusHandler.cpp similarity index 100% rename from src/addons/AddonStatusHandler.cpp rename to xbmc/addons/AddonStatusHandler.cpp diff --git a/src/addons/AddonStatusHandler.h b/xbmc/addons/AddonStatusHandler.h similarity index 100% rename from src/addons/AddonStatusHandler.h rename to xbmc/addons/AddonStatusHandler.h diff --git a/src/addons/AddonVersion.cpp b/xbmc/addons/AddonVersion.cpp similarity index 100% rename from src/addons/AddonVersion.cpp rename to xbmc/addons/AddonVersion.cpp diff --git a/src/addons/AddonVersion.h b/xbmc/addons/AddonVersion.h similarity index 100% rename from src/addons/AddonVersion.h rename to xbmc/addons/AddonVersion.h diff --git a/src/addons/AudioEncoder.cpp b/xbmc/addons/AudioEncoder.cpp similarity index 100% rename from src/addons/AudioEncoder.cpp rename to xbmc/addons/AudioEncoder.cpp diff --git a/src/addons/AudioEncoder.h b/xbmc/addons/AudioEncoder.h similarity index 100% rename from src/addons/AudioEncoder.h rename to xbmc/addons/AudioEncoder.h diff --git a/src/addons/DllAddon.h b/xbmc/addons/DllAddon.h similarity index 100% rename from src/addons/DllAddon.h rename to xbmc/addons/DllAddon.h diff --git a/src/addons/DllLibCPluff.h b/xbmc/addons/DllLibCPluff.h similarity index 100% rename from src/addons/DllLibCPluff.h rename to xbmc/addons/DllLibCPluff.h diff --git a/src/addons/DllPVRClient.h b/xbmc/addons/DllPVRClient.h similarity index 100% rename from src/addons/DllPVRClient.h rename to xbmc/addons/DllPVRClient.h diff --git a/src/addons/GUIDialogAddonInfo.cpp b/xbmc/addons/GUIDialogAddonInfo.cpp similarity index 100% rename from src/addons/GUIDialogAddonInfo.cpp rename to xbmc/addons/GUIDialogAddonInfo.cpp diff --git a/src/addons/GUIDialogAddonInfo.h b/xbmc/addons/GUIDialogAddonInfo.h similarity index 100% rename from src/addons/GUIDialogAddonInfo.h rename to xbmc/addons/GUIDialogAddonInfo.h diff --git a/src/addons/GUIDialogAddonSettings.cpp b/xbmc/addons/GUIDialogAddonSettings.cpp similarity index 100% rename from src/addons/GUIDialogAddonSettings.cpp rename to xbmc/addons/GUIDialogAddonSettings.cpp diff --git a/src/addons/GUIDialogAddonSettings.h b/xbmc/addons/GUIDialogAddonSettings.h similarity index 100% rename from src/addons/GUIDialogAddonSettings.h rename to xbmc/addons/GUIDialogAddonSettings.h diff --git a/src/addons/GUIViewStateAddonBrowser.cpp b/xbmc/addons/GUIViewStateAddonBrowser.cpp similarity index 100% rename from src/addons/GUIViewStateAddonBrowser.cpp rename to xbmc/addons/GUIViewStateAddonBrowser.cpp diff --git a/src/addons/GUIViewStateAddonBrowser.h b/xbmc/addons/GUIViewStateAddonBrowser.h similarity index 100% rename from src/addons/GUIViewStateAddonBrowser.h rename to xbmc/addons/GUIViewStateAddonBrowser.h diff --git a/src/addons/GUIWindowAddonBrowser.cpp b/xbmc/addons/GUIWindowAddonBrowser.cpp similarity index 100% rename from src/addons/GUIWindowAddonBrowser.cpp rename to xbmc/addons/GUIWindowAddonBrowser.cpp diff --git a/src/addons/GUIWindowAddonBrowser.h b/xbmc/addons/GUIWindowAddonBrowser.h similarity index 100% rename from src/addons/GUIWindowAddonBrowser.h rename to xbmc/addons/GUIWindowAddonBrowser.h diff --git a/src/addons/IAddon.h b/xbmc/addons/IAddon.h similarity index 100% rename from src/addons/IAddon.h rename to xbmc/addons/IAddon.h diff --git a/src/addons/Makefile b/xbmc/addons/Makefile similarity index 100% rename from src/addons/Makefile rename to xbmc/addons/Makefile diff --git a/src/addons/PluginSource.cpp b/xbmc/addons/PluginSource.cpp similarity index 100% rename from src/addons/PluginSource.cpp rename to xbmc/addons/PluginSource.cpp diff --git a/src/addons/PluginSource.h b/xbmc/addons/PluginSource.h similarity index 100% rename from src/addons/PluginSource.h rename to xbmc/addons/PluginSource.h diff --git a/src/addons/Repository.cpp b/xbmc/addons/Repository.cpp similarity index 100% rename from src/addons/Repository.cpp rename to xbmc/addons/Repository.cpp diff --git a/src/addons/Repository.h b/xbmc/addons/Repository.h similarity index 100% rename from src/addons/Repository.h rename to xbmc/addons/Repository.h diff --git a/src/addons/Scraper.cpp b/xbmc/addons/Scraper.cpp similarity index 100% rename from src/addons/Scraper.cpp rename to xbmc/addons/Scraper.cpp diff --git a/src/addons/Scraper.h b/xbmc/addons/Scraper.h similarity index 100% rename from src/addons/Scraper.h rename to xbmc/addons/Scraper.h diff --git a/src/addons/ScreenSaver.cpp b/xbmc/addons/ScreenSaver.cpp similarity index 100% rename from src/addons/ScreenSaver.cpp rename to xbmc/addons/ScreenSaver.cpp diff --git a/src/addons/ScreenSaver.h b/xbmc/addons/ScreenSaver.h similarity index 100% rename from src/addons/ScreenSaver.h rename to xbmc/addons/ScreenSaver.h diff --git a/src/addons/Service.cpp b/xbmc/addons/Service.cpp similarity index 100% rename from src/addons/Service.cpp rename to xbmc/addons/Service.cpp diff --git a/src/addons/Service.h b/xbmc/addons/Service.h similarity index 100% rename from src/addons/Service.h rename to xbmc/addons/Service.h diff --git a/src/addons/Skin.cpp b/xbmc/addons/Skin.cpp similarity index 100% rename from src/addons/Skin.cpp rename to xbmc/addons/Skin.cpp diff --git a/src/addons/Skin.h b/xbmc/addons/Skin.h similarity index 100% rename from src/addons/Skin.h rename to xbmc/addons/Skin.h diff --git a/src/addons/Visualisation.cpp b/xbmc/addons/Visualisation.cpp similarity index 100% rename from src/addons/Visualisation.cpp rename to xbmc/addons/Visualisation.cpp diff --git a/src/addons/Visualisation.h b/xbmc/addons/Visualisation.h similarity index 100% rename from src/addons/Visualisation.h rename to xbmc/addons/Visualisation.h diff --git a/src/addons/addon-bindings.mk b/xbmc/addons/addon-bindings.mk similarity index 100% rename from src/addons/addon-bindings.mk rename to xbmc/addons/addon-bindings.mk diff --git a/src/addons/include/NOTE b/xbmc/addons/include/NOTE similarity index 100% rename from src/addons/include/NOTE rename to xbmc/addons/include/NOTE diff --git a/src/addons/include/xbmc_addon_cpp_dll.h b/xbmc/addons/include/xbmc_addon_cpp_dll.h similarity index 100% rename from src/addons/include/xbmc_addon_cpp_dll.h rename to xbmc/addons/include/xbmc_addon_cpp_dll.h diff --git a/src/addons/include/xbmc_addon_dll.h b/xbmc/addons/include/xbmc_addon_dll.h similarity index 100% rename from src/addons/include/xbmc_addon_dll.h rename to xbmc/addons/include/xbmc_addon_dll.h diff --git a/src/addons/include/xbmc_addon_types.h b/xbmc/addons/include/xbmc_addon_types.h similarity index 100% rename from src/addons/include/xbmc_addon_types.h rename to xbmc/addons/include/xbmc_addon_types.h diff --git a/src/addons/include/xbmc_audioenc_dll.h b/xbmc/addons/include/xbmc_audioenc_dll.h similarity index 100% rename from src/addons/include/xbmc_audioenc_dll.h rename to xbmc/addons/include/xbmc_audioenc_dll.h diff --git a/src/addons/include/xbmc_audioenc_types.h b/xbmc/addons/include/xbmc_audioenc_types.h similarity index 100% rename from src/addons/include/xbmc_audioenc_types.h rename to xbmc/addons/include/xbmc_audioenc_types.h diff --git a/src/addons/include/xbmc_codec_types.h b/xbmc/addons/include/xbmc_codec_types.h similarity index 100% rename from src/addons/include/xbmc_codec_types.h rename to xbmc/addons/include/xbmc_codec_types.h diff --git a/src/addons/include/xbmc_epg_types.h b/xbmc/addons/include/xbmc_epg_types.h similarity index 100% rename from src/addons/include/xbmc_epg_types.h rename to xbmc/addons/include/xbmc_epg_types.h diff --git a/src/addons/include/xbmc_pvr_dll.h b/xbmc/addons/include/xbmc_pvr_dll.h similarity index 100% rename from src/addons/include/xbmc_pvr_dll.h rename to xbmc/addons/include/xbmc_pvr_dll.h diff --git a/src/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h similarity index 100% rename from src/addons/include/xbmc_pvr_types.h rename to xbmc/addons/include/xbmc_pvr_types.h diff --git a/src/addons/include/xbmc_scr_dll.h b/xbmc/addons/include/xbmc_scr_dll.h similarity index 100% rename from src/addons/include/xbmc_scr_dll.h rename to xbmc/addons/include/xbmc_scr_dll.h diff --git a/src/addons/include/xbmc_scr_types.h b/xbmc/addons/include/xbmc_scr_types.h similarity index 100% rename from src/addons/include/xbmc_scr_types.h rename to xbmc/addons/include/xbmc_scr_types.h diff --git a/src/addons/include/xbmc_stream_utils.hpp b/xbmc/addons/include/xbmc_stream_utils.hpp similarity index 100% rename from src/addons/include/xbmc_stream_utils.hpp rename to xbmc/addons/include/xbmc_stream_utils.hpp diff --git a/src/addons/include/xbmc_vis_dll.h b/xbmc/addons/include/xbmc_vis_dll.h similarity index 100% rename from src/addons/include/xbmc_vis_dll.h rename to xbmc/addons/include/xbmc_vis_dll.h diff --git a/src/addons/include/xbmc_vis_types.h b/xbmc/addons/include/xbmc_vis_types.h similarity index 100% rename from src/addons/include/xbmc_vis_types.h rename to xbmc/addons/include/xbmc_vis_types.h diff --git a/src/addons/test/Makefile b/xbmc/addons/test/Makefile similarity index 100% rename from src/addons/test/Makefile rename to xbmc/addons/test/Makefile diff --git a/src/addons/test/TestAddonVersion.cpp b/xbmc/addons/test/TestAddonVersion.cpp similarity index 100% rename from src/addons/test/TestAddonVersion.cpp rename to xbmc/addons/test/TestAddonVersion.cpp diff --git a/src/android/activity/AndroidExtra.h b/xbmc/android/activity/AndroidExtra.h similarity index 100% rename from src/android/activity/AndroidExtra.h rename to xbmc/android/activity/AndroidExtra.h diff --git a/src/android/activity/AndroidFeatures.cpp b/xbmc/android/activity/AndroidFeatures.cpp similarity index 100% rename from src/android/activity/AndroidFeatures.cpp rename to xbmc/android/activity/AndroidFeatures.cpp diff --git a/src/android/activity/AndroidFeatures.h b/xbmc/android/activity/AndroidFeatures.h similarity index 100% rename from src/android/activity/AndroidFeatures.h rename to xbmc/android/activity/AndroidFeatures.h diff --git a/src/android/activity/AndroidJoyStick.cpp b/xbmc/android/activity/AndroidJoyStick.cpp similarity index 100% rename from src/android/activity/AndroidJoyStick.cpp rename to xbmc/android/activity/AndroidJoyStick.cpp diff --git a/src/android/activity/AndroidJoyStick.h b/xbmc/android/activity/AndroidJoyStick.h similarity index 100% rename from src/android/activity/AndroidJoyStick.h rename to xbmc/android/activity/AndroidJoyStick.h diff --git a/src/android/activity/AndroidKey.cpp b/xbmc/android/activity/AndroidKey.cpp similarity index 100% rename from src/android/activity/AndroidKey.cpp rename to xbmc/android/activity/AndroidKey.cpp diff --git a/src/android/activity/AndroidKey.h b/xbmc/android/activity/AndroidKey.h similarity index 100% rename from src/android/activity/AndroidKey.h rename to xbmc/android/activity/AndroidKey.h diff --git a/src/android/activity/AndroidMouse.cpp b/xbmc/android/activity/AndroidMouse.cpp similarity index 100% rename from src/android/activity/AndroidMouse.cpp rename to xbmc/android/activity/AndroidMouse.cpp diff --git a/src/android/activity/AndroidMouse.h b/xbmc/android/activity/AndroidMouse.h similarity index 100% rename from src/android/activity/AndroidMouse.h rename to xbmc/android/activity/AndroidMouse.h diff --git a/src/android/activity/AndroidTouch.cpp b/xbmc/android/activity/AndroidTouch.cpp similarity index 100% rename from src/android/activity/AndroidTouch.cpp rename to xbmc/android/activity/AndroidTouch.cpp diff --git a/src/android/activity/AndroidTouch.h b/xbmc/android/activity/AndroidTouch.h similarity index 100% rename from src/android/activity/AndroidTouch.h rename to xbmc/android/activity/AndroidTouch.h diff --git a/src/android/activity/DllGraphicBuffer.h b/xbmc/android/activity/DllGraphicBuffer.h similarity index 100% rename from src/android/activity/DllGraphicBuffer.h rename to xbmc/android/activity/DllGraphicBuffer.h diff --git a/src/android/activity/EventLoop.cpp b/xbmc/android/activity/EventLoop.cpp similarity index 100% rename from src/android/activity/EventLoop.cpp rename to xbmc/android/activity/EventLoop.cpp diff --git a/src/android/activity/EventLoop.h b/xbmc/android/activity/EventLoop.h similarity index 100% rename from src/android/activity/EventLoop.h rename to xbmc/android/activity/EventLoop.h diff --git a/src/android/activity/GraphicBuffer.cpp b/xbmc/android/activity/GraphicBuffer.cpp similarity index 100% rename from src/android/activity/GraphicBuffer.cpp rename to xbmc/android/activity/GraphicBuffer.cpp diff --git a/src/android/activity/GraphicBuffer.h b/xbmc/android/activity/GraphicBuffer.h similarity index 100% rename from src/android/activity/GraphicBuffer.h rename to xbmc/android/activity/GraphicBuffer.h diff --git a/src/android/activity/IActivityHandler.h b/xbmc/android/activity/IActivityHandler.h similarity index 100% rename from src/android/activity/IActivityHandler.h rename to xbmc/android/activity/IActivityHandler.h diff --git a/src/android/activity/IInputHandler.h b/xbmc/android/activity/IInputHandler.h similarity index 100% rename from src/android/activity/IInputHandler.h rename to xbmc/android/activity/IInputHandler.h diff --git a/src/android/activity/Makefile.in b/xbmc/android/activity/Makefile.in similarity index 100% rename from src/android/activity/Makefile.in rename to xbmc/android/activity/Makefile.in diff --git a/src/android/activity/XBMCApp.cpp b/xbmc/android/activity/XBMCApp.cpp similarity index 100% rename from src/android/activity/XBMCApp.cpp rename to xbmc/android/activity/XBMCApp.cpp diff --git a/src/android/activity/XBMCApp.h b/xbmc/android/activity/XBMCApp.h similarity index 100% rename from src/android/activity/XBMCApp.h rename to xbmc/android/activity/XBMCApp.h diff --git a/src/android/activity/android_main.cpp b/xbmc/android/activity/android_main.cpp similarity index 100% rename from src/android/activity/android_main.cpp rename to xbmc/android/activity/android_main.cpp diff --git a/src/android/bionic_supplement/Makefile b/xbmc/android/bionic_supplement/Makefile similarity index 100% rename from src/android/bionic_supplement/Makefile rename to xbmc/android/bionic_supplement/Makefile diff --git a/src/android/bionic_supplement/bionic_supplement.h b/xbmc/android/bionic_supplement/bionic_supplement.h similarity index 100% rename from src/android/bionic_supplement/bionic_supplement.h rename to xbmc/android/bionic_supplement/bionic_supplement.h diff --git a/src/android/bionic_supplement/getdelim.c b/xbmc/android/bionic_supplement/getdelim.c similarity index 100% rename from src/android/bionic_supplement/getdelim.c rename to xbmc/android/bionic_supplement/getdelim.c diff --git a/src/android/bionic_supplement/rand_r.c b/xbmc/android/bionic_supplement/rand_r.c similarity index 100% rename from src/android/bionic_supplement/rand_r.c rename to xbmc/android/bionic_supplement/rand_r.c diff --git a/src/android/jni/ApplicationInfo.cpp b/xbmc/android/jni/ApplicationInfo.cpp similarity index 100% rename from src/android/jni/ApplicationInfo.cpp rename to xbmc/android/jni/ApplicationInfo.cpp diff --git a/src/android/jni/ApplicationInfo.h b/xbmc/android/jni/ApplicationInfo.h similarity index 100% rename from src/android/jni/ApplicationInfo.h rename to xbmc/android/jni/ApplicationInfo.h diff --git a/src/android/jni/AudioFormat.cpp b/xbmc/android/jni/AudioFormat.cpp similarity index 100% rename from src/android/jni/AudioFormat.cpp rename to xbmc/android/jni/AudioFormat.cpp diff --git a/src/android/jni/AudioFormat.h b/xbmc/android/jni/AudioFormat.h similarity index 100% rename from src/android/jni/AudioFormat.h rename to xbmc/android/jni/AudioFormat.h diff --git a/src/android/jni/AudioManager.cpp b/xbmc/android/jni/AudioManager.cpp similarity index 100% rename from src/android/jni/AudioManager.cpp rename to xbmc/android/jni/AudioManager.cpp diff --git a/src/android/jni/AudioManager.h b/xbmc/android/jni/AudioManager.h similarity index 100% rename from src/android/jni/AudioManager.h rename to xbmc/android/jni/AudioManager.h diff --git a/src/android/jni/AudioTrack.cpp b/xbmc/android/jni/AudioTrack.cpp similarity index 100% rename from src/android/jni/AudioTrack.cpp rename to xbmc/android/jni/AudioTrack.cpp diff --git a/src/android/jni/AudioTrack.h b/xbmc/android/jni/AudioTrack.h similarity index 100% rename from src/android/jni/AudioTrack.h rename to xbmc/android/jni/AudioTrack.h diff --git a/src/android/jni/BaseColumns.cpp b/xbmc/android/jni/BaseColumns.cpp similarity index 100% rename from src/android/jni/BaseColumns.cpp rename to xbmc/android/jni/BaseColumns.cpp diff --git a/src/android/jni/BaseColumns.h b/xbmc/android/jni/BaseColumns.h similarity index 100% rename from src/android/jni/BaseColumns.h rename to xbmc/android/jni/BaseColumns.h diff --git a/src/android/jni/BitSet.cpp b/xbmc/android/jni/BitSet.cpp similarity index 100% rename from src/android/jni/BitSet.cpp rename to xbmc/android/jni/BitSet.cpp diff --git a/src/android/jni/BitSet.h b/xbmc/android/jni/BitSet.h similarity index 100% rename from src/android/jni/BitSet.h rename to xbmc/android/jni/BitSet.h diff --git a/src/android/jni/Bitmap.h b/xbmc/android/jni/Bitmap.h similarity index 100% rename from src/android/jni/Bitmap.h rename to xbmc/android/jni/Bitmap.h diff --git a/src/android/jni/BitmapDrawable.cpp b/xbmc/android/jni/BitmapDrawable.cpp similarity index 100% rename from src/android/jni/BitmapDrawable.cpp rename to xbmc/android/jni/BitmapDrawable.cpp diff --git a/src/android/jni/BitmapDrawable.h b/xbmc/android/jni/BitmapDrawable.h similarity index 100% rename from src/android/jni/BitmapDrawable.h rename to xbmc/android/jni/BitmapDrawable.h diff --git a/src/android/jni/BroadcastReceiver.cpp b/xbmc/android/jni/BroadcastReceiver.cpp similarity index 100% rename from src/android/jni/BroadcastReceiver.cpp rename to xbmc/android/jni/BroadcastReceiver.cpp diff --git a/src/android/jni/BroadcastReceiver.h b/xbmc/android/jni/BroadcastReceiver.h similarity index 100% rename from src/android/jni/BroadcastReceiver.h rename to xbmc/android/jni/BroadcastReceiver.h diff --git a/src/android/jni/Buffer.cpp b/xbmc/android/jni/Buffer.cpp similarity index 100% rename from src/android/jni/Buffer.cpp rename to xbmc/android/jni/Buffer.cpp diff --git a/src/android/jni/Buffer.h b/xbmc/android/jni/Buffer.h similarity index 100% rename from src/android/jni/Buffer.h rename to xbmc/android/jni/Buffer.h diff --git a/src/android/jni/Build.cpp b/xbmc/android/jni/Build.cpp similarity index 100% rename from src/android/jni/Build.cpp rename to xbmc/android/jni/Build.cpp diff --git a/src/android/jni/Build.h b/xbmc/android/jni/Build.h similarity index 100% rename from src/android/jni/Build.h rename to xbmc/android/jni/Build.h diff --git a/src/android/jni/ByteBuffer.cpp b/xbmc/android/jni/ByteBuffer.cpp similarity index 100% rename from src/android/jni/ByteBuffer.cpp rename to xbmc/android/jni/ByteBuffer.cpp diff --git a/src/android/jni/ByteBuffer.h b/xbmc/android/jni/ByteBuffer.h similarity index 100% rename from src/android/jni/ByteBuffer.h rename to xbmc/android/jni/ByteBuffer.h diff --git a/src/android/jni/CharSequence.cpp b/xbmc/android/jni/CharSequence.cpp similarity index 100% rename from src/android/jni/CharSequence.cpp rename to xbmc/android/jni/CharSequence.cpp diff --git a/src/android/jni/CharSequence.h b/xbmc/android/jni/CharSequence.h similarity index 100% rename from src/android/jni/CharSequence.h rename to xbmc/android/jni/CharSequence.h diff --git a/src/android/jni/ClassLoader.cpp b/xbmc/android/jni/ClassLoader.cpp similarity index 100% rename from src/android/jni/ClassLoader.cpp rename to xbmc/android/jni/ClassLoader.cpp diff --git a/src/android/jni/ClassLoader.h b/xbmc/android/jni/ClassLoader.h similarity index 100% rename from src/android/jni/ClassLoader.h rename to xbmc/android/jni/ClassLoader.h diff --git a/src/android/jni/ConnectivityManager.cpp b/xbmc/android/jni/ConnectivityManager.cpp similarity index 100% rename from src/android/jni/ConnectivityManager.cpp rename to xbmc/android/jni/ConnectivityManager.cpp diff --git a/src/android/jni/ConnectivityManager.h b/xbmc/android/jni/ConnectivityManager.h similarity index 100% rename from src/android/jni/ConnectivityManager.h rename to xbmc/android/jni/ConnectivityManager.h diff --git a/src/android/jni/ContentResolver.cpp b/xbmc/android/jni/ContentResolver.cpp similarity index 100% rename from src/android/jni/ContentResolver.cpp rename to xbmc/android/jni/ContentResolver.cpp diff --git a/src/android/jni/ContentResolver.h b/xbmc/android/jni/ContentResolver.h similarity index 100% rename from src/android/jni/ContentResolver.h rename to xbmc/android/jni/ContentResolver.h diff --git a/src/android/jni/Context.cpp b/xbmc/android/jni/Context.cpp similarity index 100% rename from src/android/jni/Context.cpp rename to xbmc/android/jni/Context.cpp diff --git a/src/android/jni/Context.h b/xbmc/android/jni/Context.h similarity index 100% rename from src/android/jni/Context.h rename to xbmc/android/jni/Context.h diff --git a/src/android/jni/Cursor.cpp b/xbmc/android/jni/Cursor.cpp similarity index 100% rename from src/android/jni/Cursor.cpp rename to xbmc/android/jni/Cursor.cpp diff --git a/src/android/jni/Cursor.h b/xbmc/android/jni/Cursor.h similarity index 100% rename from src/android/jni/Cursor.h rename to xbmc/android/jni/Cursor.h diff --git a/src/android/jni/DhcpInfo.cpp b/xbmc/android/jni/DhcpInfo.cpp similarity index 100% rename from src/android/jni/DhcpInfo.cpp rename to xbmc/android/jni/DhcpInfo.cpp diff --git a/src/android/jni/DhcpInfo.h b/xbmc/android/jni/DhcpInfo.h similarity index 100% rename from src/android/jni/DhcpInfo.h rename to xbmc/android/jni/DhcpInfo.h diff --git a/src/android/jni/Drawable.h b/xbmc/android/jni/Drawable.h similarity index 100% rename from src/android/jni/Drawable.h rename to xbmc/android/jni/Drawable.h diff --git a/src/android/jni/Enum.cpp b/xbmc/android/jni/Enum.cpp similarity index 100% rename from src/android/jni/Enum.cpp rename to xbmc/android/jni/Enum.cpp diff --git a/src/android/jni/Enum.h b/xbmc/android/jni/Enum.h similarity index 100% rename from src/android/jni/Enum.h rename to xbmc/android/jni/Enum.h diff --git a/src/android/jni/Environment.cpp b/xbmc/android/jni/Environment.cpp similarity index 100% rename from src/android/jni/Environment.cpp rename to xbmc/android/jni/Environment.cpp diff --git a/src/android/jni/Environment.h b/xbmc/android/jni/Environment.h similarity index 100% rename from src/android/jni/Environment.h rename to xbmc/android/jni/Environment.h diff --git a/src/android/jni/File.cpp b/xbmc/android/jni/File.cpp similarity index 100% rename from src/android/jni/File.cpp rename to xbmc/android/jni/File.cpp diff --git a/src/android/jni/File.h b/xbmc/android/jni/File.h similarity index 100% rename from src/android/jni/File.h rename to xbmc/android/jni/File.h diff --git a/src/android/jni/Intent.cpp b/xbmc/android/jni/Intent.cpp similarity index 100% rename from src/android/jni/Intent.cpp rename to xbmc/android/jni/Intent.cpp diff --git a/src/android/jni/Intent.h b/xbmc/android/jni/Intent.h similarity index 100% rename from src/android/jni/Intent.h rename to xbmc/android/jni/Intent.h diff --git a/src/android/jni/IntentFilter.cpp b/xbmc/android/jni/IntentFilter.cpp similarity index 100% rename from src/android/jni/IntentFilter.cpp rename to xbmc/android/jni/IntentFilter.cpp diff --git a/src/android/jni/IntentFilter.h b/xbmc/android/jni/IntentFilter.h similarity index 100% rename from src/android/jni/IntentFilter.h rename to xbmc/android/jni/IntentFilter.h diff --git a/src/android/jni/JNIBase.cpp b/xbmc/android/jni/JNIBase.cpp similarity index 100% rename from src/android/jni/JNIBase.cpp rename to xbmc/android/jni/JNIBase.cpp diff --git a/src/android/jni/JNIBase.h b/xbmc/android/jni/JNIBase.h similarity index 100% rename from src/android/jni/JNIBase.h rename to xbmc/android/jni/JNIBase.h diff --git a/src/android/jni/JNIThreading.cpp b/xbmc/android/jni/JNIThreading.cpp similarity index 100% rename from src/android/jni/JNIThreading.cpp rename to xbmc/android/jni/JNIThreading.cpp diff --git a/src/android/jni/JNIThreading.h b/xbmc/android/jni/JNIThreading.h similarity index 100% rename from src/android/jni/JNIThreading.h rename to xbmc/android/jni/JNIThreading.h diff --git a/src/android/jni/KeyCharacterMap.cpp b/xbmc/android/jni/KeyCharacterMap.cpp similarity index 100% rename from src/android/jni/KeyCharacterMap.cpp rename to xbmc/android/jni/KeyCharacterMap.cpp diff --git a/src/android/jni/KeyCharacterMap.h b/xbmc/android/jni/KeyCharacterMap.h similarity index 100% rename from src/android/jni/KeyCharacterMap.h rename to xbmc/android/jni/KeyCharacterMap.h diff --git a/src/android/jni/List.cpp b/xbmc/android/jni/List.cpp similarity index 100% rename from src/android/jni/List.cpp rename to xbmc/android/jni/List.cpp diff --git a/src/android/jni/List.h b/xbmc/android/jni/List.h similarity index 100% rename from src/android/jni/List.h rename to xbmc/android/jni/List.h diff --git a/src/android/jni/Makefile.in b/xbmc/android/jni/Makefile.in similarity index 100% rename from src/android/jni/Makefile.in rename to xbmc/android/jni/Makefile.in diff --git a/src/android/jni/MediaCodec.cpp b/xbmc/android/jni/MediaCodec.cpp similarity index 100% rename from src/android/jni/MediaCodec.cpp rename to xbmc/android/jni/MediaCodec.cpp diff --git a/src/android/jni/MediaCodec.h b/xbmc/android/jni/MediaCodec.h similarity index 100% rename from src/android/jni/MediaCodec.h rename to xbmc/android/jni/MediaCodec.h diff --git a/src/android/jni/MediaCodecBufferInfo.cpp b/xbmc/android/jni/MediaCodecBufferInfo.cpp similarity index 100% rename from src/android/jni/MediaCodecBufferInfo.cpp rename to xbmc/android/jni/MediaCodecBufferInfo.cpp diff --git a/src/android/jni/MediaCodecBufferInfo.h b/xbmc/android/jni/MediaCodecBufferInfo.h similarity index 100% rename from src/android/jni/MediaCodecBufferInfo.h rename to xbmc/android/jni/MediaCodecBufferInfo.h diff --git a/src/android/jni/MediaCodecCryptoInfo.cpp b/xbmc/android/jni/MediaCodecCryptoInfo.cpp similarity index 100% rename from src/android/jni/MediaCodecCryptoInfo.cpp rename to xbmc/android/jni/MediaCodecCryptoInfo.cpp diff --git a/src/android/jni/MediaCodecCryptoInfo.h b/xbmc/android/jni/MediaCodecCryptoInfo.h similarity index 100% rename from src/android/jni/MediaCodecCryptoInfo.h rename to xbmc/android/jni/MediaCodecCryptoInfo.h diff --git a/src/android/jni/MediaCodecInfo.cpp b/xbmc/android/jni/MediaCodecInfo.cpp similarity index 100% rename from src/android/jni/MediaCodecInfo.cpp rename to xbmc/android/jni/MediaCodecInfo.cpp diff --git a/src/android/jni/MediaCodecInfo.h b/xbmc/android/jni/MediaCodecInfo.h similarity index 100% rename from src/android/jni/MediaCodecInfo.h rename to xbmc/android/jni/MediaCodecInfo.h diff --git a/src/android/jni/MediaCodecList.cpp b/xbmc/android/jni/MediaCodecList.cpp similarity index 100% rename from src/android/jni/MediaCodecList.cpp rename to xbmc/android/jni/MediaCodecList.cpp diff --git a/src/android/jni/MediaCodecList.h b/xbmc/android/jni/MediaCodecList.h similarity index 100% rename from src/android/jni/MediaCodecList.h rename to xbmc/android/jni/MediaCodecList.h diff --git a/src/android/jni/MediaCrypto.h b/xbmc/android/jni/MediaCrypto.h similarity index 100% rename from src/android/jni/MediaCrypto.h rename to xbmc/android/jni/MediaCrypto.h diff --git a/src/android/jni/MediaFormat.cpp b/xbmc/android/jni/MediaFormat.cpp similarity index 100% rename from src/android/jni/MediaFormat.cpp rename to xbmc/android/jni/MediaFormat.cpp diff --git a/src/android/jni/MediaFormat.h b/xbmc/android/jni/MediaFormat.h similarity index 100% rename from src/android/jni/MediaFormat.h rename to xbmc/android/jni/MediaFormat.h diff --git a/src/android/jni/MediaStore.cpp b/xbmc/android/jni/MediaStore.cpp similarity index 100% rename from src/android/jni/MediaStore.cpp rename to xbmc/android/jni/MediaStore.cpp diff --git a/src/android/jni/MediaStore.h b/xbmc/android/jni/MediaStore.h similarity index 100% rename from src/android/jni/MediaStore.h rename to xbmc/android/jni/MediaStore.h diff --git a/src/android/jni/NetworkInfo.cpp b/xbmc/android/jni/NetworkInfo.cpp similarity index 100% rename from src/android/jni/NetworkInfo.cpp rename to xbmc/android/jni/NetworkInfo.cpp diff --git a/src/android/jni/NetworkInfo.h b/xbmc/android/jni/NetworkInfo.h similarity index 100% rename from src/android/jni/NetworkInfo.h rename to xbmc/android/jni/NetworkInfo.h diff --git a/src/android/jni/PackageManager.cpp b/xbmc/android/jni/PackageManager.cpp similarity index 100% rename from src/android/jni/PackageManager.cpp rename to xbmc/android/jni/PackageManager.cpp diff --git a/src/android/jni/PackageManager.h b/xbmc/android/jni/PackageManager.h similarity index 100% rename from src/android/jni/PackageManager.h rename to xbmc/android/jni/PackageManager.h diff --git a/src/android/jni/PowerManager.cpp b/xbmc/android/jni/PowerManager.cpp similarity index 100% rename from src/android/jni/PowerManager.cpp rename to xbmc/android/jni/PowerManager.cpp diff --git a/src/android/jni/PowerManager.h b/xbmc/android/jni/PowerManager.h similarity index 100% rename from src/android/jni/PowerManager.h rename to xbmc/android/jni/PowerManager.h diff --git a/src/android/jni/README b/xbmc/android/jni/README similarity index 100% rename from src/android/jni/README rename to xbmc/android/jni/README diff --git a/src/android/jni/ScanResult.cpp b/xbmc/android/jni/ScanResult.cpp similarity index 100% rename from src/android/jni/ScanResult.cpp rename to xbmc/android/jni/ScanResult.cpp diff --git a/src/android/jni/ScanResult.h b/xbmc/android/jni/ScanResult.h similarity index 100% rename from src/android/jni/ScanResult.h rename to xbmc/android/jni/ScanResult.h diff --git a/src/android/jni/StatFs.cpp b/xbmc/android/jni/StatFs.cpp similarity index 100% rename from src/android/jni/StatFs.cpp rename to xbmc/android/jni/StatFs.cpp diff --git a/src/android/jni/StatFs.h b/xbmc/android/jni/StatFs.h similarity index 100% rename from src/android/jni/StatFs.h rename to xbmc/android/jni/StatFs.h diff --git a/src/android/jni/Surface.cpp b/xbmc/android/jni/Surface.cpp similarity index 100% rename from src/android/jni/Surface.cpp rename to xbmc/android/jni/Surface.cpp diff --git a/src/android/jni/Surface.h b/xbmc/android/jni/Surface.h similarity index 100% rename from src/android/jni/Surface.h rename to xbmc/android/jni/Surface.h diff --git a/src/android/jni/SurfaceTexture.cpp b/xbmc/android/jni/SurfaceTexture.cpp similarity index 100% rename from src/android/jni/SurfaceTexture.cpp rename to xbmc/android/jni/SurfaceTexture.cpp diff --git a/src/android/jni/SurfaceTexture.h b/xbmc/android/jni/SurfaceTexture.h similarity index 100% rename from src/android/jni/SurfaceTexture.h rename to xbmc/android/jni/SurfaceTexture.h diff --git a/src/android/jni/System.cpp b/xbmc/android/jni/System.cpp similarity index 100% rename from src/android/jni/System.cpp rename to xbmc/android/jni/System.cpp diff --git a/src/android/jni/System.h b/xbmc/android/jni/System.h similarity index 100% rename from src/android/jni/System.h rename to xbmc/android/jni/System.h diff --git a/src/android/jni/SystemClock.cpp b/xbmc/android/jni/SystemClock.cpp similarity index 100% rename from src/android/jni/SystemClock.cpp rename to xbmc/android/jni/SystemClock.cpp diff --git a/src/android/jni/SystemClock.h b/xbmc/android/jni/SystemClock.h similarity index 100% rename from src/android/jni/SystemClock.h rename to xbmc/android/jni/SystemClock.h diff --git a/src/android/jni/URI.cpp b/xbmc/android/jni/URI.cpp similarity index 100% rename from src/android/jni/URI.cpp rename to xbmc/android/jni/URI.cpp diff --git a/src/android/jni/URI.h b/xbmc/android/jni/URI.h similarity index 100% rename from src/android/jni/URI.h rename to xbmc/android/jni/URI.h diff --git a/src/android/jni/View.cpp b/xbmc/android/jni/View.cpp similarity index 100% rename from src/android/jni/View.cpp rename to xbmc/android/jni/View.cpp diff --git a/src/android/jni/View.h b/xbmc/android/jni/View.h similarity index 100% rename from src/android/jni/View.h rename to xbmc/android/jni/View.h diff --git a/src/android/jni/WakeLock.cpp b/xbmc/android/jni/WakeLock.cpp similarity index 100% rename from src/android/jni/WakeLock.cpp rename to xbmc/android/jni/WakeLock.cpp diff --git a/src/android/jni/WakeLock.h b/xbmc/android/jni/WakeLock.h similarity index 100% rename from src/android/jni/WakeLock.h rename to xbmc/android/jni/WakeLock.h diff --git a/src/android/jni/WifiConfiguration.cpp b/xbmc/android/jni/WifiConfiguration.cpp similarity index 100% rename from src/android/jni/WifiConfiguration.cpp rename to xbmc/android/jni/WifiConfiguration.cpp diff --git a/src/android/jni/WifiConfiguration.h b/xbmc/android/jni/WifiConfiguration.h similarity index 100% rename from src/android/jni/WifiConfiguration.h rename to xbmc/android/jni/WifiConfiguration.h diff --git a/src/android/jni/WifiInfo.cpp b/xbmc/android/jni/WifiInfo.cpp similarity index 100% rename from src/android/jni/WifiInfo.cpp rename to xbmc/android/jni/WifiInfo.cpp diff --git a/src/android/jni/WifiInfo.h b/xbmc/android/jni/WifiInfo.h similarity index 100% rename from src/android/jni/WifiInfo.h rename to xbmc/android/jni/WifiInfo.h diff --git a/src/android/jni/WifiManager.cpp b/xbmc/android/jni/WifiManager.cpp similarity index 100% rename from src/android/jni/WifiManager.cpp rename to xbmc/android/jni/WifiManager.cpp diff --git a/src/android/jni/WifiManager.h b/xbmc/android/jni/WifiManager.h similarity index 100% rename from src/android/jni/WifiManager.h rename to xbmc/android/jni/WifiManager.h diff --git a/src/android/jni/WifiManagerMulticastLock.cpp b/xbmc/android/jni/WifiManagerMulticastLock.cpp similarity index 100% rename from src/android/jni/WifiManagerMulticastLock.cpp rename to xbmc/android/jni/WifiManagerMulticastLock.cpp diff --git a/src/android/jni/WifiManagerMulticastLock.h b/xbmc/android/jni/WifiManagerMulticastLock.h similarity index 100% rename from src/android/jni/WifiManagerMulticastLock.h rename to xbmc/android/jni/WifiManagerMulticastLock.h diff --git a/src/android/jni/Window.cpp b/xbmc/android/jni/Window.cpp similarity index 100% rename from src/android/jni/Window.cpp rename to xbmc/android/jni/Window.cpp diff --git a/src/android/jni/Window.h b/xbmc/android/jni/Window.h similarity index 100% rename from src/android/jni/Window.h rename to xbmc/android/jni/Window.h diff --git a/src/android/jni/jutils.cpp b/xbmc/android/jni/jutils.cpp similarity index 100% rename from src/android/jni/jutils.cpp rename to xbmc/android/jni/jutils.cpp diff --git a/src/android/jni/jutils/jni.inc b/xbmc/android/jni/jutils/jni.inc similarity index 100% rename from src/android/jni/jutils/jni.inc rename to xbmc/android/jni/jutils/jni.inc diff --git a/src/android/jni/jutils/jutils-details.hpp b/xbmc/android/jni/jutils/jutils-details.hpp similarity index 100% rename from src/android/jni/jutils/jutils-details.hpp rename to xbmc/android/jni/jutils/jutils-details.hpp diff --git a/src/android/jni/jutils/jutils.hpp b/xbmc/android/jni/jutils/jutils.hpp similarity index 100% rename from src/android/jni/jutils/jutils.hpp rename to xbmc/android/jni/jutils/jutils.hpp diff --git a/src/android/loader/AndroidDyload.cpp b/xbmc/android/loader/AndroidDyload.cpp similarity index 100% rename from src/android/loader/AndroidDyload.cpp rename to xbmc/android/loader/AndroidDyload.cpp diff --git a/src/android/loader/AndroidDyload.h b/xbmc/android/loader/AndroidDyload.h similarity index 100% rename from src/android/loader/AndroidDyload.h rename to xbmc/android/loader/AndroidDyload.h diff --git a/src/android/loader/Makefile.in b/xbmc/android/loader/Makefile.in similarity index 100% rename from src/android/loader/Makefile.in rename to xbmc/android/loader/Makefile.in diff --git a/src/cdrip/CDDARipJob.cpp b/xbmc/cdrip/CDDARipJob.cpp similarity index 100% rename from src/cdrip/CDDARipJob.cpp rename to xbmc/cdrip/CDDARipJob.cpp diff --git a/src/cdrip/CDDARipJob.h b/xbmc/cdrip/CDDARipJob.h similarity index 100% rename from src/cdrip/CDDARipJob.h rename to xbmc/cdrip/CDDARipJob.h diff --git a/src/cdrip/CDDARipper.cpp b/xbmc/cdrip/CDDARipper.cpp similarity index 100% rename from src/cdrip/CDDARipper.cpp rename to xbmc/cdrip/CDDARipper.cpp diff --git a/src/cdrip/CDDARipper.h b/xbmc/cdrip/CDDARipper.h similarity index 100% rename from src/cdrip/CDDARipper.h rename to xbmc/cdrip/CDDARipper.h diff --git a/src/cdrip/Encoder.cpp b/xbmc/cdrip/Encoder.cpp similarity index 100% rename from src/cdrip/Encoder.cpp rename to xbmc/cdrip/Encoder.cpp diff --git a/src/cdrip/Encoder.h b/xbmc/cdrip/Encoder.h similarity index 100% rename from src/cdrip/Encoder.h rename to xbmc/cdrip/Encoder.h diff --git a/src/cdrip/EncoderFFmpeg.cpp b/xbmc/cdrip/EncoderFFmpeg.cpp similarity index 100% rename from src/cdrip/EncoderFFmpeg.cpp rename to xbmc/cdrip/EncoderFFmpeg.cpp diff --git a/src/cdrip/EncoderFFmpeg.h b/xbmc/cdrip/EncoderFFmpeg.h similarity index 100% rename from src/cdrip/EncoderFFmpeg.h rename to xbmc/cdrip/EncoderFFmpeg.h diff --git a/src/cdrip/IEncoder.h b/xbmc/cdrip/IEncoder.h similarity index 100% rename from src/cdrip/IEncoder.h rename to xbmc/cdrip/IEncoder.h diff --git a/src/cdrip/Makefile.in b/xbmc/cdrip/Makefile.in similarity index 100% rename from src/cdrip/Makefile.in rename to xbmc/cdrip/Makefile.in diff --git a/src/commons/Buffer.h b/xbmc/commons/Buffer.h similarity index 100% rename from src/commons/Buffer.h rename to xbmc/commons/Buffer.h diff --git a/src/commons/Exception.cpp b/xbmc/commons/Exception.cpp similarity index 100% rename from src/commons/Exception.cpp rename to xbmc/commons/Exception.cpp diff --git a/src/commons/Exception.h b/xbmc/commons/Exception.h similarity index 100% rename from src/commons/Exception.h rename to xbmc/commons/Exception.h diff --git a/src/commons/Makefile b/xbmc/commons/Makefile similarity index 100% rename from src/commons/Makefile rename to xbmc/commons/Makefile diff --git a/src/commons/ilog.cpp b/xbmc/commons/ilog.cpp similarity index 100% rename from src/commons/ilog.cpp rename to xbmc/commons/ilog.cpp diff --git a/src/commons/ilog.h b/xbmc/commons/ilog.h similarity index 100% rename from src/commons/ilog.h rename to xbmc/commons/ilog.h diff --git a/src/commons/typeindex.h b/xbmc/commons/typeindex.h similarity index 100% rename from src/commons/typeindex.h rename to xbmc/commons/typeindex.h diff --git a/src/cores/AudioEngine/AEFactory.cpp b/xbmc/cores/AudioEngine/AEFactory.cpp similarity index 100% rename from src/cores/AudioEngine/AEFactory.cpp rename to xbmc/cores/AudioEngine/AEFactory.cpp diff --git a/src/cores/AudioEngine/AEFactory.h b/xbmc/cores/AudioEngine/AEFactory.h similarity index 100% rename from src/cores/AudioEngine/AEFactory.h rename to xbmc/cores/AudioEngine/AEFactory.h diff --git a/src/cores/AudioEngine/AEResampleFactory.cpp b/xbmc/cores/AudioEngine/AEResampleFactory.cpp similarity index 100% rename from src/cores/AudioEngine/AEResampleFactory.cpp rename to xbmc/cores/AudioEngine/AEResampleFactory.cpp diff --git a/src/cores/AudioEngine/AEResampleFactory.h b/xbmc/cores/AudioEngine/AEResampleFactory.h similarity index 100% rename from src/cores/AudioEngine/AEResampleFactory.h rename to xbmc/cores/AudioEngine/AEResampleFactory.h diff --git a/src/cores/AudioEngine/AESinkFactory.cpp b/xbmc/cores/AudioEngine/AESinkFactory.cpp similarity index 100% rename from src/cores/AudioEngine/AESinkFactory.cpp rename to xbmc/cores/AudioEngine/AESinkFactory.cpp diff --git a/src/cores/AudioEngine/AESinkFactory.h b/xbmc/cores/AudioEngine/AESinkFactory.h similarity index 100% rename from src/cores/AudioEngine/AESinkFactory.h rename to xbmc/cores/AudioEngine/AESinkFactory.h diff --git a/src/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp similarity index 100% rename from src/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp rename to xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.cpp diff --git a/src/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h b/xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h similarity index 100% rename from src/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h rename to xbmc/cores/AudioEngine/Encoders/AEEncoderFFmpeg.h diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.cpp diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAE.h diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.cpp diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEBuffer.h diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.cpp diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.h similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.h rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResampleFFMPEG.h diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.cpp diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.h similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.h rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEResamplePi.h diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.cpp diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESink.h diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.cpp diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.h similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.h rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAESound.h diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.cpp diff --git a/src/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h b/xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h similarity index 100% rename from src/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h rename to xbmc/cores/AudioEngine/Engines/ActiveAE/ActiveAEStream.h diff --git a/src/cores/AudioEngine/Interfaces/AE.h b/xbmc/cores/AudioEngine/Interfaces/AE.h similarity index 100% rename from src/cores/AudioEngine/Interfaces/AE.h rename to xbmc/cores/AudioEngine/Interfaces/AE.h diff --git a/src/cores/AudioEngine/Interfaces/AEEncoder.h b/xbmc/cores/AudioEngine/Interfaces/AEEncoder.h similarity index 100% rename from src/cores/AudioEngine/Interfaces/AEEncoder.h rename to xbmc/cores/AudioEngine/Interfaces/AEEncoder.h diff --git a/src/cores/AudioEngine/Interfaces/AEResample.h b/xbmc/cores/AudioEngine/Interfaces/AEResample.h similarity index 100% rename from src/cores/AudioEngine/Interfaces/AEResample.h rename to xbmc/cores/AudioEngine/Interfaces/AEResample.h diff --git a/src/cores/AudioEngine/Interfaces/AESink.h b/xbmc/cores/AudioEngine/Interfaces/AESink.h similarity index 100% rename from src/cores/AudioEngine/Interfaces/AESink.h rename to xbmc/cores/AudioEngine/Interfaces/AESink.h diff --git a/src/cores/AudioEngine/Interfaces/AESound.h b/xbmc/cores/AudioEngine/Interfaces/AESound.h similarity index 100% rename from src/cores/AudioEngine/Interfaces/AESound.h rename to xbmc/cores/AudioEngine/Interfaces/AESound.h diff --git a/src/cores/AudioEngine/Interfaces/AEStream.h b/xbmc/cores/AudioEngine/Interfaces/AEStream.h similarity index 100% rename from src/cores/AudioEngine/Interfaces/AEStream.h rename to xbmc/cores/AudioEngine/Interfaces/AEStream.h diff --git a/src/cores/AudioEngine/Interfaces/ThreadedAE.h b/xbmc/cores/AudioEngine/Interfaces/ThreadedAE.h similarity index 100% rename from src/cores/AudioEngine/Interfaces/ThreadedAE.h rename to xbmc/cores/AudioEngine/Interfaces/ThreadedAE.h diff --git a/src/cores/AudioEngine/Makefile.in b/xbmc/cores/AudioEngine/Makefile.in similarity index 100% rename from src/cores/AudioEngine/Makefile.in rename to xbmc/cores/AudioEngine/Makefile.in diff --git a/src/cores/AudioEngine/Sinks/AESinkALSA.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkALSA.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkALSA.h b/xbmc/cores/AudioEngine/Sinks/AESinkALSA.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkALSA.h rename to xbmc/cores/AudioEngine/Sinks/AESinkALSA.h diff --git a/src/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h b/xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h rename to xbmc/cores/AudioEngine/Sinks/AESinkAUDIOTRACK.h diff --git a/src/cores/AudioEngine/Sinks/AESinkDARWINIOS.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkDARWINIOS.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkDARWINIOS.h b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkDARWINIOS.h rename to xbmc/cores/AudioEngine/Sinks/AESinkDARWINIOS.h diff --git a/src/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkDARWINOSX.h b/xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkDARWINOSX.h rename to xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.h diff --git a/src/cores/AudioEngine/Sinks/AESinkDirectSound.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkDirectSound.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkDirectSound.h b/xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkDirectSound.h rename to xbmc/cores/AudioEngine/Sinks/AESinkDirectSound.h diff --git a/src/cores/AudioEngine/Sinks/AESinkNULL.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkNULL.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkNULL.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkNULL.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkNULL.h b/xbmc/cores/AudioEngine/Sinks/AESinkNULL.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkNULL.h rename to xbmc/cores/AudioEngine/Sinks/AESinkNULL.h diff --git a/src/cores/AudioEngine/Sinks/AESinkOSS.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkOSS.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkOSS.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkOSS.h b/xbmc/cores/AudioEngine/Sinks/AESinkOSS.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkOSS.h rename to xbmc/cores/AudioEngine/Sinks/AESinkOSS.h diff --git a/src/cores/AudioEngine/Sinks/AESinkPULSE.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkPULSE.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkPULSE.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkPULSE.h b/xbmc/cores/AudioEngine/Sinks/AESinkPULSE.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkPULSE.h rename to xbmc/cores/AudioEngine/Sinks/AESinkPULSE.h diff --git a/src/cores/AudioEngine/Sinks/AESinkPi.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkPi.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkPi.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkPi.h b/xbmc/cores/AudioEngine/Sinks/AESinkPi.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkPi.h rename to xbmc/cores/AudioEngine/Sinks/AESinkPi.h diff --git a/src/cores/AudioEngine/Sinks/AESinkWASAPI.cpp b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkWASAPI.cpp rename to xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.cpp diff --git a/src/cores/AudioEngine/Sinks/AESinkWASAPI.h b/xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h similarity index 100% rename from src/cores/AudioEngine/Sinks/AESinkWASAPI.h rename to xbmc/cores/AudioEngine/Sinks/AESinkWASAPI.h diff --git a/src/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp rename to xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.cpp diff --git a/src/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h b/xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h rename to xbmc/cores/AudioEngine/Sinks/osx/AEDeviceEnumerationOSX.h diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.cpp diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.h similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.h rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioChannelLayout.h diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.cpp diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioDevice.h diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioHardware.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioHardware.cpp rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.cpp diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioHardware.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.h similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioHardware.h rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHardware.h diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.cpp rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.cpp diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.h similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.h rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioHelpers.h diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.cpp diff --git a/src/cores/AudioEngine/Sinks/osx/CoreAudioStream.h b/xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h similarity index 100% rename from src/cores/AudioEngine/Sinks/osx/CoreAudioStream.h rename to xbmc/cores/AudioEngine/Sinks/osx/CoreAudioStream.h diff --git a/src/cores/AudioEngine/Sinks/test/Makefile b/xbmc/cores/AudioEngine/Sinks/test/Makefile similarity index 100% rename from src/cores/AudioEngine/Sinks/test/Makefile rename to xbmc/cores/AudioEngine/Sinks/test/Makefile diff --git a/src/cores/AudioEngine/Sinks/test/TestAESinkDARWINOSX.cpp b/xbmc/cores/AudioEngine/Sinks/test/TestAESinkDARWINOSX.cpp similarity index 100% rename from src/cores/AudioEngine/Sinks/test/TestAESinkDARWINOSX.cpp rename to xbmc/cores/AudioEngine/Sinks/test/TestAESinkDARWINOSX.cpp diff --git a/src/cores/AudioEngine/Utils/AEAudioFormat.h b/xbmc/cores/AudioEngine/Utils/AEAudioFormat.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEAudioFormat.h rename to xbmc/cores/AudioEngine/Utils/AEAudioFormat.h diff --git a/src/cores/AudioEngine/Utils/AEBitstreamPacker.cpp b/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp similarity index 100% rename from src/cores/AudioEngine/Utils/AEBitstreamPacker.cpp rename to xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.cpp diff --git a/src/cores/AudioEngine/Utils/AEBitstreamPacker.h b/xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEBitstreamPacker.h rename to xbmc/cores/AudioEngine/Utils/AEBitstreamPacker.h diff --git a/src/cores/AudioEngine/Utils/AEBuffer.cpp b/xbmc/cores/AudioEngine/Utils/AEBuffer.cpp similarity index 100% rename from src/cores/AudioEngine/Utils/AEBuffer.cpp rename to xbmc/cores/AudioEngine/Utils/AEBuffer.cpp diff --git a/src/cores/AudioEngine/Utils/AEBuffer.h b/xbmc/cores/AudioEngine/Utils/AEBuffer.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEBuffer.h rename to xbmc/cores/AudioEngine/Utils/AEBuffer.h diff --git a/src/cores/AudioEngine/Utils/AEChannelData.h b/xbmc/cores/AudioEngine/Utils/AEChannelData.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEChannelData.h rename to xbmc/cores/AudioEngine/Utils/AEChannelData.h diff --git a/src/cores/AudioEngine/Utils/AEChannelInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp similarity index 100% rename from src/cores/AudioEngine/Utils/AEChannelInfo.cpp rename to xbmc/cores/AudioEngine/Utils/AEChannelInfo.cpp diff --git a/src/cores/AudioEngine/Utils/AEChannelInfo.h b/xbmc/cores/AudioEngine/Utils/AEChannelInfo.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEChannelInfo.h rename to xbmc/cores/AudioEngine/Utils/AEChannelInfo.h diff --git a/src/cores/AudioEngine/Utils/AEDeviceInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEDeviceInfo.cpp similarity index 100% rename from src/cores/AudioEngine/Utils/AEDeviceInfo.cpp rename to xbmc/cores/AudioEngine/Utils/AEDeviceInfo.cpp diff --git a/src/cores/AudioEngine/Utils/AEDeviceInfo.h b/xbmc/cores/AudioEngine/Utils/AEDeviceInfo.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEDeviceInfo.h rename to xbmc/cores/AudioEngine/Utils/AEDeviceInfo.h diff --git a/src/cores/AudioEngine/Utils/AEELDParser.cpp b/xbmc/cores/AudioEngine/Utils/AEELDParser.cpp similarity index 100% rename from src/cores/AudioEngine/Utils/AEELDParser.cpp rename to xbmc/cores/AudioEngine/Utils/AEELDParser.cpp diff --git a/src/cores/AudioEngine/Utils/AEELDParser.h b/xbmc/cores/AudioEngine/Utils/AEELDParser.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEELDParser.h rename to xbmc/cores/AudioEngine/Utils/AEELDParser.h diff --git a/src/cores/AudioEngine/Utils/AELimiter.cpp b/xbmc/cores/AudioEngine/Utils/AELimiter.cpp similarity index 100% rename from src/cores/AudioEngine/Utils/AELimiter.cpp rename to xbmc/cores/AudioEngine/Utils/AELimiter.cpp diff --git a/src/cores/AudioEngine/Utils/AELimiter.h b/xbmc/cores/AudioEngine/Utils/AELimiter.h similarity index 100% rename from src/cores/AudioEngine/Utils/AELimiter.h rename to xbmc/cores/AudioEngine/Utils/AELimiter.h diff --git a/src/cores/AudioEngine/Utils/AEPackIEC61937.cpp b/xbmc/cores/AudioEngine/Utils/AEPackIEC61937.cpp similarity index 100% rename from src/cores/AudioEngine/Utils/AEPackIEC61937.cpp rename to xbmc/cores/AudioEngine/Utils/AEPackIEC61937.cpp diff --git a/src/cores/AudioEngine/Utils/AEPackIEC61937.h b/xbmc/cores/AudioEngine/Utils/AEPackIEC61937.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEPackIEC61937.h rename to xbmc/cores/AudioEngine/Utils/AEPackIEC61937.h diff --git a/src/cores/AudioEngine/Utils/AERingBuffer.h b/xbmc/cores/AudioEngine/Utils/AERingBuffer.h similarity index 100% rename from src/cores/AudioEngine/Utils/AERingBuffer.h rename to xbmc/cores/AudioEngine/Utils/AERingBuffer.h diff --git a/src/cores/AudioEngine/Utils/AEStreamInfo.cpp b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp similarity index 100% rename from src/cores/AudioEngine/Utils/AEStreamInfo.cpp rename to xbmc/cores/AudioEngine/Utils/AEStreamInfo.cpp diff --git a/src/cores/AudioEngine/Utils/AEStreamInfo.h b/xbmc/cores/AudioEngine/Utils/AEStreamInfo.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEStreamInfo.h rename to xbmc/cores/AudioEngine/Utils/AEStreamInfo.h diff --git a/src/cores/AudioEngine/Utils/AEUtil.cpp b/xbmc/cores/AudioEngine/Utils/AEUtil.cpp similarity index 100% rename from src/cores/AudioEngine/Utils/AEUtil.cpp rename to xbmc/cores/AudioEngine/Utils/AEUtil.cpp diff --git a/src/cores/AudioEngine/Utils/AEUtil.h b/xbmc/cores/AudioEngine/Utils/AEUtil.h similarity index 100% rename from src/cores/AudioEngine/Utils/AEUtil.h rename to xbmc/cores/AudioEngine/Utils/AEUtil.h diff --git a/src/cores/DataCacheCore.cpp b/xbmc/cores/DataCacheCore.cpp similarity index 100% rename from src/cores/DataCacheCore.cpp rename to xbmc/cores/DataCacheCore.cpp diff --git a/src/cores/DataCacheCore.h b/xbmc/cores/DataCacheCore.h similarity index 100% rename from src/cores/DataCacheCore.h rename to xbmc/cores/DataCacheCore.h diff --git a/src/cores/DllLoader/DllLoader-linux.cpp b/xbmc/cores/DllLoader/DllLoader-linux.cpp similarity index 100% rename from src/cores/DllLoader/DllLoader-linux.cpp rename to xbmc/cores/DllLoader/DllLoader-linux.cpp diff --git a/src/cores/DllLoader/DllLoader.cpp b/xbmc/cores/DllLoader/DllLoader.cpp similarity index 100% rename from src/cores/DllLoader/DllLoader.cpp rename to xbmc/cores/DllLoader/DllLoader.cpp diff --git a/src/cores/DllLoader/DllLoader.h b/xbmc/cores/DllLoader/DllLoader.h similarity index 100% rename from src/cores/DllLoader/DllLoader.h rename to xbmc/cores/DllLoader/DllLoader.h diff --git a/src/cores/DllLoader/DllLoaderContainer.cpp b/xbmc/cores/DllLoader/DllLoaderContainer.cpp similarity index 100% rename from src/cores/DllLoader/DllLoaderContainer.cpp rename to xbmc/cores/DllLoader/DllLoaderContainer.cpp diff --git a/src/cores/DllLoader/DllLoaderContainer.h b/xbmc/cores/DllLoader/DllLoaderContainer.h similarity index 100% rename from src/cores/DllLoader/DllLoaderContainer.h rename to xbmc/cores/DllLoader/DllLoaderContainer.h diff --git a/src/cores/DllLoader/LibraryLoader.cpp b/xbmc/cores/DllLoader/LibraryLoader.cpp similarity index 100% rename from src/cores/DllLoader/LibraryLoader.cpp rename to xbmc/cores/DllLoader/LibraryLoader.cpp diff --git a/src/cores/DllLoader/LibraryLoader.h b/xbmc/cores/DllLoader/LibraryLoader.h similarity index 100% rename from src/cores/DllLoader/LibraryLoader.h rename to xbmc/cores/DllLoader/LibraryLoader.h diff --git a/src/cores/DllLoader/Makefile.in b/xbmc/cores/DllLoader/Makefile.in similarity index 100% rename from src/cores/DllLoader/Makefile.in rename to xbmc/cores/DllLoader/Makefile.in diff --git a/src/cores/DllLoader/SoLoader.cpp b/xbmc/cores/DllLoader/SoLoader.cpp similarity index 100% rename from src/cores/DllLoader/SoLoader.cpp rename to xbmc/cores/DllLoader/SoLoader.cpp diff --git a/src/cores/DllLoader/SoLoader.h b/xbmc/cores/DllLoader/SoLoader.h similarity index 100% rename from src/cores/DllLoader/SoLoader.h rename to xbmc/cores/DllLoader/SoLoader.h diff --git a/src/cores/DllLoader/Win32DllLoader.cpp b/xbmc/cores/DllLoader/Win32DllLoader.cpp similarity index 100% rename from src/cores/DllLoader/Win32DllLoader.cpp rename to xbmc/cores/DllLoader/Win32DllLoader.cpp diff --git a/src/cores/DllLoader/Win32DllLoader.h b/xbmc/cores/DllLoader/Win32DllLoader.h similarity index 100% rename from src/cores/DllLoader/Win32DllLoader.h rename to xbmc/cores/DllLoader/Win32DllLoader.h diff --git a/src/cores/DllLoader/coff.cpp b/xbmc/cores/DllLoader/coff.cpp similarity index 100% rename from src/cores/DllLoader/coff.cpp rename to xbmc/cores/DllLoader/coff.cpp diff --git a/src/cores/DllLoader/coff.h b/xbmc/cores/DllLoader/coff.h similarity index 100% rename from src/cores/DllLoader/coff.h rename to xbmc/cores/DllLoader/coff.h diff --git a/src/cores/DllLoader/coffldr.h b/xbmc/cores/DllLoader/coffldr.h similarity index 100% rename from src/cores/DllLoader/coffldr.h rename to xbmc/cores/DllLoader/coffldr.h diff --git a/src/cores/DllLoader/dll.cpp b/xbmc/cores/DllLoader/dll.cpp similarity index 100% rename from src/cores/DllLoader/dll.cpp rename to xbmc/cores/DllLoader/dll.cpp diff --git a/src/cores/DllLoader/dll.h b/xbmc/cores/DllLoader/dll.h similarity index 100% rename from src/cores/DllLoader/dll.h rename to xbmc/cores/DllLoader/dll.h diff --git a/src/cores/DllLoader/dll_tracker.cpp b/xbmc/cores/DllLoader/dll_tracker.cpp similarity index 100% rename from src/cores/DllLoader/dll_tracker.cpp rename to xbmc/cores/DllLoader/dll_tracker.cpp diff --git a/src/cores/DllLoader/dll_tracker.h b/xbmc/cores/DllLoader/dll_tracker.h similarity index 100% rename from src/cores/DllLoader/dll_tracker.h rename to xbmc/cores/DllLoader/dll_tracker.h diff --git a/src/cores/DllLoader/dll_tracker_file.cpp b/xbmc/cores/DllLoader/dll_tracker_file.cpp similarity index 100% rename from src/cores/DllLoader/dll_tracker_file.cpp rename to xbmc/cores/DllLoader/dll_tracker_file.cpp diff --git a/src/cores/DllLoader/dll_tracker_file.h b/xbmc/cores/DllLoader/dll_tracker_file.h similarity index 100% rename from src/cores/DllLoader/dll_tracker_file.h rename to xbmc/cores/DllLoader/dll_tracker_file.h diff --git a/src/cores/DllLoader/dll_tracker_library.cpp b/xbmc/cores/DllLoader/dll_tracker_library.cpp similarity index 100% rename from src/cores/DllLoader/dll_tracker_library.cpp rename to xbmc/cores/DllLoader/dll_tracker_library.cpp diff --git a/src/cores/DllLoader/dll_tracker_library.h b/xbmc/cores/DllLoader/dll_tracker_library.h similarity index 100% rename from src/cores/DllLoader/dll_tracker_library.h rename to xbmc/cores/DllLoader/dll_tracker_library.h diff --git a/src/cores/DllLoader/dll_util.cpp b/xbmc/cores/DllLoader/dll_util.cpp similarity index 100% rename from src/cores/DllLoader/dll_util.cpp rename to xbmc/cores/DllLoader/dll_util.cpp diff --git a/src/cores/DllLoader/dll_util.h b/xbmc/cores/DllLoader/dll_util.h similarity index 100% rename from src/cores/DllLoader/dll_util.h rename to xbmc/cores/DllLoader/dll_util.h diff --git a/src/cores/DllLoader/exports/Makefile.in b/xbmc/cores/DllLoader/exports/Makefile.in similarity index 100% rename from src/cores/DllLoader/exports/Makefile.in rename to xbmc/cores/DllLoader/exports/Makefile.in diff --git a/src/cores/DllLoader/exports/emu_dummy.cpp b/xbmc/cores/DllLoader/exports/emu_dummy.cpp similarity index 100% rename from src/cores/DllLoader/exports/emu_dummy.cpp rename to xbmc/cores/DllLoader/exports/emu_dummy.cpp diff --git a/src/cores/DllLoader/exports/emu_dummy.h b/xbmc/cores/DllLoader/exports/emu_dummy.h similarity index 100% rename from src/cores/DllLoader/exports/emu_dummy.h rename to xbmc/cores/DllLoader/exports/emu_dummy.h diff --git a/src/cores/DllLoader/exports/emu_kernel32.cpp b/xbmc/cores/DllLoader/exports/emu_kernel32.cpp similarity index 100% rename from src/cores/DllLoader/exports/emu_kernel32.cpp rename to xbmc/cores/DllLoader/exports/emu_kernel32.cpp diff --git a/src/cores/DllLoader/exports/emu_kernel32.h b/xbmc/cores/DllLoader/exports/emu_kernel32.h similarity index 100% rename from src/cores/DllLoader/exports/emu_kernel32.h rename to xbmc/cores/DllLoader/exports/emu_kernel32.h diff --git a/src/cores/DllLoader/exports/emu_msvcrt.cpp b/xbmc/cores/DllLoader/exports/emu_msvcrt.cpp similarity index 100% rename from src/cores/DllLoader/exports/emu_msvcrt.cpp rename to xbmc/cores/DllLoader/exports/emu_msvcrt.cpp diff --git a/src/cores/DllLoader/exports/emu_msvcrt.h b/xbmc/cores/DllLoader/exports/emu_msvcrt.h similarity index 100% rename from src/cores/DllLoader/exports/emu_msvcrt.h rename to xbmc/cores/DllLoader/exports/emu_msvcrt.h diff --git a/src/cores/DllLoader/exports/kernel32.def b/xbmc/cores/DllLoader/exports/kernel32.def similarity index 100% rename from src/cores/DllLoader/exports/kernel32.def rename to xbmc/cores/DllLoader/exports/kernel32.def diff --git a/src/cores/DllLoader/exports/msvcrt.def b/xbmc/cores/DllLoader/exports/msvcrt.def similarity index 100% rename from src/cores/DllLoader/exports/msvcrt.def rename to xbmc/cores/DllLoader/exports/msvcrt.def diff --git a/src/cores/DllLoader/exports/pncrt.def b/xbmc/cores/DllLoader/exports/pncrt.def similarity index 100% rename from src/cores/DllLoader/exports/pncrt.def rename to xbmc/cores/DllLoader/exports/pncrt.def diff --git a/src/cores/DllLoader/exports/util/EmuFileWrapper.cpp b/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp similarity index 100% rename from src/cores/DllLoader/exports/util/EmuFileWrapper.cpp rename to xbmc/cores/DllLoader/exports/util/EmuFileWrapper.cpp diff --git a/src/cores/DllLoader/exports/util/EmuFileWrapper.h b/xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h similarity index 100% rename from src/cores/DllLoader/exports/util/EmuFileWrapper.h rename to xbmc/cores/DllLoader/exports/util/EmuFileWrapper.h diff --git a/src/cores/DllLoader/exports/util/Makefile b/xbmc/cores/DllLoader/exports/util/Makefile similarity index 100% rename from src/cores/DllLoader/exports/util/Makefile rename to xbmc/cores/DllLoader/exports/util/Makefile diff --git a/src/cores/DllLoader/exports/winMM.def b/xbmc/cores/DllLoader/exports/winMM.def similarity index 100% rename from src/cores/DllLoader/exports/winMM.def rename to xbmc/cores/DllLoader/exports/winMM.def diff --git a/src/cores/DllLoader/exports/wrapper.c b/xbmc/cores/DllLoader/exports/wrapper.c similarity index 100% rename from src/cores/DllLoader/exports/wrapper.c rename to xbmc/cores/DllLoader/exports/wrapper.c diff --git a/src/cores/DllLoader/exports/wrapper_mach_alias b/xbmc/cores/DllLoader/exports/wrapper_mach_alias similarity index 100% rename from src/cores/DllLoader/exports/wrapper_mach_alias rename to xbmc/cores/DllLoader/exports/wrapper_mach_alias diff --git a/src/cores/DllLoader/exports/ws2_32.def b/xbmc/cores/DllLoader/exports/ws2_32.def similarity index 100% rename from src/cores/DllLoader/exports/ws2_32.def rename to xbmc/cores/DllLoader/exports/ws2_32.def diff --git a/src/cores/DllLoader/ldt_keeper.c b/xbmc/cores/DllLoader/ldt_keeper.c similarity index 100% rename from src/cores/DllLoader/ldt_keeper.c rename to xbmc/cores/DllLoader/ldt_keeper.c diff --git a/src/cores/DllLoader/ldt_keeper.h b/xbmc/cores/DllLoader/ldt_keeper.h similarity index 100% rename from src/cores/DllLoader/ldt_keeper.h rename to xbmc/cores/DllLoader/ldt_keeper.h diff --git a/src/cores/DllLoader/mmap_anon.c b/xbmc/cores/DllLoader/mmap_anon.c similarity index 100% rename from src/cores/DllLoader/mmap_anon.c rename to xbmc/cores/DllLoader/mmap_anon.c diff --git a/src/cores/DllLoader/mmap_anon.h b/xbmc/cores/DllLoader/mmap_anon.h similarity index 100% rename from src/cores/DllLoader/mmap_anon.h rename to xbmc/cores/DllLoader/mmap_anon.h diff --git a/src/cores/DummyVideoPlayer.cpp b/xbmc/cores/DummyVideoPlayer.cpp similarity index 100% rename from src/cores/DummyVideoPlayer.cpp rename to xbmc/cores/DummyVideoPlayer.cpp diff --git a/src/cores/DummyVideoPlayer.h b/xbmc/cores/DummyVideoPlayer.h similarity index 100% rename from src/cores/DummyVideoPlayer.h rename to xbmc/cores/DummyVideoPlayer.h diff --git a/src/cores/ExternalPlayer/ExternalPlayer.cpp b/xbmc/cores/ExternalPlayer/ExternalPlayer.cpp similarity index 100% rename from src/cores/ExternalPlayer/ExternalPlayer.cpp rename to xbmc/cores/ExternalPlayer/ExternalPlayer.cpp diff --git a/src/cores/ExternalPlayer/ExternalPlayer.h b/xbmc/cores/ExternalPlayer/ExternalPlayer.h similarity index 100% rename from src/cores/ExternalPlayer/ExternalPlayer.h rename to xbmc/cores/ExternalPlayer/ExternalPlayer.h diff --git a/src/cores/ExternalPlayer/Makefile b/xbmc/cores/ExternalPlayer/Makefile similarity index 100% rename from src/cores/ExternalPlayer/Makefile rename to xbmc/cores/ExternalPlayer/Makefile diff --git a/src/cores/FFmpeg.cpp b/xbmc/cores/FFmpeg.cpp similarity index 100% rename from src/cores/FFmpeg.cpp rename to xbmc/cores/FFmpeg.cpp diff --git a/src/cores/FFmpeg.h b/xbmc/cores/FFmpeg.h similarity index 100% rename from src/cores/FFmpeg.h rename to xbmc/cores/FFmpeg.h diff --git a/src/cores/IAudioCallback.h b/xbmc/cores/IAudioCallback.h similarity index 100% rename from src/cores/IAudioCallback.h rename to xbmc/cores/IAudioCallback.h diff --git a/src/cores/IPlayer.h b/xbmc/cores/IPlayer.h similarity index 100% rename from src/cores/IPlayer.h rename to xbmc/cores/IPlayer.h diff --git a/src/cores/IPlayerCallback.h b/xbmc/cores/IPlayerCallback.h similarity index 100% rename from src/cores/IPlayerCallback.h rename to xbmc/cores/IPlayerCallback.h diff --git a/src/cores/Makefile.in b/xbmc/cores/Makefile.in similarity index 100% rename from src/cores/Makefile.in rename to xbmc/cores/Makefile.in diff --git a/src/cores/VideoRenderers/BaseRenderer.cpp b/xbmc/cores/VideoRenderers/BaseRenderer.cpp similarity index 100% rename from src/cores/VideoRenderers/BaseRenderer.cpp rename to xbmc/cores/VideoRenderers/BaseRenderer.cpp diff --git a/src/cores/VideoRenderers/BaseRenderer.h b/xbmc/cores/VideoRenderers/BaseRenderer.h similarity index 100% rename from src/cores/VideoRenderers/BaseRenderer.h rename to xbmc/cores/VideoRenderers/BaseRenderer.h diff --git a/src/cores/VideoRenderers/DXVA.cpp b/xbmc/cores/VideoRenderers/DXVA.cpp similarity index 100% rename from src/cores/VideoRenderers/DXVA.cpp rename to xbmc/cores/VideoRenderers/DXVA.cpp diff --git a/src/cores/VideoRenderers/DXVA.h b/xbmc/cores/VideoRenderers/DXVA.h similarity index 100% rename from src/cores/VideoRenderers/DXVA.h rename to xbmc/cores/VideoRenderers/DXVA.h diff --git a/src/cores/VideoRenderers/DXVAHD.cpp b/xbmc/cores/VideoRenderers/DXVAHD.cpp similarity index 100% rename from src/cores/VideoRenderers/DXVAHD.cpp rename to xbmc/cores/VideoRenderers/DXVAHD.cpp diff --git a/src/cores/VideoRenderers/DXVAHD.h b/xbmc/cores/VideoRenderers/DXVAHD.h similarity index 100% rename from src/cores/VideoRenderers/DXVAHD.h rename to xbmc/cores/VideoRenderers/DXVAHD.h diff --git a/src/cores/VideoRenderers/LinuxRendererGL.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp similarity index 100% rename from src/cores/VideoRenderers/LinuxRendererGL.cpp rename to xbmc/cores/VideoRenderers/LinuxRendererGL.cpp diff --git a/src/cores/VideoRenderers/LinuxRendererGL.h b/xbmc/cores/VideoRenderers/LinuxRendererGL.h similarity index 100% rename from src/cores/VideoRenderers/LinuxRendererGL.h rename to xbmc/cores/VideoRenderers/LinuxRendererGL.h diff --git a/src/cores/VideoRenderers/LinuxRendererGLES.cpp b/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp similarity index 100% rename from src/cores/VideoRenderers/LinuxRendererGLES.cpp rename to xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp diff --git a/src/cores/VideoRenderers/LinuxRendererGLES.h b/xbmc/cores/VideoRenderers/LinuxRendererGLES.h similarity index 100% rename from src/cores/VideoRenderers/LinuxRendererGLES.h rename to xbmc/cores/VideoRenderers/LinuxRendererGLES.h diff --git a/src/cores/VideoRenderers/MMALRenderer.cpp b/xbmc/cores/VideoRenderers/MMALRenderer.cpp similarity index 100% rename from src/cores/VideoRenderers/MMALRenderer.cpp rename to xbmc/cores/VideoRenderers/MMALRenderer.cpp diff --git a/src/cores/VideoRenderers/MMALRenderer.h b/xbmc/cores/VideoRenderers/MMALRenderer.h similarity index 100% rename from src/cores/VideoRenderers/MMALRenderer.h rename to xbmc/cores/VideoRenderers/MMALRenderer.h diff --git a/src/cores/VideoRenderers/Makefile.in b/xbmc/cores/VideoRenderers/Makefile.in similarity index 100% rename from src/cores/VideoRenderers/Makefile.in rename to xbmc/cores/VideoRenderers/Makefile.in diff --git a/src/cores/VideoRenderers/OverlayRenderer.cpp b/xbmc/cores/VideoRenderers/OverlayRenderer.cpp similarity index 100% rename from src/cores/VideoRenderers/OverlayRenderer.cpp rename to xbmc/cores/VideoRenderers/OverlayRenderer.cpp diff --git a/src/cores/VideoRenderers/OverlayRenderer.h b/xbmc/cores/VideoRenderers/OverlayRenderer.h similarity index 100% rename from src/cores/VideoRenderers/OverlayRenderer.h rename to xbmc/cores/VideoRenderers/OverlayRenderer.h diff --git a/src/cores/VideoRenderers/OverlayRendererDX.cpp b/xbmc/cores/VideoRenderers/OverlayRendererDX.cpp similarity index 100% rename from src/cores/VideoRenderers/OverlayRendererDX.cpp rename to xbmc/cores/VideoRenderers/OverlayRendererDX.cpp diff --git a/src/cores/VideoRenderers/OverlayRendererDX.h b/xbmc/cores/VideoRenderers/OverlayRendererDX.h similarity index 100% rename from src/cores/VideoRenderers/OverlayRendererDX.h rename to xbmc/cores/VideoRenderers/OverlayRendererDX.h diff --git a/src/cores/VideoRenderers/OverlayRendererGL.cpp b/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp similarity index 100% rename from src/cores/VideoRenderers/OverlayRendererGL.cpp rename to xbmc/cores/VideoRenderers/OverlayRendererGL.cpp diff --git a/src/cores/VideoRenderers/OverlayRendererGL.h b/xbmc/cores/VideoRenderers/OverlayRendererGL.h similarity index 100% rename from src/cores/VideoRenderers/OverlayRendererGL.h rename to xbmc/cores/VideoRenderers/OverlayRendererGL.h diff --git a/src/cores/VideoRenderers/OverlayRendererGUI.cpp b/xbmc/cores/VideoRenderers/OverlayRendererGUI.cpp similarity index 100% rename from src/cores/VideoRenderers/OverlayRendererGUI.cpp rename to xbmc/cores/VideoRenderers/OverlayRendererGUI.cpp diff --git a/src/cores/VideoRenderers/OverlayRendererGUI.h b/xbmc/cores/VideoRenderers/OverlayRendererGUI.h similarity index 100% rename from src/cores/VideoRenderers/OverlayRendererGUI.h rename to xbmc/cores/VideoRenderers/OverlayRendererGUI.h diff --git a/src/cores/VideoRenderers/OverlayRendererUtil.cpp b/xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp similarity index 100% rename from src/cores/VideoRenderers/OverlayRendererUtil.cpp rename to xbmc/cores/VideoRenderers/OverlayRendererUtil.cpp diff --git a/src/cores/VideoRenderers/OverlayRendererUtil.h b/xbmc/cores/VideoRenderers/OverlayRendererUtil.h similarity index 100% rename from src/cores/VideoRenderers/OverlayRendererUtil.h rename to xbmc/cores/VideoRenderers/OverlayRendererUtil.h diff --git a/src/cores/VideoRenderers/RenderCapture.cpp b/xbmc/cores/VideoRenderers/RenderCapture.cpp similarity index 100% rename from src/cores/VideoRenderers/RenderCapture.cpp rename to xbmc/cores/VideoRenderers/RenderCapture.cpp diff --git a/src/cores/VideoRenderers/RenderCapture.h b/xbmc/cores/VideoRenderers/RenderCapture.h similarity index 100% rename from src/cores/VideoRenderers/RenderCapture.h rename to xbmc/cores/VideoRenderers/RenderCapture.h diff --git a/src/cores/VideoRenderers/RenderFeatures.h b/xbmc/cores/VideoRenderers/RenderFeatures.h similarity index 100% rename from src/cores/VideoRenderers/RenderFeatures.h rename to xbmc/cores/VideoRenderers/RenderFeatures.h diff --git a/src/cores/VideoRenderers/RenderFlags.cpp b/xbmc/cores/VideoRenderers/RenderFlags.cpp similarity index 100% rename from src/cores/VideoRenderers/RenderFlags.cpp rename to xbmc/cores/VideoRenderers/RenderFlags.cpp diff --git a/src/cores/VideoRenderers/RenderFlags.h b/xbmc/cores/VideoRenderers/RenderFlags.h similarity index 100% rename from src/cores/VideoRenderers/RenderFlags.h rename to xbmc/cores/VideoRenderers/RenderFlags.h diff --git a/src/cores/VideoRenderers/RenderFormats.h b/xbmc/cores/VideoRenderers/RenderFormats.h similarity index 100% rename from src/cores/VideoRenderers/RenderFormats.h rename to xbmc/cores/VideoRenderers/RenderFormats.h diff --git a/src/cores/VideoRenderers/RenderManager.cpp b/xbmc/cores/VideoRenderers/RenderManager.cpp similarity index 100% rename from src/cores/VideoRenderers/RenderManager.cpp rename to xbmc/cores/VideoRenderers/RenderManager.cpp diff --git a/src/cores/VideoRenderers/RenderManager.h b/xbmc/cores/VideoRenderers/RenderManager.h similarity index 100% rename from src/cores/VideoRenderers/RenderManager.h rename to xbmc/cores/VideoRenderers/RenderManager.h diff --git a/src/cores/VideoRenderers/VideoShaders/ConvolutionKernels.cpp b/xbmc/cores/VideoRenderers/VideoShaders/ConvolutionKernels.cpp similarity index 100% rename from src/cores/VideoRenderers/VideoShaders/ConvolutionKernels.cpp rename to xbmc/cores/VideoRenderers/VideoShaders/ConvolutionKernels.cpp diff --git a/src/cores/VideoRenderers/VideoShaders/ConvolutionKernels.h b/xbmc/cores/VideoRenderers/VideoShaders/ConvolutionKernels.h similarity index 100% rename from src/cores/VideoRenderers/VideoShaders/ConvolutionKernels.h rename to xbmc/cores/VideoRenderers/VideoShaders/ConvolutionKernels.h diff --git a/src/cores/VideoRenderers/VideoShaders/Makefile b/xbmc/cores/VideoRenderers/VideoShaders/Makefile similarity index 100% rename from src/cores/VideoRenderers/VideoShaders/Makefile rename to xbmc/cores/VideoRenderers/VideoShaders/Makefile diff --git a/src/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp b/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp similarity index 100% rename from src/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp rename to xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.cpp diff --git a/src/cores/VideoRenderers/VideoShaders/VideoFilterShader.h b/xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h similarity index 100% rename from src/cores/VideoRenderers/VideoShaders/VideoFilterShader.h rename to xbmc/cores/VideoRenderers/VideoShaders/VideoFilterShader.h diff --git a/src/cores/VideoRenderers/VideoShaders/WinVideoFilter.cpp b/xbmc/cores/VideoRenderers/VideoShaders/WinVideoFilter.cpp similarity index 100% rename from src/cores/VideoRenderers/VideoShaders/WinVideoFilter.cpp rename to xbmc/cores/VideoRenderers/VideoShaders/WinVideoFilter.cpp diff --git a/src/cores/VideoRenderers/VideoShaders/WinVideoFilter.h b/xbmc/cores/VideoRenderers/VideoShaders/WinVideoFilter.h similarity index 100% rename from src/cores/VideoRenderers/VideoShaders/WinVideoFilter.h rename to xbmc/cores/VideoRenderers/VideoShaders/WinVideoFilter.h diff --git a/src/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp b/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp similarity index 100% rename from src/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp rename to xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.cpp diff --git a/src/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h b/xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h similarity index 100% rename from src/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h rename to xbmc/cores/VideoRenderers/VideoShaders/YUV2RGBShader.h diff --git a/src/cores/VideoRenderers/WinRenderer.cpp b/xbmc/cores/VideoRenderers/WinRenderer.cpp similarity index 100% rename from src/cores/VideoRenderers/WinRenderer.cpp rename to xbmc/cores/VideoRenderers/WinRenderer.cpp diff --git a/src/cores/VideoRenderers/WinRenderer.h b/xbmc/cores/VideoRenderers/WinRenderer.h similarity index 100% rename from src/cores/VideoRenderers/WinRenderer.h rename to xbmc/cores/VideoRenderers/WinRenderer.h diff --git a/src/cores/VideoRenderers/yuv2rgb.neon.S b/xbmc/cores/VideoRenderers/yuv2rgb.neon.S similarity index 100% rename from src/cores/VideoRenderers/yuv2rgb.neon.S rename to xbmc/cores/VideoRenderers/yuv2rgb.neon.S diff --git a/src/cores/VideoRenderers/yuv2rgb.neon.h b/xbmc/cores/VideoRenderers/yuv2rgb.neon.h similarity index 100% rename from src/cores/VideoRenderers/yuv2rgb.neon.h rename to xbmc/cores/VideoRenderers/yuv2rgb.neon.h diff --git a/src/cores/dvdplayer/DVDAudio.cpp b/xbmc/cores/dvdplayer/DVDAudio.cpp similarity index 100% rename from src/cores/dvdplayer/DVDAudio.cpp rename to xbmc/cores/dvdplayer/DVDAudio.cpp diff --git a/src/cores/dvdplayer/DVDAudio.h b/xbmc/cores/dvdplayer/DVDAudio.h similarity index 100% rename from src/cores/dvdplayer/DVDAudio.h rename to xbmc/cores/dvdplayer/DVDAudio.h diff --git a/src/cores/dvdplayer/DVDClock.cpp b/xbmc/cores/dvdplayer/DVDClock.cpp similarity index 100% rename from src/cores/dvdplayer/DVDClock.cpp rename to xbmc/cores/dvdplayer/DVDClock.cpp diff --git a/src/cores/dvdplayer/DVDClock.h b/xbmc/cores/dvdplayer/DVDClock.h similarity index 100% rename from src/cores/dvdplayer/DVDClock.h rename to xbmc/cores/dvdplayer/DVDClock.h diff --git a/src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h rename to xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodec.h diff --git a/src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h rename to xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecFFmpeg.h diff --git a/src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h b/xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h rename to xbmc/cores/dvdplayer/DVDCodecs/Audio/DVDAudioCodecPassthrough.h diff --git a/src/cores/dvdplayer/DVDCodecs/Audio/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Audio/Makefile.in rename to xbmc/cores/dvdplayer/DVDCodecs/Audio/Makefile.in diff --git a/src/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h rename to xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.h diff --git a/src/cores/dvdplayer/DVDCodecs/DVDCodecs.h b/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/DVDCodecs.h rename to xbmc/cores/dvdplayer/DVDCodecs/DVDCodecs.h diff --git a/src/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h rename to xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.h diff --git a/src/cores/dvdplayer/DVDCodecs/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Makefile.in similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Makefile.in rename to xbmc/cores/dvdplayer/DVDCodecs/Makefile.in diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlay.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlay.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlay.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlay.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodec.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecCC.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecCC.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecCC.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecCC.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecCC.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecCC.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecCC.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecCC.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecFFmpeg.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecSSA.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecTX3G.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayCodecText.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayImage.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySSA.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlaySpu.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/DVDOverlayText.h diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/Makefile.in diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.c b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.c similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.c rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.c diff --git a/src/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.h b/xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.h rename to xbmc/cores/dvdplayer/DVDCodecs/Overlay/libspucc/cc_decoder.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/AMLCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/AMLCodec.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/AMLCodec.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecAndroidMediaCodec.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecIMX.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecMMAL.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecMMAL.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecMMAL.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecMMAL.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecMMAL.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecMMAL.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecMMAL.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecMMAL.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecOpenMax.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecStageFright.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DXVA.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DXVA.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/DllLibStageFrightCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibStageFrightCodec.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/DllLibStageFrightCodec.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibStageFrightCodec.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/MMALCodec.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/Makefile.in rename to xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in diff --git a/src/cores/dvdplayer/DVDCodecs/Video/OpenMax.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMax.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/OpenMax.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMax.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/OpenMax.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMax.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/OpenMax.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMax.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/OpenMaxVideo.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/VAAPI.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/VDA.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/VDA.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/VDA.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/VDA.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/VDPAU.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/VDPAU.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2convert.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2convert.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2convert.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2/mpeg2convert.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile.in similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile.in rename to xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/Makefile.in diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightInterface.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideo.h diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp rename to xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.cpp diff --git a/src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h similarity index 100% rename from src/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h rename to xbmc/cores/dvdplayer/DVDCodecs/Video/libstagefrightICS/StageFrightVideoPrivate.h diff --git a/src/cores/dvdplayer/DVDDemuxSPU.cpp b/xbmc/cores/dvdplayer/DVDDemuxSPU.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxSPU.cpp rename to xbmc/cores/dvdplayer/DVDDemuxSPU.cpp diff --git a/src/cores/dvdplayer/DVDDemuxSPU.h b/xbmc/cores/dvdplayer/DVDDemuxSPU.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxSPU.h rename to xbmc/cores/dvdplayer/DVDDemuxSPU.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemux.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemux.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemux.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxBXA.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxCDDA.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxHTSP.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPacket.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxShoutcast.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxUtils.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxVobsub.h diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp b/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp diff --git a/src/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.h b/xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.h similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.h rename to xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.h diff --git a/src/cores/dvdplayer/DVDDemuxers/Makefile.in b/xbmc/cores/dvdplayer/DVDDemuxers/Makefile.in similarity index 100% rename from src/cores/dvdplayer/DVDDemuxers/Makefile.in rename to xbmc/cores/dvdplayer/DVDDemuxers/Makefile.in diff --git a/src/cores/dvdplayer/DVDFileInfo.cpp b/xbmc/cores/dvdplayer/DVDFileInfo.cpp similarity index 100% rename from src/cores/dvdplayer/DVDFileInfo.cpp rename to xbmc/cores/dvdplayer/DVDFileInfo.cpp diff --git a/src/cores/dvdplayer/DVDFileInfo.h b/xbmc/cores/dvdplayer/DVDFileInfo.h similarity index 100% rename from src/cores/dvdplayer/DVDFileInfo.h rename to xbmc/cores/dvdplayer/DVDFileInfo.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDFactoryInputStream.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStream.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStream.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFFmpeg.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamFile.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHttp.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamMemory.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamNavigator.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamStack.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.cpp diff --git a/src/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.h b/xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DVDStateSerializer.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DllDvdNav.h b/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DllDvdNav.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h diff --git a/src/cores/dvdplayer/DVDInputStreams/DllLibRTMP.h b/xbmc/cores/dvdplayer/DVDInputStreams/DllLibRTMP.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/DllLibRTMP.h rename to xbmc/cores/dvdplayer/DVDInputStreams/DllLibRTMP.h diff --git a/src/cores/dvdplayer/DVDInputStreams/Makefile b/xbmc/cores/dvdplayer/DVDInputStreams/Makefile similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/Makefile rename to xbmc/cores/dvdplayer/DVDInputStreams/Makefile diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/config.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/config.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/config.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/decoder.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_reader.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvd_types.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_events.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/dvdnav_internal.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/ifo_types.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/nav_types.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/remap.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/remap.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/remap.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/remap.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vm.h diff --git a/src/cores/dvdplayer/DVDInputStreams/dvdnav/vmcmd.h b/xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vmcmd.h similarity index 100% rename from src/cores/dvdplayer/DVDInputStreams/dvdnav/vmcmd.h rename to xbmc/cores/dvdplayer/DVDInputStreams/dvdnav/vmcmd.h diff --git a/src/cores/dvdplayer/DVDMessage.cpp b/xbmc/cores/dvdplayer/DVDMessage.cpp similarity index 100% rename from src/cores/dvdplayer/DVDMessage.cpp rename to xbmc/cores/dvdplayer/DVDMessage.cpp diff --git a/src/cores/dvdplayer/DVDMessage.h b/xbmc/cores/dvdplayer/DVDMessage.h similarity index 100% rename from src/cores/dvdplayer/DVDMessage.h rename to xbmc/cores/dvdplayer/DVDMessage.h diff --git a/src/cores/dvdplayer/DVDMessageQueue.cpp b/xbmc/cores/dvdplayer/DVDMessageQueue.cpp similarity index 100% rename from src/cores/dvdplayer/DVDMessageQueue.cpp rename to xbmc/cores/dvdplayer/DVDMessageQueue.cpp diff --git a/src/cores/dvdplayer/DVDMessageQueue.h b/xbmc/cores/dvdplayer/DVDMessageQueue.h similarity index 100% rename from src/cores/dvdplayer/DVDMessageQueue.h rename to xbmc/cores/dvdplayer/DVDMessageQueue.h diff --git a/src/cores/dvdplayer/DVDOverlayContainer.cpp b/xbmc/cores/dvdplayer/DVDOverlayContainer.cpp similarity index 100% rename from src/cores/dvdplayer/DVDOverlayContainer.cpp rename to xbmc/cores/dvdplayer/DVDOverlayContainer.cpp diff --git a/src/cores/dvdplayer/DVDOverlayContainer.h b/xbmc/cores/dvdplayer/DVDOverlayContainer.h similarity index 100% rename from src/cores/dvdplayer/DVDOverlayContainer.h rename to xbmc/cores/dvdplayer/DVDOverlayContainer.h diff --git a/src/cores/dvdplayer/DVDOverlayRenderer.cpp b/xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp similarity index 100% rename from src/cores/dvdplayer/DVDOverlayRenderer.cpp rename to xbmc/cores/dvdplayer/DVDOverlayRenderer.cpp diff --git a/src/cores/dvdplayer/DVDOverlayRenderer.h b/xbmc/cores/dvdplayer/DVDOverlayRenderer.h similarity index 100% rename from src/cores/dvdplayer/DVDOverlayRenderer.h rename to xbmc/cores/dvdplayer/DVDOverlayRenderer.h diff --git a/src/cores/dvdplayer/DVDPlayer.cpp b/xbmc/cores/dvdplayer/DVDPlayer.cpp similarity index 100% rename from src/cores/dvdplayer/DVDPlayer.cpp rename to xbmc/cores/dvdplayer/DVDPlayer.cpp diff --git a/src/cores/dvdplayer/DVDPlayer.h b/xbmc/cores/dvdplayer/DVDPlayer.h similarity index 100% rename from src/cores/dvdplayer/DVDPlayer.h rename to xbmc/cores/dvdplayer/DVDPlayer.h diff --git a/src/cores/dvdplayer/DVDPlayerAudio.cpp b/xbmc/cores/dvdplayer/DVDPlayerAudio.cpp similarity index 100% rename from src/cores/dvdplayer/DVDPlayerAudio.cpp rename to xbmc/cores/dvdplayer/DVDPlayerAudio.cpp diff --git a/src/cores/dvdplayer/DVDPlayerAudio.h b/xbmc/cores/dvdplayer/DVDPlayerAudio.h similarity index 100% rename from src/cores/dvdplayer/DVDPlayerAudio.h rename to xbmc/cores/dvdplayer/DVDPlayerAudio.h diff --git a/src/cores/dvdplayer/DVDPlayerSubtitle.cpp b/xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp similarity index 100% rename from src/cores/dvdplayer/DVDPlayerSubtitle.cpp rename to xbmc/cores/dvdplayer/DVDPlayerSubtitle.cpp diff --git a/src/cores/dvdplayer/DVDPlayerSubtitle.h b/xbmc/cores/dvdplayer/DVDPlayerSubtitle.h similarity index 100% rename from src/cores/dvdplayer/DVDPlayerSubtitle.h rename to xbmc/cores/dvdplayer/DVDPlayerSubtitle.h diff --git a/src/cores/dvdplayer/DVDPlayerTeletext.cpp b/xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp similarity index 100% rename from src/cores/dvdplayer/DVDPlayerTeletext.cpp rename to xbmc/cores/dvdplayer/DVDPlayerTeletext.cpp diff --git a/src/cores/dvdplayer/DVDPlayerTeletext.h b/xbmc/cores/dvdplayer/DVDPlayerTeletext.h similarity index 100% rename from src/cores/dvdplayer/DVDPlayerTeletext.h rename to xbmc/cores/dvdplayer/DVDPlayerTeletext.h diff --git a/src/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp similarity index 100% rename from src/cores/dvdplayer/DVDPlayerVideo.cpp rename to xbmc/cores/dvdplayer/DVDPlayerVideo.cpp diff --git a/src/cores/dvdplayer/DVDPlayerVideo.h b/xbmc/cores/dvdplayer/DVDPlayerVideo.h similarity index 100% rename from src/cores/dvdplayer/DVDPlayerVideo.h rename to xbmc/cores/dvdplayer/DVDPlayerVideo.h diff --git a/src/cores/dvdplayer/DVDResource.h b/xbmc/cores/dvdplayer/DVDResource.h similarity index 100% rename from src/cores/dvdplayer/DVDResource.h rename to xbmc/cores/dvdplayer/DVDResource.h diff --git a/src/cores/dvdplayer/DVDStreamInfo.cpp b/xbmc/cores/dvdplayer/DVDStreamInfo.cpp similarity index 100% rename from src/cores/dvdplayer/DVDStreamInfo.cpp rename to xbmc/cores/dvdplayer/DVDStreamInfo.cpp diff --git a/src/cores/dvdplayer/DVDStreamInfo.h b/xbmc/cores/dvdplayer/DVDStreamInfo.h similarity index 100% rename from src/cores/dvdplayer/DVDStreamInfo.h rename to xbmc/cores/dvdplayer/DVDStreamInfo.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDFactorySubtitle.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleLineCollection.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParser.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMPL2.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserMicroDVD.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSSA.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSami.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserSubrip.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleParserVplayer.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleStream.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagMicroDVD.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitleTagSami.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.cpp diff --git a/src/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h b/xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DVDSubtitlesLibass.h diff --git a/src/cores/dvdplayer/DVDSubtitles/DllLibass.h b/xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/DllLibass.h rename to xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h diff --git a/src/cores/dvdplayer/DVDSubtitles/Makefile.in b/xbmc/cores/dvdplayer/DVDSubtitles/Makefile.in similarity index 100% rename from src/cores/dvdplayer/DVDSubtitles/Makefile.in rename to xbmc/cores/dvdplayer/DVDSubtitles/Makefile.in diff --git a/src/cores/dvdplayer/DVDTSCorrection.cpp b/xbmc/cores/dvdplayer/DVDTSCorrection.cpp similarity index 100% rename from src/cores/dvdplayer/DVDTSCorrection.cpp rename to xbmc/cores/dvdplayer/DVDTSCorrection.cpp diff --git a/src/cores/dvdplayer/DVDTSCorrection.h b/xbmc/cores/dvdplayer/DVDTSCorrection.h similarity index 100% rename from src/cores/dvdplayer/DVDTSCorrection.h rename to xbmc/cores/dvdplayer/DVDTSCorrection.h diff --git a/src/cores/dvdplayer/Edl.cpp b/xbmc/cores/dvdplayer/Edl.cpp similarity index 100% rename from src/cores/dvdplayer/Edl.cpp rename to xbmc/cores/dvdplayer/Edl.cpp diff --git a/src/cores/dvdplayer/Edl.h b/xbmc/cores/dvdplayer/Edl.h similarity index 100% rename from src/cores/dvdplayer/Edl.h rename to xbmc/cores/dvdplayer/Edl.h diff --git a/src/cores/dvdplayer/IDVDPlayer.h b/xbmc/cores/dvdplayer/IDVDPlayer.h similarity index 100% rename from src/cores/dvdplayer/IDVDPlayer.h rename to xbmc/cores/dvdplayer/IDVDPlayer.h diff --git a/src/cores/dvdplayer/Makefile.in b/xbmc/cores/dvdplayer/Makefile.in similarity index 100% rename from src/cores/dvdplayer/Makefile.in rename to xbmc/cores/dvdplayer/Makefile.in diff --git a/src/cores/omxplayer/Makefile.in b/xbmc/cores/omxplayer/Makefile.in similarity index 100% rename from src/cores/omxplayer/Makefile.in rename to xbmc/cores/omxplayer/Makefile.in diff --git a/src/cores/omxplayer/OMXAudio.cpp b/xbmc/cores/omxplayer/OMXAudio.cpp similarity index 100% rename from src/cores/omxplayer/OMXAudio.cpp rename to xbmc/cores/omxplayer/OMXAudio.cpp diff --git a/src/cores/omxplayer/OMXAudio.h b/xbmc/cores/omxplayer/OMXAudio.h similarity index 100% rename from src/cores/omxplayer/OMXAudio.h rename to xbmc/cores/omxplayer/OMXAudio.h diff --git a/src/cores/omxplayer/OMXAudioCodec.h b/xbmc/cores/omxplayer/OMXAudioCodec.h similarity index 100% rename from src/cores/omxplayer/OMXAudioCodec.h rename to xbmc/cores/omxplayer/OMXAudioCodec.h diff --git a/src/cores/omxplayer/OMXAudioCodecOMX.cpp b/xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp similarity index 100% rename from src/cores/omxplayer/OMXAudioCodecOMX.cpp rename to xbmc/cores/omxplayer/OMXAudioCodecOMX.cpp diff --git a/src/cores/omxplayer/OMXAudioCodecOMX.h b/xbmc/cores/omxplayer/OMXAudioCodecOMX.h similarity index 100% rename from src/cores/omxplayer/OMXAudioCodecOMX.h rename to xbmc/cores/omxplayer/OMXAudioCodecOMX.h diff --git a/src/cores/omxplayer/OMXHelper.cpp b/xbmc/cores/omxplayer/OMXHelper.cpp similarity index 100% rename from src/cores/omxplayer/OMXHelper.cpp rename to xbmc/cores/omxplayer/OMXHelper.cpp diff --git a/src/cores/omxplayer/OMXHelper.h b/xbmc/cores/omxplayer/OMXHelper.h similarity index 100% rename from src/cores/omxplayer/OMXHelper.h rename to xbmc/cores/omxplayer/OMXHelper.h diff --git a/src/cores/omxplayer/OMXImage.cpp b/xbmc/cores/omxplayer/OMXImage.cpp similarity index 100% rename from src/cores/omxplayer/OMXImage.cpp rename to xbmc/cores/omxplayer/OMXImage.cpp diff --git a/src/cores/omxplayer/OMXImage.h b/xbmc/cores/omxplayer/OMXImage.h similarity index 100% rename from src/cores/omxplayer/OMXImage.h rename to xbmc/cores/omxplayer/OMXImage.h diff --git a/src/cores/omxplayer/OMXPlayerAudio.cpp b/xbmc/cores/omxplayer/OMXPlayerAudio.cpp similarity index 100% rename from src/cores/omxplayer/OMXPlayerAudio.cpp rename to xbmc/cores/omxplayer/OMXPlayerAudio.cpp diff --git a/src/cores/omxplayer/OMXPlayerAudio.h b/xbmc/cores/omxplayer/OMXPlayerAudio.h similarity index 100% rename from src/cores/omxplayer/OMXPlayerAudio.h rename to xbmc/cores/omxplayer/OMXPlayerAudio.h diff --git a/src/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp similarity index 100% rename from src/cores/omxplayer/OMXPlayerVideo.cpp rename to xbmc/cores/omxplayer/OMXPlayerVideo.cpp diff --git a/src/cores/omxplayer/OMXPlayerVideo.h b/xbmc/cores/omxplayer/OMXPlayerVideo.h similarity index 100% rename from src/cores/omxplayer/OMXPlayerVideo.h rename to xbmc/cores/omxplayer/OMXPlayerVideo.h diff --git a/src/cores/omxplayer/OMXVideo.cpp b/xbmc/cores/omxplayer/OMXVideo.cpp similarity index 100% rename from src/cores/omxplayer/OMXVideo.cpp rename to xbmc/cores/omxplayer/OMXVideo.cpp diff --git a/src/cores/omxplayer/OMXVideo.h b/xbmc/cores/omxplayer/OMXVideo.h similarity index 100% rename from src/cores/omxplayer/OMXVideo.h rename to xbmc/cores/omxplayer/OMXVideo.h diff --git a/src/cores/omxplayer/OMXVideoCodec.h b/xbmc/cores/omxplayer/OMXVideoCodec.h similarity index 100% rename from src/cores/omxplayer/OMXVideoCodec.h rename to xbmc/cores/omxplayer/OMXVideoCodec.h diff --git a/src/cores/omxplayer/omxplayer_advancedsettings.xml b/xbmc/cores/omxplayer/omxplayer_advancedsettings.xml similarity index 100% rename from src/cores/omxplayer/omxplayer_advancedsettings.xml rename to xbmc/cores/omxplayer/omxplayer_advancedsettings.xml diff --git a/src/cores/paplayer/ASAPCodec.cpp b/xbmc/cores/paplayer/ASAPCodec.cpp similarity index 100% rename from src/cores/paplayer/ASAPCodec.cpp rename to xbmc/cores/paplayer/ASAPCodec.cpp diff --git a/src/cores/paplayer/ASAPCodec.h b/xbmc/cores/paplayer/ASAPCodec.h similarity index 100% rename from src/cores/paplayer/ASAPCodec.h rename to xbmc/cores/paplayer/ASAPCodec.h diff --git a/src/cores/paplayer/AudioDecoder.cpp b/xbmc/cores/paplayer/AudioDecoder.cpp similarity index 100% rename from src/cores/paplayer/AudioDecoder.cpp rename to xbmc/cores/paplayer/AudioDecoder.cpp diff --git a/src/cores/paplayer/AudioDecoder.h b/xbmc/cores/paplayer/AudioDecoder.h similarity index 100% rename from src/cores/paplayer/AudioDecoder.h rename to xbmc/cores/paplayer/AudioDecoder.h diff --git a/src/cores/paplayer/CachingCodec.h b/xbmc/cores/paplayer/CachingCodec.h similarity index 100% rename from src/cores/paplayer/CachingCodec.h rename to xbmc/cores/paplayer/CachingCodec.h diff --git a/src/cores/paplayer/CodecFactory.cpp b/xbmc/cores/paplayer/CodecFactory.cpp similarity index 100% rename from src/cores/paplayer/CodecFactory.cpp rename to xbmc/cores/paplayer/CodecFactory.cpp diff --git a/src/cores/paplayer/CodecFactory.h b/xbmc/cores/paplayer/CodecFactory.h similarity index 100% rename from src/cores/paplayer/CodecFactory.h rename to xbmc/cores/paplayer/CodecFactory.h diff --git a/src/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/DVDPlayerCodec.cpp similarity index 100% rename from src/cores/paplayer/DVDPlayerCodec.cpp rename to xbmc/cores/paplayer/DVDPlayerCodec.cpp diff --git a/src/cores/paplayer/DVDPlayerCodec.h b/xbmc/cores/paplayer/DVDPlayerCodec.h similarity index 100% rename from src/cores/paplayer/DVDPlayerCodec.h rename to xbmc/cores/paplayer/DVDPlayerCodec.h diff --git a/src/cores/paplayer/ICodec.h b/xbmc/cores/paplayer/ICodec.h similarity index 100% rename from src/cores/paplayer/ICodec.h rename to xbmc/cores/paplayer/ICodec.h diff --git a/src/cores/paplayer/Makefile.in b/xbmc/cores/paplayer/Makefile.in similarity index 100% rename from src/cores/paplayer/Makefile.in rename to xbmc/cores/paplayer/Makefile.in diff --git a/src/cores/paplayer/ModplugCodec.cpp b/xbmc/cores/paplayer/ModplugCodec.cpp similarity index 100% rename from src/cores/paplayer/ModplugCodec.cpp rename to xbmc/cores/paplayer/ModplugCodec.cpp diff --git a/src/cores/paplayer/ModplugCodec.h b/xbmc/cores/paplayer/ModplugCodec.h similarity index 100% rename from src/cores/paplayer/ModplugCodec.h rename to xbmc/cores/paplayer/ModplugCodec.h diff --git a/src/cores/paplayer/NSFCodec.cpp b/xbmc/cores/paplayer/NSFCodec.cpp similarity index 100% rename from src/cores/paplayer/NSFCodec.cpp rename to xbmc/cores/paplayer/NSFCodec.cpp diff --git a/src/cores/paplayer/NSFCodec.h b/xbmc/cores/paplayer/NSFCodec.h similarity index 100% rename from src/cores/paplayer/NSFCodec.h rename to xbmc/cores/paplayer/NSFCodec.h diff --git a/src/cores/paplayer/OGGcodec.cpp b/xbmc/cores/paplayer/OGGcodec.cpp similarity index 100% rename from src/cores/paplayer/OGGcodec.cpp rename to xbmc/cores/paplayer/OGGcodec.cpp diff --git a/src/cores/paplayer/OGGcodec.h b/xbmc/cores/paplayer/OGGcodec.h similarity index 100% rename from src/cores/paplayer/OGGcodec.h rename to xbmc/cores/paplayer/OGGcodec.h diff --git a/src/cores/paplayer/OggCallback.cpp b/xbmc/cores/paplayer/OggCallback.cpp similarity index 100% rename from src/cores/paplayer/OggCallback.cpp rename to xbmc/cores/paplayer/OggCallback.cpp diff --git a/src/cores/paplayer/OggCallback.h b/xbmc/cores/paplayer/OggCallback.h similarity index 100% rename from src/cores/paplayer/OggCallback.h rename to xbmc/cores/paplayer/OggCallback.h diff --git a/src/cores/paplayer/PAPlayer.cpp b/xbmc/cores/paplayer/PAPlayer.cpp similarity index 100% rename from src/cores/paplayer/PAPlayer.cpp rename to xbmc/cores/paplayer/PAPlayer.cpp diff --git a/src/cores/paplayer/PAPlayer.h b/xbmc/cores/paplayer/PAPlayer.h similarity index 100% rename from src/cores/paplayer/PAPlayer.h rename to xbmc/cores/paplayer/PAPlayer.h diff --git a/src/cores/paplayer/SIDCodec.cpp b/xbmc/cores/paplayer/SIDCodec.cpp similarity index 100% rename from src/cores/paplayer/SIDCodec.cpp rename to xbmc/cores/paplayer/SIDCodec.cpp diff --git a/src/cores/paplayer/SIDCodec.h b/xbmc/cores/paplayer/SIDCodec.h similarity index 100% rename from src/cores/paplayer/SIDCodec.h rename to xbmc/cores/paplayer/SIDCodec.h diff --git a/src/cores/paplayer/SPCCodec.cpp b/xbmc/cores/paplayer/SPCCodec.cpp similarity index 100% rename from src/cores/paplayer/SPCCodec.cpp rename to xbmc/cores/paplayer/SPCCodec.cpp diff --git a/src/cores/paplayer/SPCCodec.h b/xbmc/cores/paplayer/SPCCodec.h similarity index 100% rename from src/cores/paplayer/SPCCodec.h rename to xbmc/cores/paplayer/SPCCodec.h diff --git a/src/cores/paplayer/TimidityCodec.cpp b/xbmc/cores/paplayer/TimidityCodec.cpp similarity index 100% rename from src/cores/paplayer/TimidityCodec.cpp rename to xbmc/cores/paplayer/TimidityCodec.cpp diff --git a/src/cores/paplayer/TimidityCodec.h b/xbmc/cores/paplayer/TimidityCodec.h similarity index 100% rename from src/cores/paplayer/TimidityCodec.h rename to xbmc/cores/paplayer/TimidityCodec.h diff --git a/src/cores/paplayer/VGMCodec.cpp b/xbmc/cores/paplayer/VGMCodec.cpp similarity index 100% rename from src/cores/paplayer/VGMCodec.cpp rename to xbmc/cores/paplayer/VGMCodec.cpp diff --git a/src/cores/paplayer/VGMCodec.h b/xbmc/cores/paplayer/VGMCodec.h similarity index 100% rename from src/cores/paplayer/VGMCodec.h rename to xbmc/cores/paplayer/VGMCodec.h diff --git a/src/cores/paplayer/WAVcodec.cpp b/xbmc/cores/paplayer/WAVcodec.cpp similarity index 100% rename from src/cores/paplayer/WAVcodec.cpp rename to xbmc/cores/paplayer/WAVcodec.cpp diff --git a/src/cores/paplayer/WAVcodec.h b/xbmc/cores/paplayer/WAVcodec.h similarity index 100% rename from src/cores/paplayer/WAVcodec.h rename to xbmc/cores/paplayer/WAVcodec.h diff --git a/src/cores/paplayer/YMCodec.cpp b/xbmc/cores/paplayer/YMCodec.cpp similarity index 100% rename from src/cores/paplayer/YMCodec.cpp rename to xbmc/cores/paplayer/YMCodec.cpp diff --git a/src/cores/paplayer/YMCodec.h b/xbmc/cores/paplayer/YMCodec.h similarity index 100% rename from src/cores/paplayer/YMCodec.h rename to xbmc/cores/paplayer/YMCodec.h diff --git a/src/cores/playercorefactory/Makefile.in b/xbmc/cores/playercorefactory/Makefile.in similarity index 100% rename from src/cores/playercorefactory/Makefile.in rename to xbmc/cores/playercorefactory/Makefile.in diff --git a/src/cores/playercorefactory/PlayerCoreConfig.h b/xbmc/cores/playercorefactory/PlayerCoreConfig.h similarity index 100% rename from src/cores/playercorefactory/PlayerCoreConfig.h rename to xbmc/cores/playercorefactory/PlayerCoreConfig.h diff --git a/src/cores/playercorefactory/PlayerCoreFactory.cpp b/xbmc/cores/playercorefactory/PlayerCoreFactory.cpp similarity index 100% rename from src/cores/playercorefactory/PlayerCoreFactory.cpp rename to xbmc/cores/playercorefactory/PlayerCoreFactory.cpp diff --git a/src/cores/playercorefactory/PlayerCoreFactory.h b/xbmc/cores/playercorefactory/PlayerCoreFactory.h similarity index 100% rename from src/cores/playercorefactory/PlayerCoreFactory.h rename to xbmc/cores/playercorefactory/PlayerCoreFactory.h diff --git a/src/cores/playercorefactory/PlayerSelectionRule.cpp b/xbmc/cores/playercorefactory/PlayerSelectionRule.cpp similarity index 100% rename from src/cores/playercorefactory/PlayerSelectionRule.cpp rename to xbmc/cores/playercorefactory/PlayerSelectionRule.cpp diff --git a/src/cores/playercorefactory/PlayerSelectionRule.h b/xbmc/cores/playercorefactory/PlayerSelectionRule.h similarity index 100% rename from src/cores/playercorefactory/PlayerSelectionRule.h rename to xbmc/cores/playercorefactory/PlayerSelectionRule.h diff --git a/src/dbwrappers/Database.cpp b/xbmc/dbwrappers/Database.cpp similarity index 100% rename from src/dbwrappers/Database.cpp rename to xbmc/dbwrappers/Database.cpp diff --git a/src/dbwrappers/Database.h b/xbmc/dbwrappers/Database.h similarity index 100% rename from src/dbwrappers/Database.h rename to xbmc/dbwrappers/Database.h diff --git a/src/dbwrappers/DatabaseQuery.cpp b/xbmc/dbwrappers/DatabaseQuery.cpp similarity index 100% rename from src/dbwrappers/DatabaseQuery.cpp rename to xbmc/dbwrappers/DatabaseQuery.cpp diff --git a/src/dbwrappers/DatabaseQuery.h b/xbmc/dbwrappers/DatabaseQuery.h similarity index 100% rename from src/dbwrappers/DatabaseQuery.h rename to xbmc/dbwrappers/DatabaseQuery.h diff --git a/src/dbwrappers/Makefile b/xbmc/dbwrappers/Makefile similarity index 100% rename from src/dbwrappers/Makefile rename to xbmc/dbwrappers/Makefile diff --git a/src/dbwrappers/dataset.cpp b/xbmc/dbwrappers/dataset.cpp similarity index 100% rename from src/dbwrappers/dataset.cpp rename to xbmc/dbwrappers/dataset.cpp diff --git a/src/dbwrappers/dataset.h b/xbmc/dbwrappers/dataset.h similarity index 100% rename from src/dbwrappers/dataset.h rename to xbmc/dbwrappers/dataset.h diff --git a/src/dbwrappers/mysqldataset.cpp b/xbmc/dbwrappers/mysqldataset.cpp similarity index 100% rename from src/dbwrappers/mysqldataset.cpp rename to xbmc/dbwrappers/mysqldataset.cpp diff --git a/src/dbwrappers/mysqldataset.h b/xbmc/dbwrappers/mysqldataset.h similarity index 100% rename from src/dbwrappers/mysqldataset.h rename to xbmc/dbwrappers/mysqldataset.h diff --git a/src/dbwrappers/qry_dat.cpp b/xbmc/dbwrappers/qry_dat.cpp similarity index 100% rename from src/dbwrappers/qry_dat.cpp rename to xbmc/dbwrappers/qry_dat.cpp diff --git a/src/dbwrappers/qry_dat.h b/xbmc/dbwrappers/qry_dat.h similarity index 100% rename from src/dbwrappers/qry_dat.h rename to xbmc/dbwrappers/qry_dat.h diff --git a/src/dbwrappers/sqlitedataset.cpp b/xbmc/dbwrappers/sqlitedataset.cpp similarity index 100% rename from src/dbwrappers/sqlitedataset.cpp rename to xbmc/dbwrappers/sqlitedataset.cpp diff --git a/src/dbwrappers/sqlitedataset.h b/xbmc/dbwrappers/sqlitedataset.h similarity index 100% rename from src/dbwrappers/sqlitedataset.h rename to xbmc/dbwrappers/sqlitedataset.h diff --git a/src/dialogs/GUIDialogBoxBase.cpp b/xbmc/dialogs/GUIDialogBoxBase.cpp similarity index 100% rename from src/dialogs/GUIDialogBoxBase.cpp rename to xbmc/dialogs/GUIDialogBoxBase.cpp diff --git a/src/dialogs/GUIDialogBoxBase.h b/xbmc/dialogs/GUIDialogBoxBase.h similarity index 100% rename from src/dialogs/GUIDialogBoxBase.h rename to xbmc/dialogs/GUIDialogBoxBase.h diff --git a/src/dialogs/GUIDialogBusy.cpp b/xbmc/dialogs/GUIDialogBusy.cpp similarity index 100% rename from src/dialogs/GUIDialogBusy.cpp rename to xbmc/dialogs/GUIDialogBusy.cpp diff --git a/src/dialogs/GUIDialogBusy.h b/xbmc/dialogs/GUIDialogBusy.h similarity index 100% rename from src/dialogs/GUIDialogBusy.h rename to xbmc/dialogs/GUIDialogBusy.h diff --git a/src/dialogs/GUIDialogButtonMenu.cpp b/xbmc/dialogs/GUIDialogButtonMenu.cpp similarity index 100% rename from src/dialogs/GUIDialogButtonMenu.cpp rename to xbmc/dialogs/GUIDialogButtonMenu.cpp diff --git a/src/dialogs/GUIDialogButtonMenu.h b/xbmc/dialogs/GUIDialogButtonMenu.h similarity index 100% rename from src/dialogs/GUIDialogButtonMenu.h rename to xbmc/dialogs/GUIDialogButtonMenu.h diff --git a/src/dialogs/GUIDialogCache.cpp b/xbmc/dialogs/GUIDialogCache.cpp similarity index 100% rename from src/dialogs/GUIDialogCache.cpp rename to xbmc/dialogs/GUIDialogCache.cpp diff --git a/src/dialogs/GUIDialogCache.h b/xbmc/dialogs/GUIDialogCache.h similarity index 100% rename from src/dialogs/GUIDialogCache.h rename to xbmc/dialogs/GUIDialogCache.h diff --git a/src/dialogs/GUIDialogContextMenu.cpp b/xbmc/dialogs/GUIDialogContextMenu.cpp similarity index 100% rename from src/dialogs/GUIDialogContextMenu.cpp rename to xbmc/dialogs/GUIDialogContextMenu.cpp diff --git a/src/dialogs/GUIDialogContextMenu.h b/xbmc/dialogs/GUIDialogContextMenu.h similarity index 100% rename from src/dialogs/GUIDialogContextMenu.h rename to xbmc/dialogs/GUIDialogContextMenu.h diff --git a/src/dialogs/GUIDialogExtendedProgressBar.cpp b/xbmc/dialogs/GUIDialogExtendedProgressBar.cpp similarity index 100% rename from src/dialogs/GUIDialogExtendedProgressBar.cpp rename to xbmc/dialogs/GUIDialogExtendedProgressBar.cpp diff --git a/src/dialogs/GUIDialogExtendedProgressBar.h b/xbmc/dialogs/GUIDialogExtendedProgressBar.h similarity index 100% rename from src/dialogs/GUIDialogExtendedProgressBar.h rename to xbmc/dialogs/GUIDialogExtendedProgressBar.h diff --git a/src/dialogs/GUIDialogFavourites.cpp b/xbmc/dialogs/GUIDialogFavourites.cpp similarity index 100% rename from src/dialogs/GUIDialogFavourites.cpp rename to xbmc/dialogs/GUIDialogFavourites.cpp diff --git a/src/dialogs/GUIDialogFavourites.h b/xbmc/dialogs/GUIDialogFavourites.h similarity index 100% rename from src/dialogs/GUIDialogFavourites.h rename to xbmc/dialogs/GUIDialogFavourites.h diff --git a/src/dialogs/GUIDialogFileBrowser.cpp b/xbmc/dialogs/GUIDialogFileBrowser.cpp similarity index 100% rename from src/dialogs/GUIDialogFileBrowser.cpp rename to xbmc/dialogs/GUIDialogFileBrowser.cpp diff --git a/src/dialogs/GUIDialogFileBrowser.h b/xbmc/dialogs/GUIDialogFileBrowser.h similarity index 100% rename from src/dialogs/GUIDialogFileBrowser.h rename to xbmc/dialogs/GUIDialogFileBrowser.h diff --git a/src/dialogs/GUIDialogGamepad.cpp b/xbmc/dialogs/GUIDialogGamepad.cpp similarity index 100% rename from src/dialogs/GUIDialogGamepad.cpp rename to xbmc/dialogs/GUIDialogGamepad.cpp diff --git a/src/dialogs/GUIDialogGamepad.h b/xbmc/dialogs/GUIDialogGamepad.h similarity index 100% rename from src/dialogs/GUIDialogGamepad.h rename to xbmc/dialogs/GUIDialogGamepad.h diff --git a/src/dialogs/GUIDialogKaiToast.cpp b/xbmc/dialogs/GUIDialogKaiToast.cpp similarity index 100% rename from src/dialogs/GUIDialogKaiToast.cpp rename to xbmc/dialogs/GUIDialogKaiToast.cpp diff --git a/src/dialogs/GUIDialogKaiToast.h b/xbmc/dialogs/GUIDialogKaiToast.h similarity index 100% rename from src/dialogs/GUIDialogKaiToast.h rename to xbmc/dialogs/GUIDialogKaiToast.h diff --git a/src/dialogs/GUIDialogKeyboardGeneric.cpp b/xbmc/dialogs/GUIDialogKeyboardGeneric.cpp similarity index 100% rename from src/dialogs/GUIDialogKeyboardGeneric.cpp rename to xbmc/dialogs/GUIDialogKeyboardGeneric.cpp diff --git a/src/dialogs/GUIDialogKeyboardGeneric.h b/xbmc/dialogs/GUIDialogKeyboardGeneric.h similarity index 100% rename from src/dialogs/GUIDialogKeyboardGeneric.h rename to xbmc/dialogs/GUIDialogKeyboardGeneric.h diff --git a/src/dialogs/GUIDialogMediaFilter.cpp b/xbmc/dialogs/GUIDialogMediaFilter.cpp similarity index 100% rename from src/dialogs/GUIDialogMediaFilter.cpp rename to xbmc/dialogs/GUIDialogMediaFilter.cpp diff --git a/src/dialogs/GUIDialogMediaFilter.h b/xbmc/dialogs/GUIDialogMediaFilter.h similarity index 100% rename from src/dialogs/GUIDialogMediaFilter.h rename to xbmc/dialogs/GUIDialogMediaFilter.h diff --git a/src/dialogs/GUIDialogMediaSource.cpp b/xbmc/dialogs/GUIDialogMediaSource.cpp similarity index 100% rename from src/dialogs/GUIDialogMediaSource.cpp rename to xbmc/dialogs/GUIDialogMediaSource.cpp diff --git a/src/dialogs/GUIDialogMediaSource.h b/xbmc/dialogs/GUIDialogMediaSource.h similarity index 100% rename from src/dialogs/GUIDialogMediaSource.h rename to xbmc/dialogs/GUIDialogMediaSource.h diff --git a/src/dialogs/GUIDialogMuteBug.cpp b/xbmc/dialogs/GUIDialogMuteBug.cpp similarity index 100% rename from src/dialogs/GUIDialogMuteBug.cpp rename to xbmc/dialogs/GUIDialogMuteBug.cpp diff --git a/src/dialogs/GUIDialogMuteBug.h b/xbmc/dialogs/GUIDialogMuteBug.h similarity index 100% rename from src/dialogs/GUIDialogMuteBug.h rename to xbmc/dialogs/GUIDialogMuteBug.h diff --git a/src/dialogs/GUIDialogNumeric.cpp b/xbmc/dialogs/GUIDialogNumeric.cpp similarity index 100% rename from src/dialogs/GUIDialogNumeric.cpp rename to xbmc/dialogs/GUIDialogNumeric.cpp diff --git a/src/dialogs/GUIDialogNumeric.h b/xbmc/dialogs/GUIDialogNumeric.h similarity index 100% rename from src/dialogs/GUIDialogNumeric.h rename to xbmc/dialogs/GUIDialogNumeric.h diff --git a/src/dialogs/GUIDialogOK.cpp b/xbmc/dialogs/GUIDialogOK.cpp similarity index 100% rename from src/dialogs/GUIDialogOK.cpp rename to xbmc/dialogs/GUIDialogOK.cpp diff --git a/src/dialogs/GUIDialogOK.h b/xbmc/dialogs/GUIDialogOK.h similarity index 100% rename from src/dialogs/GUIDialogOK.h rename to xbmc/dialogs/GUIDialogOK.h diff --git a/src/dialogs/GUIDialogPlayEject.cpp b/xbmc/dialogs/GUIDialogPlayEject.cpp similarity index 100% rename from src/dialogs/GUIDialogPlayEject.cpp rename to xbmc/dialogs/GUIDialogPlayEject.cpp diff --git a/src/dialogs/GUIDialogPlayEject.h b/xbmc/dialogs/GUIDialogPlayEject.h similarity index 100% rename from src/dialogs/GUIDialogPlayEject.h rename to xbmc/dialogs/GUIDialogPlayEject.h diff --git a/src/dialogs/GUIDialogPlayerControls.cpp b/xbmc/dialogs/GUIDialogPlayerControls.cpp similarity index 100% rename from src/dialogs/GUIDialogPlayerControls.cpp rename to xbmc/dialogs/GUIDialogPlayerControls.cpp diff --git a/src/dialogs/GUIDialogPlayerControls.h b/xbmc/dialogs/GUIDialogPlayerControls.h similarity index 100% rename from src/dialogs/GUIDialogPlayerControls.h rename to xbmc/dialogs/GUIDialogPlayerControls.h diff --git a/src/dialogs/GUIDialogProgress.cpp b/xbmc/dialogs/GUIDialogProgress.cpp similarity index 100% rename from src/dialogs/GUIDialogProgress.cpp rename to xbmc/dialogs/GUIDialogProgress.cpp diff --git a/src/dialogs/GUIDialogProgress.h b/xbmc/dialogs/GUIDialogProgress.h similarity index 100% rename from src/dialogs/GUIDialogProgress.h rename to xbmc/dialogs/GUIDialogProgress.h diff --git a/src/dialogs/GUIDialogSeekBar.cpp b/xbmc/dialogs/GUIDialogSeekBar.cpp similarity index 100% rename from src/dialogs/GUIDialogSeekBar.cpp rename to xbmc/dialogs/GUIDialogSeekBar.cpp diff --git a/src/dialogs/GUIDialogSeekBar.h b/xbmc/dialogs/GUIDialogSeekBar.h similarity index 100% rename from src/dialogs/GUIDialogSeekBar.h rename to xbmc/dialogs/GUIDialogSeekBar.h diff --git a/src/dialogs/GUIDialogSelect.cpp b/xbmc/dialogs/GUIDialogSelect.cpp similarity index 100% rename from src/dialogs/GUIDialogSelect.cpp rename to xbmc/dialogs/GUIDialogSelect.cpp diff --git a/src/dialogs/GUIDialogSelect.h b/xbmc/dialogs/GUIDialogSelect.h similarity index 100% rename from src/dialogs/GUIDialogSelect.h rename to xbmc/dialogs/GUIDialogSelect.h diff --git a/src/dialogs/GUIDialogSlider.cpp b/xbmc/dialogs/GUIDialogSlider.cpp similarity index 100% rename from src/dialogs/GUIDialogSlider.cpp rename to xbmc/dialogs/GUIDialogSlider.cpp diff --git a/src/dialogs/GUIDialogSlider.h b/xbmc/dialogs/GUIDialogSlider.h similarity index 100% rename from src/dialogs/GUIDialogSlider.h rename to xbmc/dialogs/GUIDialogSlider.h diff --git a/src/dialogs/GUIDialogSmartPlaylistEditor.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp similarity index 100% rename from src/dialogs/GUIDialogSmartPlaylistEditor.cpp rename to xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp diff --git a/src/dialogs/GUIDialogSmartPlaylistEditor.h b/xbmc/dialogs/GUIDialogSmartPlaylistEditor.h similarity index 100% rename from src/dialogs/GUIDialogSmartPlaylistEditor.h rename to xbmc/dialogs/GUIDialogSmartPlaylistEditor.h diff --git a/src/dialogs/GUIDialogSmartPlaylistRule.cpp b/xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp similarity index 100% rename from src/dialogs/GUIDialogSmartPlaylistRule.cpp rename to xbmc/dialogs/GUIDialogSmartPlaylistRule.cpp diff --git a/src/dialogs/GUIDialogSmartPlaylistRule.h b/xbmc/dialogs/GUIDialogSmartPlaylistRule.h similarity index 100% rename from src/dialogs/GUIDialogSmartPlaylistRule.h rename to xbmc/dialogs/GUIDialogSmartPlaylistRule.h diff --git a/src/dialogs/GUIDialogSubMenu.cpp b/xbmc/dialogs/GUIDialogSubMenu.cpp similarity index 100% rename from src/dialogs/GUIDialogSubMenu.cpp rename to xbmc/dialogs/GUIDialogSubMenu.cpp diff --git a/src/dialogs/GUIDialogSubMenu.h b/xbmc/dialogs/GUIDialogSubMenu.h similarity index 100% rename from src/dialogs/GUIDialogSubMenu.h rename to xbmc/dialogs/GUIDialogSubMenu.h diff --git a/src/dialogs/GUIDialogTextViewer.cpp b/xbmc/dialogs/GUIDialogTextViewer.cpp similarity index 100% rename from src/dialogs/GUIDialogTextViewer.cpp rename to xbmc/dialogs/GUIDialogTextViewer.cpp diff --git a/src/dialogs/GUIDialogTextViewer.h b/xbmc/dialogs/GUIDialogTextViewer.h similarity index 100% rename from src/dialogs/GUIDialogTextViewer.h rename to xbmc/dialogs/GUIDialogTextViewer.h diff --git a/src/dialogs/GUIDialogVolumeBar.cpp b/xbmc/dialogs/GUIDialogVolumeBar.cpp similarity index 100% rename from src/dialogs/GUIDialogVolumeBar.cpp rename to xbmc/dialogs/GUIDialogVolumeBar.cpp diff --git a/src/dialogs/GUIDialogVolumeBar.h b/xbmc/dialogs/GUIDialogVolumeBar.h similarity index 100% rename from src/dialogs/GUIDialogVolumeBar.h rename to xbmc/dialogs/GUIDialogVolumeBar.h diff --git a/src/dialogs/GUIDialogYesNo.cpp b/xbmc/dialogs/GUIDialogYesNo.cpp similarity index 100% rename from src/dialogs/GUIDialogYesNo.cpp rename to xbmc/dialogs/GUIDialogYesNo.cpp diff --git a/src/dialogs/GUIDialogYesNo.h b/xbmc/dialogs/GUIDialogYesNo.h similarity index 100% rename from src/dialogs/GUIDialogYesNo.h rename to xbmc/dialogs/GUIDialogYesNo.h diff --git a/src/dialogs/Makefile b/xbmc/dialogs/Makefile similarity index 100% rename from src/dialogs/Makefile rename to xbmc/dialogs/Makefile diff --git a/src/epg/Epg.cpp b/xbmc/epg/Epg.cpp similarity index 100% rename from src/epg/Epg.cpp rename to xbmc/epg/Epg.cpp diff --git a/src/epg/Epg.h b/xbmc/epg/Epg.h similarity index 100% rename from src/epg/Epg.h rename to xbmc/epg/Epg.h diff --git a/src/epg/EpgContainer.cpp b/xbmc/epg/EpgContainer.cpp similarity index 100% rename from src/epg/EpgContainer.cpp rename to xbmc/epg/EpgContainer.cpp diff --git a/src/epg/EpgContainer.h b/xbmc/epg/EpgContainer.h similarity index 100% rename from src/epg/EpgContainer.h rename to xbmc/epg/EpgContainer.h diff --git a/src/epg/EpgDatabase.cpp b/xbmc/epg/EpgDatabase.cpp similarity index 100% rename from src/epg/EpgDatabase.cpp rename to xbmc/epg/EpgDatabase.cpp diff --git a/src/epg/EpgDatabase.h b/xbmc/epg/EpgDatabase.h similarity index 100% rename from src/epg/EpgDatabase.h rename to xbmc/epg/EpgDatabase.h diff --git a/src/epg/EpgInfoTag.cpp b/xbmc/epg/EpgInfoTag.cpp similarity index 100% rename from src/epg/EpgInfoTag.cpp rename to xbmc/epg/EpgInfoTag.cpp diff --git a/src/epg/EpgInfoTag.h b/xbmc/epg/EpgInfoTag.h similarity index 100% rename from src/epg/EpgInfoTag.h rename to xbmc/epg/EpgInfoTag.h diff --git a/src/epg/EpgSearchFilter.cpp b/xbmc/epg/EpgSearchFilter.cpp similarity index 100% rename from src/epg/EpgSearchFilter.cpp rename to xbmc/epg/EpgSearchFilter.cpp diff --git a/src/epg/EpgSearchFilter.h b/xbmc/epg/EpgSearchFilter.h similarity index 100% rename from src/epg/EpgSearchFilter.h rename to xbmc/epg/EpgSearchFilter.h diff --git a/src/epg/GUIEPGGridContainer.cpp b/xbmc/epg/GUIEPGGridContainer.cpp similarity index 100% rename from src/epg/GUIEPGGridContainer.cpp rename to xbmc/epg/GUIEPGGridContainer.cpp diff --git a/src/epg/GUIEPGGridContainer.h b/xbmc/epg/GUIEPGGridContainer.h similarity index 100% rename from src/epg/GUIEPGGridContainer.h rename to xbmc/epg/GUIEPGGridContainer.h diff --git a/src/epg/Makefile b/xbmc/epg/Makefile similarity index 100% rename from src/epg/Makefile rename to xbmc/epg/Makefile diff --git a/src/filesystem/AFPDirectory.cpp b/xbmc/filesystem/AFPDirectory.cpp similarity index 100% rename from src/filesystem/AFPDirectory.cpp rename to xbmc/filesystem/AFPDirectory.cpp diff --git a/src/filesystem/AFPDirectory.h b/xbmc/filesystem/AFPDirectory.h similarity index 100% rename from src/filesystem/AFPDirectory.h rename to xbmc/filesystem/AFPDirectory.h diff --git a/src/filesystem/AFPFile.cpp b/xbmc/filesystem/AFPFile.cpp similarity index 100% rename from src/filesystem/AFPFile.cpp rename to xbmc/filesystem/AFPFile.cpp diff --git a/src/filesystem/AFPFile.h b/xbmc/filesystem/AFPFile.h similarity index 100% rename from src/filesystem/AFPFile.h rename to xbmc/filesystem/AFPFile.h diff --git a/src/filesystem/APKDirectory.cpp b/xbmc/filesystem/APKDirectory.cpp similarity index 100% rename from src/filesystem/APKDirectory.cpp rename to xbmc/filesystem/APKDirectory.cpp diff --git a/src/filesystem/APKDirectory.h b/xbmc/filesystem/APKDirectory.h similarity index 100% rename from src/filesystem/APKDirectory.h rename to xbmc/filesystem/APKDirectory.h diff --git a/src/filesystem/APKFile.cpp b/xbmc/filesystem/APKFile.cpp similarity index 100% rename from src/filesystem/APKFile.cpp rename to xbmc/filesystem/APKFile.cpp diff --git a/src/filesystem/APKFile.h b/xbmc/filesystem/APKFile.h similarity index 100% rename from src/filesystem/APKFile.h rename to xbmc/filesystem/APKFile.h diff --git a/src/filesystem/ASAPFileDirectory.cpp b/xbmc/filesystem/ASAPFileDirectory.cpp similarity index 100% rename from src/filesystem/ASAPFileDirectory.cpp rename to xbmc/filesystem/ASAPFileDirectory.cpp diff --git a/src/filesystem/ASAPFileDirectory.h b/xbmc/filesystem/ASAPFileDirectory.h similarity index 100% rename from src/filesystem/ASAPFileDirectory.h rename to xbmc/filesystem/ASAPFileDirectory.h diff --git a/src/filesystem/AddonsDirectory.cpp b/xbmc/filesystem/AddonsDirectory.cpp similarity index 100% rename from src/filesystem/AddonsDirectory.cpp rename to xbmc/filesystem/AddonsDirectory.cpp diff --git a/src/filesystem/AddonsDirectory.h b/xbmc/filesystem/AddonsDirectory.h similarity index 100% rename from src/filesystem/AddonsDirectory.h rename to xbmc/filesystem/AddonsDirectory.h diff --git a/src/filesystem/AndroidAppDirectory.cpp b/xbmc/filesystem/AndroidAppDirectory.cpp similarity index 100% rename from src/filesystem/AndroidAppDirectory.cpp rename to xbmc/filesystem/AndroidAppDirectory.cpp diff --git a/src/filesystem/AndroidAppDirectory.h b/xbmc/filesystem/AndroidAppDirectory.h similarity index 100% rename from src/filesystem/AndroidAppDirectory.h rename to xbmc/filesystem/AndroidAppDirectory.h diff --git a/src/filesystem/AndroidAppFile.cpp b/xbmc/filesystem/AndroidAppFile.cpp similarity index 100% rename from src/filesystem/AndroidAppFile.cpp rename to xbmc/filesystem/AndroidAppFile.cpp diff --git a/src/filesystem/AndroidAppFile.h b/xbmc/filesystem/AndroidAppFile.h similarity index 100% rename from src/filesystem/AndroidAppFile.h rename to xbmc/filesystem/AndroidAppFile.h diff --git a/src/filesystem/BlurayDirectory.cpp b/xbmc/filesystem/BlurayDirectory.cpp similarity index 100% rename from src/filesystem/BlurayDirectory.cpp rename to xbmc/filesystem/BlurayDirectory.cpp diff --git a/src/filesystem/BlurayDirectory.h b/xbmc/filesystem/BlurayDirectory.h similarity index 100% rename from src/filesystem/BlurayDirectory.h rename to xbmc/filesystem/BlurayDirectory.h diff --git a/src/filesystem/BlurayFile.cpp b/xbmc/filesystem/BlurayFile.cpp similarity index 100% rename from src/filesystem/BlurayFile.cpp rename to xbmc/filesystem/BlurayFile.cpp diff --git a/src/filesystem/BlurayFile.h b/xbmc/filesystem/BlurayFile.h similarity index 100% rename from src/filesystem/BlurayFile.h rename to xbmc/filesystem/BlurayFile.h diff --git a/src/filesystem/CDDADirectory.cpp b/xbmc/filesystem/CDDADirectory.cpp similarity index 100% rename from src/filesystem/CDDADirectory.cpp rename to xbmc/filesystem/CDDADirectory.cpp diff --git a/src/filesystem/CDDADirectory.h b/xbmc/filesystem/CDDADirectory.h similarity index 100% rename from src/filesystem/CDDADirectory.h rename to xbmc/filesystem/CDDADirectory.h diff --git a/src/filesystem/CDDAFile.cpp b/xbmc/filesystem/CDDAFile.cpp similarity index 100% rename from src/filesystem/CDDAFile.cpp rename to xbmc/filesystem/CDDAFile.cpp diff --git a/src/filesystem/CDDAFile.h b/xbmc/filesystem/CDDAFile.h similarity index 100% rename from src/filesystem/CDDAFile.h rename to xbmc/filesystem/CDDAFile.h diff --git a/src/filesystem/CacheStrategy.cpp b/xbmc/filesystem/CacheStrategy.cpp similarity index 100% rename from src/filesystem/CacheStrategy.cpp rename to xbmc/filesystem/CacheStrategy.cpp diff --git a/src/filesystem/CacheStrategy.h b/xbmc/filesystem/CacheStrategy.h similarity index 100% rename from src/filesystem/CacheStrategy.h rename to xbmc/filesystem/CacheStrategy.h diff --git a/src/filesystem/CircularCache.cpp b/xbmc/filesystem/CircularCache.cpp similarity index 100% rename from src/filesystem/CircularCache.cpp rename to xbmc/filesystem/CircularCache.cpp diff --git a/src/filesystem/CircularCache.h b/xbmc/filesystem/CircularCache.h similarity index 100% rename from src/filesystem/CircularCache.h rename to xbmc/filesystem/CircularCache.h diff --git a/src/filesystem/CurlFile.cpp b/xbmc/filesystem/CurlFile.cpp similarity index 100% rename from src/filesystem/CurlFile.cpp rename to xbmc/filesystem/CurlFile.cpp diff --git a/src/filesystem/CurlFile.h b/xbmc/filesystem/CurlFile.h similarity index 100% rename from src/filesystem/CurlFile.h rename to xbmc/filesystem/CurlFile.h diff --git a/src/filesystem/DAAPDirectory.cpp b/xbmc/filesystem/DAAPDirectory.cpp similarity index 100% rename from src/filesystem/DAAPDirectory.cpp rename to xbmc/filesystem/DAAPDirectory.cpp diff --git a/src/filesystem/DAAPDirectory.h b/xbmc/filesystem/DAAPDirectory.h similarity index 100% rename from src/filesystem/DAAPDirectory.h rename to xbmc/filesystem/DAAPDirectory.h diff --git a/src/filesystem/DAAPFile.cpp b/xbmc/filesystem/DAAPFile.cpp similarity index 100% rename from src/filesystem/DAAPFile.cpp rename to xbmc/filesystem/DAAPFile.cpp diff --git a/src/filesystem/DAAPFile.h b/xbmc/filesystem/DAAPFile.h similarity index 100% rename from src/filesystem/DAAPFile.h rename to xbmc/filesystem/DAAPFile.h diff --git a/src/filesystem/DAVCommon.cpp b/xbmc/filesystem/DAVCommon.cpp similarity index 100% rename from src/filesystem/DAVCommon.cpp rename to xbmc/filesystem/DAVCommon.cpp diff --git a/src/filesystem/DAVCommon.h b/xbmc/filesystem/DAVCommon.h similarity index 100% rename from src/filesystem/DAVCommon.h rename to xbmc/filesystem/DAVCommon.h diff --git a/src/filesystem/DAVDirectory.cpp b/xbmc/filesystem/DAVDirectory.cpp similarity index 100% rename from src/filesystem/DAVDirectory.cpp rename to xbmc/filesystem/DAVDirectory.cpp diff --git a/src/filesystem/DAVDirectory.h b/xbmc/filesystem/DAVDirectory.h similarity index 100% rename from src/filesystem/DAVDirectory.h rename to xbmc/filesystem/DAVDirectory.h diff --git a/src/filesystem/DAVFile.cpp b/xbmc/filesystem/DAVFile.cpp similarity index 100% rename from src/filesystem/DAVFile.cpp rename to xbmc/filesystem/DAVFile.cpp diff --git a/src/filesystem/DAVFile.h b/xbmc/filesystem/DAVFile.h similarity index 100% rename from src/filesystem/DAVFile.h rename to xbmc/filesystem/DAVFile.h diff --git a/src/filesystem/Directory.cpp b/xbmc/filesystem/Directory.cpp similarity index 100% rename from src/filesystem/Directory.cpp rename to xbmc/filesystem/Directory.cpp diff --git a/src/filesystem/Directory.h b/xbmc/filesystem/Directory.h similarity index 100% rename from src/filesystem/Directory.h rename to xbmc/filesystem/Directory.h diff --git a/src/filesystem/DirectoryCache.cpp b/xbmc/filesystem/DirectoryCache.cpp similarity index 100% rename from src/filesystem/DirectoryCache.cpp rename to xbmc/filesystem/DirectoryCache.cpp diff --git a/src/filesystem/DirectoryCache.h b/xbmc/filesystem/DirectoryCache.h similarity index 100% rename from src/filesystem/DirectoryCache.h rename to xbmc/filesystem/DirectoryCache.h diff --git a/src/filesystem/DirectoryFactory.cpp b/xbmc/filesystem/DirectoryFactory.cpp similarity index 100% rename from src/filesystem/DirectoryFactory.cpp rename to xbmc/filesystem/DirectoryFactory.cpp diff --git a/src/filesystem/DirectoryFactory.h b/xbmc/filesystem/DirectoryFactory.h similarity index 100% rename from src/filesystem/DirectoryFactory.h rename to xbmc/filesystem/DirectoryFactory.h diff --git a/src/filesystem/DirectoryHistory.cpp b/xbmc/filesystem/DirectoryHistory.cpp similarity index 100% rename from src/filesystem/DirectoryHistory.cpp rename to xbmc/filesystem/DirectoryHistory.cpp diff --git a/src/filesystem/DirectoryHistory.h b/xbmc/filesystem/DirectoryHistory.h similarity index 100% rename from src/filesystem/DirectoryHistory.h rename to xbmc/filesystem/DirectoryHistory.h diff --git a/src/filesystem/DllHDHomeRun.h b/xbmc/filesystem/DllHDHomeRun.h similarity index 100% rename from src/filesystem/DllHDHomeRun.h rename to xbmc/filesystem/DllHDHomeRun.h diff --git a/src/filesystem/DllLibAfp.h b/xbmc/filesystem/DllLibAfp.h similarity index 100% rename from src/filesystem/DllLibAfp.h rename to xbmc/filesystem/DllLibAfp.h diff --git a/src/filesystem/DllLibCMyth.h b/xbmc/filesystem/DllLibCMyth.h similarity index 100% rename from src/filesystem/DllLibCMyth.h rename to xbmc/filesystem/DllLibCMyth.h diff --git a/src/filesystem/DllLibCurl.cpp b/xbmc/filesystem/DllLibCurl.cpp similarity index 100% rename from src/filesystem/DllLibCurl.cpp rename to xbmc/filesystem/DllLibCurl.cpp diff --git a/src/filesystem/DllLibCurl.h b/xbmc/filesystem/DllLibCurl.h similarity index 100% rename from src/filesystem/DllLibCurl.h rename to xbmc/filesystem/DllLibCurl.h diff --git a/src/filesystem/DllLibNfs.h b/xbmc/filesystem/DllLibNfs.h similarity index 100% rename from src/filesystem/DllLibNfs.h rename to xbmc/filesystem/DllLibNfs.h diff --git a/src/filesystem/FTPDirectory.cpp b/xbmc/filesystem/FTPDirectory.cpp similarity index 100% rename from src/filesystem/FTPDirectory.cpp rename to xbmc/filesystem/FTPDirectory.cpp diff --git a/src/filesystem/FTPDirectory.h b/xbmc/filesystem/FTPDirectory.h similarity index 100% rename from src/filesystem/FTPDirectory.h rename to xbmc/filesystem/FTPDirectory.h diff --git a/src/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp similarity index 100% rename from src/filesystem/FTPParse.cpp rename to xbmc/filesystem/FTPParse.cpp diff --git a/src/filesystem/FTPParse.h b/xbmc/filesystem/FTPParse.h similarity index 100% rename from src/filesystem/FTPParse.h rename to xbmc/filesystem/FTPParse.h diff --git a/src/filesystem/FavouritesDirectory.cpp b/xbmc/filesystem/FavouritesDirectory.cpp similarity index 100% rename from src/filesystem/FavouritesDirectory.cpp rename to xbmc/filesystem/FavouritesDirectory.cpp diff --git a/src/filesystem/FavouritesDirectory.h b/xbmc/filesystem/FavouritesDirectory.h similarity index 100% rename from src/filesystem/FavouritesDirectory.h rename to xbmc/filesystem/FavouritesDirectory.h diff --git a/src/filesystem/File.cpp b/xbmc/filesystem/File.cpp similarity index 100% rename from src/filesystem/File.cpp rename to xbmc/filesystem/File.cpp diff --git a/src/filesystem/File.h b/xbmc/filesystem/File.h similarity index 100% rename from src/filesystem/File.h rename to xbmc/filesystem/File.h diff --git a/src/filesystem/FileCache.cpp b/xbmc/filesystem/FileCache.cpp similarity index 100% rename from src/filesystem/FileCache.cpp rename to xbmc/filesystem/FileCache.cpp diff --git a/src/filesystem/FileCache.h b/xbmc/filesystem/FileCache.h similarity index 100% rename from src/filesystem/FileCache.h rename to xbmc/filesystem/FileCache.h diff --git a/src/filesystem/FileDirectoryFactory.cpp b/xbmc/filesystem/FileDirectoryFactory.cpp similarity index 100% rename from src/filesystem/FileDirectoryFactory.cpp rename to xbmc/filesystem/FileDirectoryFactory.cpp diff --git a/src/filesystem/FileDirectoryFactory.h b/xbmc/filesystem/FileDirectoryFactory.h similarity index 100% rename from src/filesystem/FileDirectoryFactory.h rename to xbmc/filesystem/FileDirectoryFactory.h diff --git a/src/filesystem/FileFactory.cpp b/xbmc/filesystem/FileFactory.cpp similarity index 100% rename from src/filesystem/FileFactory.cpp rename to xbmc/filesystem/FileFactory.cpp diff --git a/src/filesystem/FileFactory.h b/xbmc/filesystem/FileFactory.h similarity index 100% rename from src/filesystem/FileFactory.h rename to xbmc/filesystem/FileFactory.h diff --git a/src/filesystem/FileReaderFile.cpp b/xbmc/filesystem/FileReaderFile.cpp similarity index 100% rename from src/filesystem/FileReaderFile.cpp rename to xbmc/filesystem/FileReaderFile.cpp diff --git a/src/filesystem/FileReaderFile.h b/xbmc/filesystem/FileReaderFile.h similarity index 100% rename from src/filesystem/FileReaderFile.h rename to xbmc/filesystem/FileReaderFile.h diff --git a/src/filesystem/HDHomeRunDirectory.cpp b/xbmc/filesystem/HDHomeRunDirectory.cpp similarity index 100% rename from src/filesystem/HDHomeRunDirectory.cpp rename to xbmc/filesystem/HDHomeRunDirectory.cpp diff --git a/src/filesystem/HDHomeRunDirectory.h b/xbmc/filesystem/HDHomeRunDirectory.h similarity index 100% rename from src/filesystem/HDHomeRunDirectory.h rename to xbmc/filesystem/HDHomeRunDirectory.h diff --git a/src/filesystem/HDHomeRunFile.cpp b/xbmc/filesystem/HDHomeRunFile.cpp similarity index 100% rename from src/filesystem/HDHomeRunFile.cpp rename to xbmc/filesystem/HDHomeRunFile.cpp diff --git a/src/filesystem/HDHomeRunFile.h b/xbmc/filesystem/HDHomeRunFile.h similarity index 100% rename from src/filesystem/HDHomeRunFile.h rename to xbmc/filesystem/HDHomeRunFile.h diff --git a/src/filesystem/HTSPDirectory.cpp b/xbmc/filesystem/HTSPDirectory.cpp similarity index 100% rename from src/filesystem/HTSPDirectory.cpp rename to xbmc/filesystem/HTSPDirectory.cpp diff --git a/src/filesystem/HTSPDirectory.h b/xbmc/filesystem/HTSPDirectory.h similarity index 100% rename from src/filesystem/HTSPDirectory.h rename to xbmc/filesystem/HTSPDirectory.h diff --git a/src/filesystem/HTSPSession.cpp b/xbmc/filesystem/HTSPSession.cpp similarity index 100% rename from src/filesystem/HTSPSession.cpp rename to xbmc/filesystem/HTSPSession.cpp diff --git a/src/filesystem/HTSPSession.h b/xbmc/filesystem/HTSPSession.h similarity index 100% rename from src/filesystem/HTSPSession.h rename to xbmc/filesystem/HTSPSession.h diff --git a/src/filesystem/HTTPDirectory.cpp b/xbmc/filesystem/HTTPDirectory.cpp similarity index 100% rename from src/filesystem/HTTPDirectory.cpp rename to xbmc/filesystem/HTTPDirectory.cpp diff --git a/src/filesystem/HTTPDirectory.h b/xbmc/filesystem/HTTPDirectory.h similarity index 100% rename from src/filesystem/HTTPDirectory.h rename to xbmc/filesystem/HTTPDirectory.h diff --git a/src/filesystem/HTTPFile.cpp b/xbmc/filesystem/HTTPFile.cpp similarity index 100% rename from src/filesystem/HTTPFile.cpp rename to xbmc/filesystem/HTTPFile.cpp diff --git a/src/filesystem/HTTPFile.h b/xbmc/filesystem/HTTPFile.h similarity index 100% rename from src/filesystem/HTTPFile.h rename to xbmc/filesystem/HTTPFile.h diff --git a/src/filesystem/IDirectory.cpp b/xbmc/filesystem/IDirectory.cpp similarity index 100% rename from src/filesystem/IDirectory.cpp rename to xbmc/filesystem/IDirectory.cpp diff --git a/src/filesystem/IDirectory.h b/xbmc/filesystem/IDirectory.h similarity index 100% rename from src/filesystem/IDirectory.h rename to xbmc/filesystem/IDirectory.h diff --git a/src/filesystem/IFile.cpp b/xbmc/filesystem/IFile.cpp similarity index 100% rename from src/filesystem/IFile.cpp rename to xbmc/filesystem/IFile.cpp diff --git a/src/filesystem/IFile.h b/xbmc/filesystem/IFile.h similarity index 100% rename from src/filesystem/IFile.h rename to xbmc/filesystem/IFile.h diff --git a/src/filesystem/IFileDirectory.h b/xbmc/filesystem/IFileDirectory.h similarity index 100% rename from src/filesystem/IFileDirectory.h rename to xbmc/filesystem/IFileDirectory.h diff --git a/src/filesystem/IFileTypes.h b/xbmc/filesystem/IFileTypes.h similarity index 100% rename from src/filesystem/IFileTypes.h rename to xbmc/filesystem/IFileTypes.h diff --git a/src/filesystem/ILiveTV.h b/xbmc/filesystem/ILiveTV.h similarity index 100% rename from src/filesystem/ILiveTV.h rename to xbmc/filesystem/ILiveTV.h diff --git a/src/filesystem/ISO9660Directory.cpp b/xbmc/filesystem/ISO9660Directory.cpp similarity index 100% rename from src/filesystem/ISO9660Directory.cpp rename to xbmc/filesystem/ISO9660Directory.cpp diff --git a/src/filesystem/ISO9660Directory.h b/xbmc/filesystem/ISO9660Directory.h similarity index 100% rename from src/filesystem/ISO9660Directory.h rename to xbmc/filesystem/ISO9660Directory.h diff --git a/src/filesystem/ISOFile.cpp b/xbmc/filesystem/ISOFile.cpp similarity index 100% rename from src/filesystem/ISOFile.cpp rename to xbmc/filesystem/ISOFile.cpp diff --git a/src/filesystem/ISOFile.h b/xbmc/filesystem/ISOFile.h similarity index 100% rename from src/filesystem/ISOFile.h rename to xbmc/filesystem/ISOFile.h diff --git a/src/filesystem/ImageFile.cpp b/xbmc/filesystem/ImageFile.cpp similarity index 100% rename from src/filesystem/ImageFile.cpp rename to xbmc/filesystem/ImageFile.cpp diff --git a/src/filesystem/ImageFile.h b/xbmc/filesystem/ImageFile.h similarity index 100% rename from src/filesystem/ImageFile.h rename to xbmc/filesystem/ImageFile.h diff --git a/src/filesystem/LibraryDirectory.cpp b/xbmc/filesystem/LibraryDirectory.cpp similarity index 100% rename from src/filesystem/LibraryDirectory.cpp rename to xbmc/filesystem/LibraryDirectory.cpp diff --git a/src/filesystem/LibraryDirectory.h b/xbmc/filesystem/LibraryDirectory.h similarity index 100% rename from src/filesystem/LibraryDirectory.h rename to xbmc/filesystem/LibraryDirectory.h diff --git a/src/filesystem/Makefile.in b/xbmc/filesystem/Makefile.in similarity index 100% rename from src/filesystem/Makefile.in rename to xbmc/filesystem/Makefile.in diff --git a/src/filesystem/MemBufferCache.cpp b/xbmc/filesystem/MemBufferCache.cpp similarity index 100% rename from src/filesystem/MemBufferCache.cpp rename to xbmc/filesystem/MemBufferCache.cpp diff --git a/src/filesystem/MemBufferCache.h b/xbmc/filesystem/MemBufferCache.h similarity index 100% rename from src/filesystem/MemBufferCache.h rename to xbmc/filesystem/MemBufferCache.h diff --git a/src/filesystem/MultiPathDirectory.cpp b/xbmc/filesystem/MultiPathDirectory.cpp similarity index 100% rename from src/filesystem/MultiPathDirectory.cpp rename to xbmc/filesystem/MultiPathDirectory.cpp diff --git a/src/filesystem/MultiPathDirectory.h b/xbmc/filesystem/MultiPathDirectory.h similarity index 100% rename from src/filesystem/MultiPathDirectory.h rename to xbmc/filesystem/MultiPathDirectory.h diff --git a/src/filesystem/MultiPathFile.cpp b/xbmc/filesystem/MultiPathFile.cpp similarity index 100% rename from src/filesystem/MultiPathFile.cpp rename to xbmc/filesystem/MultiPathFile.cpp diff --git a/src/filesystem/MultiPathFile.h b/xbmc/filesystem/MultiPathFile.h similarity index 100% rename from src/filesystem/MultiPathFile.h rename to xbmc/filesystem/MultiPathFile.h diff --git a/src/filesystem/MusicDatabaseDirectory.cpp b/xbmc/filesystem/MusicDatabaseDirectory.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory.cpp rename to xbmc/filesystem/MusicDatabaseDirectory.cpp diff --git a/src/filesystem/MusicDatabaseDirectory.h b/xbmc/filesystem/MusicDatabaseDirectory.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory.h rename to xbmc/filesystem/MusicDatabaseDirectory.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNode.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNode.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGrouped.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.h diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.cpp b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.h b/xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.h rename to xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.h diff --git a/src/filesystem/MusicDatabaseDirectory/Makefile b/xbmc/filesystem/MusicDatabaseDirectory/Makefile similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/Makefile rename to xbmc/filesystem/MusicDatabaseDirectory/Makefile diff --git a/src/filesystem/MusicDatabaseDirectory/QueryParams.cpp b/xbmc/filesystem/MusicDatabaseDirectory/QueryParams.cpp similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/QueryParams.cpp rename to xbmc/filesystem/MusicDatabaseDirectory/QueryParams.cpp diff --git a/src/filesystem/MusicDatabaseDirectory/QueryParams.h b/xbmc/filesystem/MusicDatabaseDirectory/QueryParams.h similarity index 100% rename from src/filesystem/MusicDatabaseDirectory/QueryParams.h rename to xbmc/filesystem/MusicDatabaseDirectory/QueryParams.h diff --git a/src/filesystem/MusicDatabaseFile.cpp b/xbmc/filesystem/MusicDatabaseFile.cpp similarity index 100% rename from src/filesystem/MusicDatabaseFile.cpp rename to xbmc/filesystem/MusicDatabaseFile.cpp diff --git a/src/filesystem/MusicDatabaseFile.h b/xbmc/filesystem/MusicDatabaseFile.h similarity index 100% rename from src/filesystem/MusicDatabaseFile.h rename to xbmc/filesystem/MusicDatabaseFile.h diff --git a/src/filesystem/MusicFileDirectory.cpp b/xbmc/filesystem/MusicFileDirectory.cpp similarity index 100% rename from src/filesystem/MusicFileDirectory.cpp rename to xbmc/filesystem/MusicFileDirectory.cpp diff --git a/src/filesystem/MusicFileDirectory.h b/xbmc/filesystem/MusicFileDirectory.h similarity index 100% rename from src/filesystem/MusicFileDirectory.h rename to xbmc/filesystem/MusicFileDirectory.h diff --git a/src/filesystem/MusicSearchDirectory.cpp b/xbmc/filesystem/MusicSearchDirectory.cpp similarity index 100% rename from src/filesystem/MusicSearchDirectory.cpp rename to xbmc/filesystem/MusicSearchDirectory.cpp diff --git a/src/filesystem/MusicSearchDirectory.h b/xbmc/filesystem/MusicSearchDirectory.h similarity index 100% rename from src/filesystem/MusicSearchDirectory.h rename to xbmc/filesystem/MusicSearchDirectory.h diff --git a/src/filesystem/MythDirectory.cpp b/xbmc/filesystem/MythDirectory.cpp similarity index 100% rename from src/filesystem/MythDirectory.cpp rename to xbmc/filesystem/MythDirectory.cpp diff --git a/src/filesystem/MythDirectory.h b/xbmc/filesystem/MythDirectory.h similarity index 100% rename from src/filesystem/MythDirectory.h rename to xbmc/filesystem/MythDirectory.h diff --git a/src/filesystem/MythFile.cpp b/xbmc/filesystem/MythFile.cpp similarity index 100% rename from src/filesystem/MythFile.cpp rename to xbmc/filesystem/MythFile.cpp diff --git a/src/filesystem/MythFile.h b/xbmc/filesystem/MythFile.h similarity index 100% rename from src/filesystem/MythFile.h rename to xbmc/filesystem/MythFile.h diff --git a/src/filesystem/MythSession.cpp b/xbmc/filesystem/MythSession.cpp similarity index 100% rename from src/filesystem/MythSession.cpp rename to xbmc/filesystem/MythSession.cpp diff --git a/src/filesystem/MythSession.h b/xbmc/filesystem/MythSession.h similarity index 100% rename from src/filesystem/MythSession.h rename to xbmc/filesystem/MythSession.h diff --git a/src/filesystem/NFSDirectory.cpp b/xbmc/filesystem/NFSDirectory.cpp similarity index 100% rename from src/filesystem/NFSDirectory.cpp rename to xbmc/filesystem/NFSDirectory.cpp diff --git a/src/filesystem/NFSDirectory.h b/xbmc/filesystem/NFSDirectory.h similarity index 100% rename from src/filesystem/NFSDirectory.h rename to xbmc/filesystem/NFSDirectory.h diff --git a/src/filesystem/NFSFile.cpp b/xbmc/filesystem/NFSFile.cpp similarity index 100% rename from src/filesystem/NFSFile.cpp rename to xbmc/filesystem/NFSFile.cpp diff --git a/src/filesystem/NFSFile.h b/xbmc/filesystem/NFSFile.h similarity index 100% rename from src/filesystem/NFSFile.h rename to xbmc/filesystem/NFSFile.h diff --git a/src/filesystem/NSFFileDirectory.cpp b/xbmc/filesystem/NSFFileDirectory.cpp similarity index 100% rename from src/filesystem/NSFFileDirectory.cpp rename to xbmc/filesystem/NSFFileDirectory.cpp diff --git a/src/filesystem/NSFFileDirectory.h b/xbmc/filesystem/NSFFileDirectory.h similarity index 100% rename from src/filesystem/NSFFileDirectory.h rename to xbmc/filesystem/NSFFileDirectory.h diff --git a/src/filesystem/NptXbmcFile.cpp b/xbmc/filesystem/NptXbmcFile.cpp similarity index 100% rename from src/filesystem/NptXbmcFile.cpp rename to xbmc/filesystem/NptXbmcFile.cpp diff --git a/src/filesystem/OGGFileDirectory.cpp b/xbmc/filesystem/OGGFileDirectory.cpp similarity index 100% rename from src/filesystem/OGGFileDirectory.cpp rename to xbmc/filesystem/OGGFileDirectory.cpp diff --git a/src/filesystem/OGGFileDirectory.h b/xbmc/filesystem/OGGFileDirectory.h similarity index 100% rename from src/filesystem/OGGFileDirectory.h rename to xbmc/filesystem/OGGFileDirectory.h diff --git a/src/filesystem/PVRDirectory.cpp b/xbmc/filesystem/PVRDirectory.cpp similarity index 100% rename from src/filesystem/PVRDirectory.cpp rename to xbmc/filesystem/PVRDirectory.cpp diff --git a/src/filesystem/PVRDirectory.h b/xbmc/filesystem/PVRDirectory.h similarity index 100% rename from src/filesystem/PVRDirectory.h rename to xbmc/filesystem/PVRDirectory.h diff --git a/src/filesystem/PVRFile.cpp b/xbmc/filesystem/PVRFile.cpp similarity index 100% rename from src/filesystem/PVRFile.cpp rename to xbmc/filesystem/PVRFile.cpp diff --git a/src/filesystem/PVRFile.h b/xbmc/filesystem/PVRFile.h similarity index 100% rename from src/filesystem/PVRFile.h rename to xbmc/filesystem/PVRFile.h diff --git a/src/filesystem/PipeFile.cpp b/xbmc/filesystem/PipeFile.cpp similarity index 100% rename from src/filesystem/PipeFile.cpp rename to xbmc/filesystem/PipeFile.cpp diff --git a/src/filesystem/PipeFile.h b/xbmc/filesystem/PipeFile.h similarity index 100% rename from src/filesystem/PipeFile.h rename to xbmc/filesystem/PipeFile.h diff --git a/src/filesystem/PipesManager.cpp b/xbmc/filesystem/PipesManager.cpp similarity index 100% rename from src/filesystem/PipesManager.cpp rename to xbmc/filesystem/PipesManager.cpp diff --git a/src/filesystem/PipesManager.h b/xbmc/filesystem/PipesManager.h similarity index 100% rename from src/filesystem/PipesManager.h rename to xbmc/filesystem/PipesManager.h diff --git a/src/filesystem/PlaylistDirectory.cpp b/xbmc/filesystem/PlaylistDirectory.cpp similarity index 100% rename from src/filesystem/PlaylistDirectory.cpp rename to xbmc/filesystem/PlaylistDirectory.cpp diff --git a/src/filesystem/PlaylistDirectory.h b/xbmc/filesystem/PlaylistDirectory.h similarity index 100% rename from src/filesystem/PlaylistDirectory.h rename to xbmc/filesystem/PlaylistDirectory.h diff --git a/src/filesystem/PlaylistFileDirectory.cpp b/xbmc/filesystem/PlaylistFileDirectory.cpp similarity index 100% rename from src/filesystem/PlaylistFileDirectory.cpp rename to xbmc/filesystem/PlaylistFileDirectory.cpp diff --git a/src/filesystem/PlaylistFileDirectory.h b/xbmc/filesystem/PlaylistFileDirectory.h similarity index 100% rename from src/filesystem/PlaylistFileDirectory.h rename to xbmc/filesystem/PlaylistFileDirectory.h diff --git a/src/filesystem/PluginDirectory.cpp b/xbmc/filesystem/PluginDirectory.cpp similarity index 100% rename from src/filesystem/PluginDirectory.cpp rename to xbmc/filesystem/PluginDirectory.cpp diff --git a/src/filesystem/PluginDirectory.h b/xbmc/filesystem/PluginDirectory.h similarity index 100% rename from src/filesystem/PluginDirectory.h rename to xbmc/filesystem/PluginDirectory.h diff --git a/src/filesystem/RSSDirectory.cpp b/xbmc/filesystem/RSSDirectory.cpp similarity index 100% rename from src/filesystem/RSSDirectory.cpp rename to xbmc/filesystem/RSSDirectory.cpp diff --git a/src/filesystem/RSSDirectory.h b/xbmc/filesystem/RSSDirectory.h similarity index 100% rename from src/filesystem/RSSDirectory.h rename to xbmc/filesystem/RSSDirectory.h diff --git a/src/filesystem/RTVDirectory.cpp b/xbmc/filesystem/RTVDirectory.cpp similarity index 100% rename from src/filesystem/RTVDirectory.cpp rename to xbmc/filesystem/RTVDirectory.cpp diff --git a/src/filesystem/RTVDirectory.h b/xbmc/filesystem/RTVDirectory.h similarity index 100% rename from src/filesystem/RTVDirectory.h rename to xbmc/filesystem/RTVDirectory.h diff --git a/src/filesystem/RTVFile.cpp b/xbmc/filesystem/RTVFile.cpp similarity index 100% rename from src/filesystem/RTVFile.cpp rename to xbmc/filesystem/RTVFile.cpp diff --git a/src/filesystem/RTVFile.h b/xbmc/filesystem/RTVFile.h similarity index 100% rename from src/filesystem/RTVFile.h rename to xbmc/filesystem/RTVFile.h diff --git a/src/filesystem/RarDirectory.cpp b/xbmc/filesystem/RarDirectory.cpp similarity index 100% rename from src/filesystem/RarDirectory.cpp rename to xbmc/filesystem/RarDirectory.cpp diff --git a/src/filesystem/RarDirectory.h b/xbmc/filesystem/RarDirectory.h similarity index 100% rename from src/filesystem/RarDirectory.h rename to xbmc/filesystem/RarDirectory.h diff --git a/src/filesystem/RarFile.cpp b/xbmc/filesystem/RarFile.cpp similarity index 100% rename from src/filesystem/RarFile.cpp rename to xbmc/filesystem/RarFile.cpp diff --git a/src/filesystem/RarFile.h b/xbmc/filesystem/RarFile.h similarity index 100% rename from src/filesystem/RarFile.h rename to xbmc/filesystem/RarFile.h diff --git a/src/filesystem/RarManager.cpp b/xbmc/filesystem/RarManager.cpp similarity index 100% rename from src/filesystem/RarManager.cpp rename to xbmc/filesystem/RarManager.cpp diff --git a/src/filesystem/RarManager.h b/xbmc/filesystem/RarManager.h similarity index 100% rename from src/filesystem/RarManager.h rename to xbmc/filesystem/RarManager.h diff --git a/src/filesystem/SAPDirectory.cpp b/xbmc/filesystem/SAPDirectory.cpp similarity index 100% rename from src/filesystem/SAPDirectory.cpp rename to xbmc/filesystem/SAPDirectory.cpp diff --git a/src/filesystem/SAPDirectory.h b/xbmc/filesystem/SAPDirectory.h similarity index 100% rename from src/filesystem/SAPDirectory.h rename to xbmc/filesystem/SAPDirectory.h diff --git a/src/filesystem/SAPFile.cpp b/xbmc/filesystem/SAPFile.cpp similarity index 100% rename from src/filesystem/SAPFile.cpp rename to xbmc/filesystem/SAPFile.cpp diff --git a/src/filesystem/SAPFile.h b/xbmc/filesystem/SAPFile.h similarity index 100% rename from src/filesystem/SAPFile.h rename to xbmc/filesystem/SAPFile.h diff --git a/src/filesystem/SFTPDirectory.cpp b/xbmc/filesystem/SFTPDirectory.cpp similarity index 100% rename from src/filesystem/SFTPDirectory.cpp rename to xbmc/filesystem/SFTPDirectory.cpp diff --git a/src/filesystem/SFTPDirectory.h b/xbmc/filesystem/SFTPDirectory.h similarity index 100% rename from src/filesystem/SFTPDirectory.h rename to xbmc/filesystem/SFTPDirectory.h diff --git a/src/filesystem/SFTPFile.cpp b/xbmc/filesystem/SFTPFile.cpp similarity index 100% rename from src/filesystem/SFTPFile.cpp rename to xbmc/filesystem/SFTPFile.cpp diff --git a/src/filesystem/SFTPFile.h b/xbmc/filesystem/SFTPFile.h similarity index 100% rename from src/filesystem/SFTPFile.h rename to xbmc/filesystem/SFTPFile.h diff --git a/src/filesystem/SIDFileDirectory.cpp b/xbmc/filesystem/SIDFileDirectory.cpp similarity index 100% rename from src/filesystem/SIDFileDirectory.cpp rename to xbmc/filesystem/SIDFileDirectory.cpp diff --git a/src/filesystem/SIDFileDirectory.h b/xbmc/filesystem/SIDFileDirectory.h similarity index 100% rename from src/filesystem/SIDFileDirectory.h rename to xbmc/filesystem/SIDFileDirectory.h diff --git a/src/filesystem/SMBDirectory.cpp b/xbmc/filesystem/SMBDirectory.cpp similarity index 100% rename from src/filesystem/SMBDirectory.cpp rename to xbmc/filesystem/SMBDirectory.cpp diff --git a/src/filesystem/SMBDirectory.h b/xbmc/filesystem/SMBDirectory.h similarity index 100% rename from src/filesystem/SMBDirectory.h rename to xbmc/filesystem/SMBDirectory.h diff --git a/src/filesystem/SMBFile.cpp b/xbmc/filesystem/SMBFile.cpp similarity index 100% rename from src/filesystem/SMBFile.cpp rename to xbmc/filesystem/SMBFile.cpp diff --git a/src/filesystem/SMBFile.h b/xbmc/filesystem/SMBFile.h similarity index 100% rename from src/filesystem/SMBFile.h rename to xbmc/filesystem/SMBFile.h diff --git a/src/filesystem/ShoutcastFile.cpp b/xbmc/filesystem/ShoutcastFile.cpp similarity index 100% rename from src/filesystem/ShoutcastFile.cpp rename to xbmc/filesystem/ShoutcastFile.cpp diff --git a/src/filesystem/ShoutcastFile.h b/xbmc/filesystem/ShoutcastFile.h similarity index 100% rename from src/filesystem/ShoutcastFile.h rename to xbmc/filesystem/ShoutcastFile.h diff --git a/src/filesystem/SlingboxDirectory.cpp b/xbmc/filesystem/SlingboxDirectory.cpp similarity index 100% rename from src/filesystem/SlingboxDirectory.cpp rename to xbmc/filesystem/SlingboxDirectory.cpp diff --git a/src/filesystem/SlingboxDirectory.h b/xbmc/filesystem/SlingboxDirectory.h similarity index 100% rename from src/filesystem/SlingboxDirectory.h rename to xbmc/filesystem/SlingboxDirectory.h diff --git a/src/filesystem/SlingboxFile.cpp b/xbmc/filesystem/SlingboxFile.cpp similarity index 100% rename from src/filesystem/SlingboxFile.cpp rename to xbmc/filesystem/SlingboxFile.cpp diff --git a/src/filesystem/SlingboxFile.h b/xbmc/filesystem/SlingboxFile.h similarity index 100% rename from src/filesystem/SlingboxFile.h rename to xbmc/filesystem/SlingboxFile.h diff --git a/src/filesystem/SmartPlaylistDirectory.cpp b/xbmc/filesystem/SmartPlaylistDirectory.cpp similarity index 100% rename from src/filesystem/SmartPlaylistDirectory.cpp rename to xbmc/filesystem/SmartPlaylistDirectory.cpp diff --git a/src/filesystem/SmartPlaylistDirectory.h b/xbmc/filesystem/SmartPlaylistDirectory.h similarity index 100% rename from src/filesystem/SmartPlaylistDirectory.h rename to xbmc/filesystem/SmartPlaylistDirectory.h diff --git a/src/filesystem/SourcesDirectory.cpp b/xbmc/filesystem/SourcesDirectory.cpp similarity index 100% rename from src/filesystem/SourcesDirectory.cpp rename to xbmc/filesystem/SourcesDirectory.cpp diff --git a/src/filesystem/SourcesDirectory.h b/xbmc/filesystem/SourcesDirectory.h similarity index 100% rename from src/filesystem/SourcesDirectory.h rename to xbmc/filesystem/SourcesDirectory.h diff --git a/src/filesystem/SpecialProtocol.cpp b/xbmc/filesystem/SpecialProtocol.cpp similarity index 100% rename from src/filesystem/SpecialProtocol.cpp rename to xbmc/filesystem/SpecialProtocol.cpp diff --git a/src/filesystem/SpecialProtocol.h b/xbmc/filesystem/SpecialProtocol.h similarity index 100% rename from src/filesystem/SpecialProtocol.h rename to xbmc/filesystem/SpecialProtocol.h diff --git a/src/filesystem/SpecialProtocolDirectory.cpp b/xbmc/filesystem/SpecialProtocolDirectory.cpp similarity index 100% rename from src/filesystem/SpecialProtocolDirectory.cpp rename to xbmc/filesystem/SpecialProtocolDirectory.cpp diff --git a/src/filesystem/SpecialProtocolDirectory.h b/xbmc/filesystem/SpecialProtocolDirectory.h similarity index 100% rename from src/filesystem/SpecialProtocolDirectory.h rename to xbmc/filesystem/SpecialProtocolDirectory.h diff --git a/src/filesystem/SpecialProtocolFile.cpp b/xbmc/filesystem/SpecialProtocolFile.cpp similarity index 100% rename from src/filesystem/SpecialProtocolFile.cpp rename to xbmc/filesystem/SpecialProtocolFile.cpp diff --git a/src/filesystem/SpecialProtocolFile.h b/xbmc/filesystem/SpecialProtocolFile.h similarity index 100% rename from src/filesystem/SpecialProtocolFile.h rename to xbmc/filesystem/SpecialProtocolFile.h diff --git a/src/filesystem/StackDirectory.cpp b/xbmc/filesystem/StackDirectory.cpp similarity index 100% rename from src/filesystem/StackDirectory.cpp rename to xbmc/filesystem/StackDirectory.cpp diff --git a/src/filesystem/StackDirectory.h b/xbmc/filesystem/StackDirectory.h similarity index 100% rename from src/filesystem/StackDirectory.h rename to xbmc/filesystem/StackDirectory.h diff --git a/src/filesystem/TuxBoxDirectory.cpp b/xbmc/filesystem/TuxBoxDirectory.cpp similarity index 100% rename from src/filesystem/TuxBoxDirectory.cpp rename to xbmc/filesystem/TuxBoxDirectory.cpp diff --git a/src/filesystem/TuxBoxDirectory.h b/xbmc/filesystem/TuxBoxDirectory.h similarity index 100% rename from src/filesystem/TuxBoxDirectory.h rename to xbmc/filesystem/TuxBoxDirectory.h diff --git a/src/filesystem/TuxBoxFile.cpp b/xbmc/filesystem/TuxBoxFile.cpp similarity index 100% rename from src/filesystem/TuxBoxFile.cpp rename to xbmc/filesystem/TuxBoxFile.cpp diff --git a/src/filesystem/TuxBoxFile.h b/xbmc/filesystem/TuxBoxFile.h similarity index 100% rename from src/filesystem/TuxBoxFile.h rename to xbmc/filesystem/TuxBoxFile.h diff --git a/src/filesystem/UDFDirectory.cpp b/xbmc/filesystem/UDFDirectory.cpp similarity index 100% rename from src/filesystem/UDFDirectory.cpp rename to xbmc/filesystem/UDFDirectory.cpp diff --git a/src/filesystem/UDFDirectory.h b/xbmc/filesystem/UDFDirectory.h similarity index 100% rename from src/filesystem/UDFDirectory.h rename to xbmc/filesystem/UDFDirectory.h diff --git a/src/filesystem/UDFFile.cpp b/xbmc/filesystem/UDFFile.cpp similarity index 100% rename from src/filesystem/UDFFile.cpp rename to xbmc/filesystem/UDFFile.cpp diff --git a/src/filesystem/UDFFile.h b/xbmc/filesystem/UDFFile.h similarity index 100% rename from src/filesystem/UDFFile.h rename to xbmc/filesystem/UDFFile.h diff --git a/src/filesystem/UPnPDirectory.cpp b/xbmc/filesystem/UPnPDirectory.cpp similarity index 100% rename from src/filesystem/UPnPDirectory.cpp rename to xbmc/filesystem/UPnPDirectory.cpp diff --git a/src/filesystem/UPnPDirectory.h b/xbmc/filesystem/UPnPDirectory.h similarity index 100% rename from src/filesystem/UPnPDirectory.h rename to xbmc/filesystem/UPnPDirectory.h diff --git a/src/filesystem/UPnPFile.cpp b/xbmc/filesystem/UPnPFile.cpp similarity index 100% rename from src/filesystem/UPnPFile.cpp rename to xbmc/filesystem/UPnPFile.cpp diff --git a/src/filesystem/UPnPFile.h b/xbmc/filesystem/UPnPFile.h similarity index 100% rename from src/filesystem/UPnPFile.h rename to xbmc/filesystem/UPnPFile.h diff --git a/src/filesystem/VTPDirectory.cpp b/xbmc/filesystem/VTPDirectory.cpp similarity index 100% rename from src/filesystem/VTPDirectory.cpp rename to xbmc/filesystem/VTPDirectory.cpp diff --git a/src/filesystem/VTPDirectory.h b/xbmc/filesystem/VTPDirectory.h similarity index 100% rename from src/filesystem/VTPDirectory.h rename to xbmc/filesystem/VTPDirectory.h diff --git a/src/filesystem/VTPFile.cpp b/xbmc/filesystem/VTPFile.cpp similarity index 100% rename from src/filesystem/VTPFile.cpp rename to xbmc/filesystem/VTPFile.cpp diff --git a/src/filesystem/VTPFile.h b/xbmc/filesystem/VTPFile.h similarity index 100% rename from src/filesystem/VTPFile.h rename to xbmc/filesystem/VTPFile.h diff --git a/src/filesystem/VTPSession.cpp b/xbmc/filesystem/VTPSession.cpp similarity index 100% rename from src/filesystem/VTPSession.cpp rename to xbmc/filesystem/VTPSession.cpp diff --git a/src/filesystem/VTPSession.h b/xbmc/filesystem/VTPSession.h similarity index 100% rename from src/filesystem/VTPSession.h rename to xbmc/filesystem/VTPSession.h diff --git a/src/filesystem/VideoDatabaseDirectory.cpp b/xbmc/filesystem/VideoDatabaseDirectory.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory.cpp rename to xbmc/filesystem/VideoDatabaseDirectory.cpp diff --git a/src/filesystem/VideoDatabaseDirectory.h b/xbmc/filesystem/VideoDatabaseDirectory.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory.h rename to xbmc/filesystem/VideoDatabaseDirectory.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNode.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNode.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeGrouped.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeGrouped.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeGrouped.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeGrouped.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeGrouped.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeGrouped.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeGrouped.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeGrouped.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.h diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h b/xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h rename to xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h diff --git a/src/filesystem/VideoDatabaseDirectory/Makefile b/xbmc/filesystem/VideoDatabaseDirectory/Makefile similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/Makefile rename to xbmc/filesystem/VideoDatabaseDirectory/Makefile diff --git a/src/filesystem/VideoDatabaseDirectory/QueryParams.cpp b/xbmc/filesystem/VideoDatabaseDirectory/QueryParams.cpp similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/QueryParams.cpp rename to xbmc/filesystem/VideoDatabaseDirectory/QueryParams.cpp diff --git a/src/filesystem/VideoDatabaseDirectory/QueryParams.h b/xbmc/filesystem/VideoDatabaseDirectory/QueryParams.h similarity index 100% rename from src/filesystem/VideoDatabaseDirectory/QueryParams.h rename to xbmc/filesystem/VideoDatabaseDirectory/QueryParams.h diff --git a/src/filesystem/VirtualDirectory.cpp b/xbmc/filesystem/VirtualDirectory.cpp similarity index 100% rename from src/filesystem/VirtualDirectory.cpp rename to xbmc/filesystem/VirtualDirectory.cpp diff --git a/src/filesystem/VirtualDirectory.h b/xbmc/filesystem/VirtualDirectory.h similarity index 100% rename from src/filesystem/VirtualDirectory.h rename to xbmc/filesystem/VirtualDirectory.h diff --git a/src/filesystem/ZeroconfDirectory.cpp b/xbmc/filesystem/ZeroconfDirectory.cpp similarity index 100% rename from src/filesystem/ZeroconfDirectory.cpp rename to xbmc/filesystem/ZeroconfDirectory.cpp diff --git a/src/filesystem/ZeroconfDirectory.h b/xbmc/filesystem/ZeroconfDirectory.h similarity index 100% rename from src/filesystem/ZeroconfDirectory.h rename to xbmc/filesystem/ZeroconfDirectory.h diff --git a/src/filesystem/ZipDirectory.cpp b/xbmc/filesystem/ZipDirectory.cpp similarity index 100% rename from src/filesystem/ZipDirectory.cpp rename to xbmc/filesystem/ZipDirectory.cpp diff --git a/src/filesystem/ZipDirectory.h b/xbmc/filesystem/ZipDirectory.h similarity index 100% rename from src/filesystem/ZipDirectory.h rename to xbmc/filesystem/ZipDirectory.h diff --git a/src/filesystem/ZipFile.cpp b/xbmc/filesystem/ZipFile.cpp similarity index 100% rename from src/filesystem/ZipFile.cpp rename to xbmc/filesystem/ZipFile.cpp diff --git a/src/filesystem/ZipFile.h b/xbmc/filesystem/ZipFile.h similarity index 100% rename from src/filesystem/ZipFile.h rename to xbmc/filesystem/ZipFile.h diff --git a/src/filesystem/ZipManager.cpp b/xbmc/filesystem/ZipManager.cpp similarity index 100% rename from src/filesystem/ZipManager.cpp rename to xbmc/filesystem/ZipManager.cpp diff --git a/src/filesystem/ZipManager.h b/xbmc/filesystem/ZipManager.h similarity index 100% rename from src/filesystem/ZipManager.h rename to xbmc/filesystem/ZipManager.h diff --git a/src/filesystem/iso9660.cpp b/xbmc/filesystem/iso9660.cpp similarity index 100% rename from src/filesystem/iso9660.cpp rename to xbmc/filesystem/iso9660.cpp diff --git a/src/filesystem/iso9660.h b/xbmc/filesystem/iso9660.h similarity index 100% rename from src/filesystem/iso9660.h rename to xbmc/filesystem/iso9660.h diff --git a/src/filesystem/posix/PosixDirectory.cpp b/xbmc/filesystem/posix/PosixDirectory.cpp similarity index 100% rename from src/filesystem/posix/PosixDirectory.cpp rename to xbmc/filesystem/posix/PosixDirectory.cpp diff --git a/src/filesystem/posix/PosixDirectory.h b/xbmc/filesystem/posix/PosixDirectory.h similarity index 100% rename from src/filesystem/posix/PosixDirectory.h rename to xbmc/filesystem/posix/PosixDirectory.h diff --git a/src/filesystem/posix/PosixFile.cpp b/xbmc/filesystem/posix/PosixFile.cpp similarity index 100% rename from src/filesystem/posix/PosixFile.cpp rename to xbmc/filesystem/posix/PosixFile.cpp diff --git a/src/filesystem/posix/PosixFile.h b/xbmc/filesystem/posix/PosixFile.h similarity index 100% rename from src/filesystem/posix/PosixFile.h rename to xbmc/filesystem/posix/PosixFile.h diff --git a/src/filesystem/test/Makefile b/xbmc/filesystem/test/Makefile similarity index 100% rename from src/filesystem/test/Makefile rename to xbmc/filesystem/test/Makefile diff --git a/src/filesystem/test/TestDirectory.cpp b/xbmc/filesystem/test/TestDirectory.cpp similarity index 100% rename from src/filesystem/test/TestDirectory.cpp rename to xbmc/filesystem/test/TestDirectory.cpp diff --git a/src/filesystem/test/TestFile.cpp b/xbmc/filesystem/test/TestFile.cpp similarity index 100% rename from src/filesystem/test/TestFile.cpp rename to xbmc/filesystem/test/TestFile.cpp diff --git a/src/filesystem/test/TestFileFactory.cpp b/xbmc/filesystem/test/TestFileFactory.cpp similarity index 100% rename from src/filesystem/test/TestFileFactory.cpp rename to xbmc/filesystem/test/TestFileFactory.cpp diff --git a/src/filesystem/test/TestNfsFile.cpp b/xbmc/filesystem/test/TestNfsFile.cpp similarity index 100% rename from src/filesystem/test/TestNfsFile.cpp rename to xbmc/filesystem/test/TestNfsFile.cpp diff --git a/src/filesystem/test/TestRarFile.cpp b/xbmc/filesystem/test/TestRarFile.cpp similarity index 100% rename from src/filesystem/test/TestRarFile.cpp rename to xbmc/filesystem/test/TestRarFile.cpp diff --git a/src/filesystem/test/TestZipFile.cpp b/xbmc/filesystem/test/TestZipFile.cpp similarity index 100% rename from src/filesystem/test/TestZipFile.cpp rename to xbmc/filesystem/test/TestZipFile.cpp diff --git a/src/filesystem/test/refRARnormal.rar b/xbmc/filesystem/test/refRARnormal.rar similarity index 100% rename from src/filesystem/test/refRARnormal.rar rename to xbmc/filesystem/test/refRARnormal.rar diff --git a/src/filesystem/test/refRARstored.rar b/xbmc/filesystem/test/refRARstored.rar similarity index 100% rename from src/filesystem/test/refRARstored.rar rename to xbmc/filesystem/test/refRARstored.rar diff --git a/src/filesystem/test/reffile.txt b/xbmc/filesystem/test/reffile.txt similarity index 100% rename from src/filesystem/test/reffile.txt rename to xbmc/filesystem/test/reffile.txt diff --git a/src/filesystem/test/reffile.txt.rar b/xbmc/filesystem/test/reffile.txt.rar similarity index 100% rename from src/filesystem/test/reffile.txt.rar rename to xbmc/filesystem/test/reffile.txt.rar diff --git a/src/filesystem/test/reffile.txt.zip b/xbmc/filesystem/test/reffile.txt.zip similarity index 100% rename from src/filesystem/test/reffile.txt.zip rename to xbmc/filesystem/test/reffile.txt.zip diff --git a/src/filesystem/udf25.cpp b/xbmc/filesystem/udf25.cpp similarity index 100% rename from src/filesystem/udf25.cpp rename to xbmc/filesystem/udf25.cpp diff --git a/src/filesystem/udf25.h b/xbmc/filesystem/udf25.h similarity index 100% rename from src/filesystem/udf25.h rename to xbmc/filesystem/udf25.h diff --git a/src/filesystem/win32/Win32Directory.cpp b/xbmc/filesystem/win32/Win32Directory.cpp similarity index 100% rename from src/filesystem/win32/Win32Directory.cpp rename to xbmc/filesystem/win32/Win32Directory.cpp diff --git a/src/filesystem/win32/Win32Directory.h b/xbmc/filesystem/win32/Win32Directory.h similarity index 100% rename from src/filesystem/win32/Win32Directory.h rename to xbmc/filesystem/win32/Win32Directory.h diff --git a/src/filesystem/win32/Win32File.cpp b/xbmc/filesystem/win32/Win32File.cpp similarity index 100% rename from src/filesystem/win32/Win32File.cpp rename to xbmc/filesystem/win32/Win32File.cpp diff --git a/src/filesystem/win32/Win32File.h b/xbmc/filesystem/win32/Win32File.h similarity index 100% rename from src/filesystem/win32/Win32File.h rename to xbmc/filesystem/win32/Win32File.h diff --git a/src/filesystem/win32/Win32SMBDirectory.cpp b/xbmc/filesystem/win32/Win32SMBDirectory.cpp similarity index 100% rename from src/filesystem/win32/Win32SMBDirectory.cpp rename to xbmc/filesystem/win32/Win32SMBDirectory.cpp diff --git a/src/filesystem/win32/Win32SMBDirectory.h b/xbmc/filesystem/win32/Win32SMBDirectory.h similarity index 100% rename from src/filesystem/win32/Win32SMBDirectory.h rename to xbmc/filesystem/win32/Win32SMBDirectory.h diff --git a/src/filesystem/win32/Win32SMBFile.cpp b/xbmc/filesystem/win32/Win32SMBFile.cpp similarity index 100% rename from src/filesystem/win32/Win32SMBFile.cpp rename to xbmc/filesystem/win32/Win32SMBFile.cpp diff --git a/src/filesystem/win32/Win32SMBFile.h b/xbmc/filesystem/win32/Win32SMBFile.h similarity index 100% rename from src/filesystem/win32/Win32SMBFile.h rename to xbmc/filesystem/win32/Win32SMBFile.h diff --git a/src/freebsd/FreeBSDGNUReplacements.c b/xbmc/freebsd/FreeBSDGNUReplacements.c similarity index 100% rename from src/freebsd/FreeBSDGNUReplacements.c rename to xbmc/freebsd/FreeBSDGNUReplacements.c diff --git a/src/freebsd/FreeBSDGNUReplacements.h b/xbmc/freebsd/FreeBSDGNUReplacements.h similarity index 100% rename from src/freebsd/FreeBSDGNUReplacements.h rename to xbmc/freebsd/FreeBSDGNUReplacements.h diff --git a/src/freebsd/Makefile.in b/xbmc/freebsd/Makefile.in similarity index 100% rename from src/freebsd/Makefile.in rename to xbmc/freebsd/Makefile.in diff --git a/src/gen-compileinfo.mk b/xbmc/gen-compileinfo.mk similarity index 100% rename from src/gen-compileinfo.mk rename to xbmc/gen-compileinfo.mk diff --git a/src/guilib/AnimatedGif.cpp b/xbmc/guilib/AnimatedGif.cpp similarity index 100% rename from src/guilib/AnimatedGif.cpp rename to xbmc/guilib/AnimatedGif.cpp diff --git a/src/guilib/AnimatedGif.h b/xbmc/guilib/AnimatedGif.h similarity index 100% rename from src/guilib/AnimatedGif.h rename to xbmc/guilib/AnimatedGif.h diff --git a/src/guilib/D3DResource.cpp b/xbmc/guilib/D3DResource.cpp similarity index 100% rename from src/guilib/D3DResource.cpp rename to xbmc/guilib/D3DResource.cpp diff --git a/src/guilib/D3DResource.h b/xbmc/guilib/D3DResource.h similarity index 100% rename from src/guilib/D3DResource.h rename to xbmc/guilib/D3DResource.h diff --git a/src/guilib/DDSImage.cpp b/xbmc/guilib/DDSImage.cpp similarity index 100% rename from src/guilib/DDSImage.cpp rename to xbmc/guilib/DDSImage.cpp diff --git a/src/guilib/DDSImage.h b/xbmc/guilib/DDSImage.h similarity index 100% rename from src/guilib/DDSImage.h rename to xbmc/guilib/DDSImage.h diff --git a/src/guilib/DirectXGraphics.cpp b/xbmc/guilib/DirectXGraphics.cpp similarity index 100% rename from src/guilib/DirectXGraphics.cpp rename to xbmc/guilib/DirectXGraphics.cpp diff --git a/src/guilib/DirectXGraphics.h b/xbmc/guilib/DirectXGraphics.h similarity index 100% rename from src/guilib/DirectXGraphics.h rename to xbmc/guilib/DirectXGraphics.h diff --git a/src/guilib/DirtyRegion.h b/xbmc/guilib/DirtyRegion.h similarity index 100% rename from src/guilib/DirtyRegion.h rename to xbmc/guilib/DirtyRegion.h diff --git a/src/guilib/DirtyRegionSolvers.cpp b/xbmc/guilib/DirtyRegionSolvers.cpp similarity index 100% rename from src/guilib/DirtyRegionSolvers.cpp rename to xbmc/guilib/DirtyRegionSolvers.cpp diff --git a/src/guilib/DirtyRegionSolvers.h b/xbmc/guilib/DirtyRegionSolvers.h similarity index 100% rename from src/guilib/DirtyRegionSolvers.h rename to xbmc/guilib/DirtyRegionSolvers.h diff --git a/src/guilib/DirtyRegionTracker.cpp b/xbmc/guilib/DirtyRegionTracker.cpp similarity index 100% rename from src/guilib/DirtyRegionTracker.cpp rename to xbmc/guilib/DirtyRegionTracker.cpp diff --git a/src/guilib/DirtyRegionTracker.h b/xbmc/guilib/DirtyRegionTracker.h similarity index 100% rename from src/guilib/DirtyRegionTracker.h rename to xbmc/guilib/DirtyRegionTracker.h diff --git a/src/guilib/DispResource.h b/xbmc/guilib/DispResource.h similarity index 100% rename from src/guilib/DispResource.h rename to xbmc/guilib/DispResource.h diff --git a/src/guilib/FrameBufferObject.cpp b/xbmc/guilib/FrameBufferObject.cpp similarity index 100% rename from src/guilib/FrameBufferObject.cpp rename to xbmc/guilib/FrameBufferObject.cpp diff --git a/src/guilib/FrameBufferObject.h b/xbmc/guilib/FrameBufferObject.h similarity index 100% rename from src/guilib/FrameBufferObject.h rename to xbmc/guilib/FrameBufferObject.h diff --git a/src/guilib/GUIAction.cpp b/xbmc/guilib/GUIAction.cpp similarity index 100% rename from src/guilib/GUIAction.cpp rename to xbmc/guilib/GUIAction.cpp diff --git a/src/guilib/GUIAction.h b/xbmc/guilib/GUIAction.h similarity index 100% rename from src/guilib/GUIAction.h rename to xbmc/guilib/GUIAction.h diff --git a/src/guilib/GUIAudioManager.cpp b/xbmc/guilib/GUIAudioManager.cpp similarity index 100% rename from src/guilib/GUIAudioManager.cpp rename to xbmc/guilib/GUIAudioManager.cpp diff --git a/src/guilib/GUIAudioManager.h b/xbmc/guilib/GUIAudioManager.h similarity index 100% rename from src/guilib/GUIAudioManager.h rename to xbmc/guilib/GUIAudioManager.h diff --git a/src/guilib/GUIBaseContainer.cpp b/xbmc/guilib/GUIBaseContainer.cpp similarity index 100% rename from src/guilib/GUIBaseContainer.cpp rename to xbmc/guilib/GUIBaseContainer.cpp diff --git a/src/guilib/GUIBaseContainer.h b/xbmc/guilib/GUIBaseContainer.h similarity index 100% rename from src/guilib/GUIBaseContainer.h rename to xbmc/guilib/GUIBaseContainer.h diff --git a/src/guilib/GUIBorderedImage.cpp b/xbmc/guilib/GUIBorderedImage.cpp similarity index 100% rename from src/guilib/GUIBorderedImage.cpp rename to xbmc/guilib/GUIBorderedImage.cpp diff --git a/src/guilib/GUIBorderedImage.h b/xbmc/guilib/GUIBorderedImage.h similarity index 100% rename from src/guilib/GUIBorderedImage.h rename to xbmc/guilib/GUIBorderedImage.h diff --git a/src/guilib/GUIButtonControl.cpp b/xbmc/guilib/GUIButtonControl.cpp similarity index 100% rename from src/guilib/GUIButtonControl.cpp rename to xbmc/guilib/GUIButtonControl.cpp diff --git a/src/guilib/GUIButtonControl.h b/xbmc/guilib/GUIButtonControl.h similarity index 100% rename from src/guilib/GUIButtonControl.h rename to xbmc/guilib/GUIButtonControl.h diff --git a/src/guilib/GUICallback.h b/xbmc/guilib/GUICallback.h similarity index 100% rename from src/guilib/GUICallback.h rename to xbmc/guilib/GUICallback.h diff --git a/src/guilib/GUICheckMarkControl.cpp b/xbmc/guilib/GUICheckMarkControl.cpp similarity index 100% rename from src/guilib/GUICheckMarkControl.cpp rename to xbmc/guilib/GUICheckMarkControl.cpp diff --git a/src/guilib/GUICheckMarkControl.h b/xbmc/guilib/GUICheckMarkControl.h similarity index 100% rename from src/guilib/GUICheckMarkControl.h rename to xbmc/guilib/GUICheckMarkControl.h diff --git a/src/guilib/GUIColorManager.cpp b/xbmc/guilib/GUIColorManager.cpp similarity index 100% rename from src/guilib/GUIColorManager.cpp rename to xbmc/guilib/GUIColorManager.cpp diff --git a/src/guilib/GUIColorManager.h b/xbmc/guilib/GUIColorManager.h similarity index 100% rename from src/guilib/GUIColorManager.h rename to xbmc/guilib/GUIColorManager.h diff --git a/src/guilib/GUIControl.cpp b/xbmc/guilib/GUIControl.cpp similarity index 100% rename from src/guilib/GUIControl.cpp rename to xbmc/guilib/GUIControl.cpp diff --git a/src/guilib/GUIControl.h b/xbmc/guilib/GUIControl.h similarity index 100% rename from src/guilib/GUIControl.h rename to xbmc/guilib/GUIControl.h diff --git a/src/guilib/GUIControlFactory.cpp b/xbmc/guilib/GUIControlFactory.cpp similarity index 100% rename from src/guilib/GUIControlFactory.cpp rename to xbmc/guilib/GUIControlFactory.cpp diff --git a/src/guilib/GUIControlFactory.h b/xbmc/guilib/GUIControlFactory.h similarity index 100% rename from src/guilib/GUIControlFactory.h rename to xbmc/guilib/GUIControlFactory.h diff --git a/src/guilib/GUIControlGroup.cpp b/xbmc/guilib/GUIControlGroup.cpp similarity index 100% rename from src/guilib/GUIControlGroup.cpp rename to xbmc/guilib/GUIControlGroup.cpp diff --git a/src/guilib/GUIControlGroup.h b/xbmc/guilib/GUIControlGroup.h similarity index 100% rename from src/guilib/GUIControlGroup.h rename to xbmc/guilib/GUIControlGroup.h diff --git a/src/guilib/GUIControlGroupList.cpp b/xbmc/guilib/GUIControlGroupList.cpp similarity index 100% rename from src/guilib/GUIControlGroupList.cpp rename to xbmc/guilib/GUIControlGroupList.cpp diff --git a/src/guilib/GUIControlGroupList.h b/xbmc/guilib/GUIControlGroupList.h similarity index 100% rename from src/guilib/GUIControlGroupList.h rename to xbmc/guilib/GUIControlGroupList.h diff --git a/src/guilib/GUIControlProfiler.cpp b/xbmc/guilib/GUIControlProfiler.cpp similarity index 100% rename from src/guilib/GUIControlProfiler.cpp rename to xbmc/guilib/GUIControlProfiler.cpp diff --git a/src/guilib/GUIControlProfiler.h b/xbmc/guilib/GUIControlProfiler.h similarity index 100% rename from src/guilib/GUIControlProfiler.h rename to xbmc/guilib/GUIControlProfiler.h diff --git a/src/guilib/GUIDialog.cpp b/xbmc/guilib/GUIDialog.cpp similarity index 100% rename from src/guilib/GUIDialog.cpp rename to xbmc/guilib/GUIDialog.cpp diff --git a/src/guilib/GUIDialog.h b/xbmc/guilib/GUIDialog.h similarity index 100% rename from src/guilib/GUIDialog.h rename to xbmc/guilib/GUIDialog.h diff --git a/src/guilib/GUIEditControl.cpp b/xbmc/guilib/GUIEditControl.cpp similarity index 100% rename from src/guilib/GUIEditControl.cpp rename to xbmc/guilib/GUIEditControl.cpp diff --git a/src/guilib/GUIEditControl.h b/xbmc/guilib/GUIEditControl.h similarity index 100% rename from src/guilib/GUIEditControl.h rename to xbmc/guilib/GUIEditControl.h diff --git a/src/guilib/GUIFadeLabelControl.cpp b/xbmc/guilib/GUIFadeLabelControl.cpp similarity index 100% rename from src/guilib/GUIFadeLabelControl.cpp rename to xbmc/guilib/GUIFadeLabelControl.cpp diff --git a/src/guilib/GUIFadeLabelControl.h b/xbmc/guilib/GUIFadeLabelControl.h similarity index 100% rename from src/guilib/GUIFadeLabelControl.h rename to xbmc/guilib/GUIFadeLabelControl.h diff --git a/src/guilib/GUIFixedListContainer.cpp b/xbmc/guilib/GUIFixedListContainer.cpp similarity index 100% rename from src/guilib/GUIFixedListContainer.cpp rename to xbmc/guilib/GUIFixedListContainer.cpp diff --git a/src/guilib/GUIFixedListContainer.h b/xbmc/guilib/GUIFixedListContainer.h similarity index 100% rename from src/guilib/GUIFixedListContainer.h rename to xbmc/guilib/GUIFixedListContainer.h diff --git a/src/guilib/GUIFont.cpp b/xbmc/guilib/GUIFont.cpp similarity index 100% rename from src/guilib/GUIFont.cpp rename to xbmc/guilib/GUIFont.cpp diff --git a/src/guilib/GUIFont.h b/xbmc/guilib/GUIFont.h similarity index 100% rename from src/guilib/GUIFont.h rename to xbmc/guilib/GUIFont.h diff --git a/src/guilib/GUIFontManager.cpp b/xbmc/guilib/GUIFontManager.cpp similarity index 100% rename from src/guilib/GUIFontManager.cpp rename to xbmc/guilib/GUIFontManager.cpp diff --git a/src/guilib/GUIFontManager.h b/xbmc/guilib/GUIFontManager.h similarity index 100% rename from src/guilib/GUIFontManager.h rename to xbmc/guilib/GUIFontManager.h diff --git a/src/guilib/GUIFontTTF.cpp b/xbmc/guilib/GUIFontTTF.cpp similarity index 100% rename from src/guilib/GUIFontTTF.cpp rename to xbmc/guilib/GUIFontTTF.cpp diff --git a/src/guilib/GUIFontTTF.h b/xbmc/guilib/GUIFontTTF.h similarity index 100% rename from src/guilib/GUIFontTTF.h rename to xbmc/guilib/GUIFontTTF.h diff --git a/src/guilib/GUIFontTTFDX.cpp b/xbmc/guilib/GUIFontTTFDX.cpp similarity index 100% rename from src/guilib/GUIFontTTFDX.cpp rename to xbmc/guilib/GUIFontTTFDX.cpp diff --git a/src/guilib/GUIFontTTFDX.h b/xbmc/guilib/GUIFontTTFDX.h similarity index 100% rename from src/guilib/GUIFontTTFDX.h rename to xbmc/guilib/GUIFontTTFDX.h diff --git a/src/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp similarity index 100% rename from src/guilib/GUIFontTTFGL.cpp rename to xbmc/guilib/GUIFontTTFGL.cpp diff --git a/src/guilib/GUIFontTTFGL.h b/xbmc/guilib/GUIFontTTFGL.h similarity index 100% rename from src/guilib/GUIFontTTFGL.h rename to xbmc/guilib/GUIFontTTFGL.h diff --git a/src/guilib/GUIImage.cpp b/xbmc/guilib/GUIImage.cpp similarity index 100% rename from src/guilib/GUIImage.cpp rename to xbmc/guilib/GUIImage.cpp diff --git a/src/guilib/GUIImage.h b/xbmc/guilib/GUIImage.h similarity index 100% rename from src/guilib/GUIImage.h rename to xbmc/guilib/GUIImage.h diff --git a/src/guilib/GUIIncludes.cpp b/xbmc/guilib/GUIIncludes.cpp similarity index 100% rename from src/guilib/GUIIncludes.cpp rename to xbmc/guilib/GUIIncludes.cpp diff --git a/src/guilib/GUIIncludes.h b/xbmc/guilib/GUIIncludes.h similarity index 100% rename from src/guilib/GUIIncludes.h rename to xbmc/guilib/GUIIncludes.h diff --git a/src/guilib/GUIInfoTypes.cpp b/xbmc/guilib/GUIInfoTypes.cpp similarity index 100% rename from src/guilib/GUIInfoTypes.cpp rename to xbmc/guilib/GUIInfoTypes.cpp diff --git a/src/guilib/GUIInfoTypes.h b/xbmc/guilib/GUIInfoTypes.h similarity index 100% rename from src/guilib/GUIInfoTypes.h rename to xbmc/guilib/GUIInfoTypes.h diff --git a/src/guilib/GUIKeyboard.h b/xbmc/guilib/GUIKeyboard.h similarity index 100% rename from src/guilib/GUIKeyboard.h rename to xbmc/guilib/GUIKeyboard.h diff --git a/src/guilib/GUIKeyboardFactory.cpp b/xbmc/guilib/GUIKeyboardFactory.cpp similarity index 100% rename from src/guilib/GUIKeyboardFactory.cpp rename to xbmc/guilib/GUIKeyboardFactory.cpp diff --git a/src/guilib/GUIKeyboardFactory.h b/xbmc/guilib/GUIKeyboardFactory.h similarity index 100% rename from src/guilib/GUIKeyboardFactory.h rename to xbmc/guilib/GUIKeyboardFactory.h diff --git a/src/guilib/GUILabel.cpp b/xbmc/guilib/GUILabel.cpp similarity index 100% rename from src/guilib/GUILabel.cpp rename to xbmc/guilib/GUILabel.cpp diff --git a/src/guilib/GUILabel.h b/xbmc/guilib/GUILabel.h similarity index 100% rename from src/guilib/GUILabel.h rename to xbmc/guilib/GUILabel.h diff --git a/src/guilib/GUILabelControl.cpp b/xbmc/guilib/GUILabelControl.cpp similarity index 100% rename from src/guilib/GUILabelControl.cpp rename to xbmc/guilib/GUILabelControl.cpp diff --git a/src/guilib/GUILabelControl.h b/xbmc/guilib/GUILabelControl.h similarity index 100% rename from src/guilib/GUILabelControl.h rename to xbmc/guilib/GUILabelControl.h diff --git a/src/guilib/GUIListContainer.cpp b/xbmc/guilib/GUIListContainer.cpp similarity index 100% rename from src/guilib/GUIListContainer.cpp rename to xbmc/guilib/GUIListContainer.cpp diff --git a/src/guilib/GUIListContainer.h b/xbmc/guilib/GUIListContainer.h similarity index 100% rename from src/guilib/GUIListContainer.h rename to xbmc/guilib/GUIListContainer.h diff --git a/src/guilib/GUIListGroup.cpp b/xbmc/guilib/GUIListGroup.cpp similarity index 100% rename from src/guilib/GUIListGroup.cpp rename to xbmc/guilib/GUIListGroup.cpp diff --git a/src/guilib/GUIListGroup.h b/xbmc/guilib/GUIListGroup.h similarity index 100% rename from src/guilib/GUIListGroup.h rename to xbmc/guilib/GUIListGroup.h diff --git a/src/guilib/GUIListItem.cpp b/xbmc/guilib/GUIListItem.cpp similarity index 100% rename from src/guilib/GUIListItem.cpp rename to xbmc/guilib/GUIListItem.cpp diff --git a/src/guilib/GUIListItem.h b/xbmc/guilib/GUIListItem.h similarity index 100% rename from src/guilib/GUIListItem.h rename to xbmc/guilib/GUIListItem.h diff --git a/src/guilib/GUIListItemLayout.cpp b/xbmc/guilib/GUIListItemLayout.cpp similarity index 100% rename from src/guilib/GUIListItemLayout.cpp rename to xbmc/guilib/GUIListItemLayout.cpp diff --git a/src/guilib/GUIListItemLayout.h b/xbmc/guilib/GUIListItemLayout.h similarity index 100% rename from src/guilib/GUIListItemLayout.h rename to xbmc/guilib/GUIListItemLayout.h diff --git a/src/guilib/GUIListLabel.cpp b/xbmc/guilib/GUIListLabel.cpp similarity index 100% rename from src/guilib/GUIListLabel.cpp rename to xbmc/guilib/GUIListLabel.cpp diff --git a/src/guilib/GUIListLabel.h b/xbmc/guilib/GUIListLabel.h similarity index 100% rename from src/guilib/GUIListLabel.h rename to xbmc/guilib/GUIListLabel.h diff --git a/src/guilib/GUIMessage.cpp b/xbmc/guilib/GUIMessage.cpp similarity index 100% rename from src/guilib/GUIMessage.cpp rename to xbmc/guilib/GUIMessage.cpp diff --git a/src/guilib/GUIMessage.h b/xbmc/guilib/GUIMessage.h similarity index 100% rename from src/guilib/GUIMessage.h rename to xbmc/guilib/GUIMessage.h diff --git a/src/guilib/GUIMoverControl.cpp b/xbmc/guilib/GUIMoverControl.cpp similarity index 100% rename from src/guilib/GUIMoverControl.cpp rename to xbmc/guilib/GUIMoverControl.cpp diff --git a/src/guilib/GUIMoverControl.h b/xbmc/guilib/GUIMoverControl.h similarity index 100% rename from src/guilib/GUIMoverControl.h rename to xbmc/guilib/GUIMoverControl.h diff --git a/src/guilib/GUIMultiImage.cpp b/xbmc/guilib/GUIMultiImage.cpp similarity index 100% rename from src/guilib/GUIMultiImage.cpp rename to xbmc/guilib/GUIMultiImage.cpp diff --git a/src/guilib/GUIMultiImage.h b/xbmc/guilib/GUIMultiImage.h similarity index 100% rename from src/guilib/GUIMultiImage.h rename to xbmc/guilib/GUIMultiImage.h diff --git a/src/guilib/GUIMultiSelectText.cpp b/xbmc/guilib/GUIMultiSelectText.cpp similarity index 100% rename from src/guilib/GUIMultiSelectText.cpp rename to xbmc/guilib/GUIMultiSelectText.cpp diff --git a/src/guilib/GUIMultiSelectText.h b/xbmc/guilib/GUIMultiSelectText.h similarity index 100% rename from src/guilib/GUIMultiSelectText.h rename to xbmc/guilib/GUIMultiSelectText.h diff --git a/src/guilib/GUIPanelContainer.cpp b/xbmc/guilib/GUIPanelContainer.cpp similarity index 100% rename from src/guilib/GUIPanelContainer.cpp rename to xbmc/guilib/GUIPanelContainer.cpp diff --git a/src/guilib/GUIPanelContainer.h b/xbmc/guilib/GUIPanelContainer.h similarity index 100% rename from src/guilib/GUIPanelContainer.h rename to xbmc/guilib/GUIPanelContainer.h diff --git a/src/guilib/GUIProgressControl.cpp b/xbmc/guilib/GUIProgressControl.cpp similarity index 100% rename from src/guilib/GUIProgressControl.cpp rename to xbmc/guilib/GUIProgressControl.cpp diff --git a/src/guilib/GUIProgressControl.h b/xbmc/guilib/GUIProgressControl.h similarity index 100% rename from src/guilib/GUIProgressControl.h rename to xbmc/guilib/GUIProgressControl.h diff --git a/src/guilib/GUIRSSControl.cpp b/xbmc/guilib/GUIRSSControl.cpp similarity index 100% rename from src/guilib/GUIRSSControl.cpp rename to xbmc/guilib/GUIRSSControl.cpp diff --git a/src/guilib/GUIRSSControl.h b/xbmc/guilib/GUIRSSControl.h similarity index 100% rename from src/guilib/GUIRSSControl.h rename to xbmc/guilib/GUIRSSControl.h diff --git a/src/guilib/GUIRadioButtonControl.cpp b/xbmc/guilib/GUIRadioButtonControl.cpp similarity index 100% rename from src/guilib/GUIRadioButtonControl.cpp rename to xbmc/guilib/GUIRadioButtonControl.cpp diff --git a/src/guilib/GUIRadioButtonControl.h b/xbmc/guilib/GUIRadioButtonControl.h similarity index 100% rename from src/guilib/GUIRadioButtonControl.h rename to xbmc/guilib/GUIRadioButtonControl.h diff --git a/src/guilib/GUIRenderingControl.cpp b/xbmc/guilib/GUIRenderingControl.cpp similarity index 100% rename from src/guilib/GUIRenderingControl.cpp rename to xbmc/guilib/GUIRenderingControl.cpp diff --git a/src/guilib/GUIRenderingControl.h b/xbmc/guilib/GUIRenderingControl.h similarity index 100% rename from src/guilib/GUIRenderingControl.h rename to xbmc/guilib/GUIRenderingControl.h diff --git a/src/guilib/GUIResizeControl.cpp b/xbmc/guilib/GUIResizeControl.cpp similarity index 100% rename from src/guilib/GUIResizeControl.cpp rename to xbmc/guilib/GUIResizeControl.cpp diff --git a/src/guilib/GUIResizeControl.h b/xbmc/guilib/GUIResizeControl.h similarity index 100% rename from src/guilib/GUIResizeControl.h rename to xbmc/guilib/GUIResizeControl.h diff --git a/src/guilib/GUIScrollBarControl.cpp b/xbmc/guilib/GUIScrollBarControl.cpp similarity index 100% rename from src/guilib/GUIScrollBarControl.cpp rename to xbmc/guilib/GUIScrollBarControl.cpp diff --git a/src/guilib/GUIScrollBarControl.h b/xbmc/guilib/GUIScrollBarControl.h similarity index 100% rename from src/guilib/GUIScrollBarControl.h rename to xbmc/guilib/GUIScrollBarControl.h diff --git a/src/guilib/GUISelectButtonControl.cpp b/xbmc/guilib/GUISelectButtonControl.cpp similarity index 100% rename from src/guilib/GUISelectButtonControl.cpp rename to xbmc/guilib/GUISelectButtonControl.cpp diff --git a/src/guilib/GUISelectButtonControl.h b/xbmc/guilib/GUISelectButtonControl.h similarity index 100% rename from src/guilib/GUISelectButtonControl.h rename to xbmc/guilib/GUISelectButtonControl.h diff --git a/src/guilib/GUISettingsSliderControl.cpp b/xbmc/guilib/GUISettingsSliderControl.cpp similarity index 100% rename from src/guilib/GUISettingsSliderControl.cpp rename to xbmc/guilib/GUISettingsSliderControl.cpp diff --git a/src/guilib/GUISettingsSliderControl.h b/xbmc/guilib/GUISettingsSliderControl.h similarity index 100% rename from src/guilib/GUISettingsSliderControl.h rename to xbmc/guilib/GUISettingsSliderControl.h diff --git a/src/guilib/GUIShader.cpp b/xbmc/guilib/GUIShader.cpp similarity index 100% rename from src/guilib/GUIShader.cpp rename to xbmc/guilib/GUIShader.cpp diff --git a/src/guilib/GUIShader.h b/xbmc/guilib/GUIShader.h similarity index 100% rename from src/guilib/GUIShader.h rename to xbmc/guilib/GUIShader.h diff --git a/src/guilib/GUISliderControl.cpp b/xbmc/guilib/GUISliderControl.cpp similarity index 100% rename from src/guilib/GUISliderControl.cpp rename to xbmc/guilib/GUISliderControl.cpp diff --git a/src/guilib/GUISliderControl.h b/xbmc/guilib/GUISliderControl.h similarity index 100% rename from src/guilib/GUISliderControl.h rename to xbmc/guilib/GUISliderControl.h diff --git a/src/guilib/GUISpinControl.cpp b/xbmc/guilib/GUISpinControl.cpp similarity index 100% rename from src/guilib/GUISpinControl.cpp rename to xbmc/guilib/GUISpinControl.cpp diff --git a/src/guilib/GUISpinControl.h b/xbmc/guilib/GUISpinControl.h similarity index 100% rename from src/guilib/GUISpinControl.h rename to xbmc/guilib/GUISpinControl.h diff --git a/src/guilib/GUISpinControlEx.cpp b/xbmc/guilib/GUISpinControlEx.cpp similarity index 100% rename from src/guilib/GUISpinControlEx.cpp rename to xbmc/guilib/GUISpinControlEx.cpp diff --git a/src/guilib/GUISpinControlEx.h b/xbmc/guilib/GUISpinControlEx.h similarity index 100% rename from src/guilib/GUISpinControlEx.h rename to xbmc/guilib/GUISpinControlEx.h diff --git a/src/guilib/GUIStaticItem.cpp b/xbmc/guilib/GUIStaticItem.cpp similarity index 100% rename from src/guilib/GUIStaticItem.cpp rename to xbmc/guilib/GUIStaticItem.cpp diff --git a/src/guilib/GUIStaticItem.h b/xbmc/guilib/GUIStaticItem.h similarity index 100% rename from src/guilib/GUIStaticItem.h rename to xbmc/guilib/GUIStaticItem.h diff --git a/src/guilib/GUITextBox.cpp b/xbmc/guilib/GUITextBox.cpp similarity index 100% rename from src/guilib/GUITextBox.cpp rename to xbmc/guilib/GUITextBox.cpp diff --git a/src/guilib/GUITextBox.h b/xbmc/guilib/GUITextBox.h similarity index 100% rename from src/guilib/GUITextBox.h rename to xbmc/guilib/GUITextBox.h diff --git a/src/guilib/GUITextLayout.cpp b/xbmc/guilib/GUITextLayout.cpp similarity index 100% rename from src/guilib/GUITextLayout.cpp rename to xbmc/guilib/GUITextLayout.cpp diff --git a/src/guilib/GUITextLayout.h b/xbmc/guilib/GUITextLayout.h similarity index 100% rename from src/guilib/GUITextLayout.h rename to xbmc/guilib/GUITextLayout.h diff --git a/src/guilib/GUITexture.cpp b/xbmc/guilib/GUITexture.cpp similarity index 100% rename from src/guilib/GUITexture.cpp rename to xbmc/guilib/GUITexture.cpp diff --git a/src/guilib/GUITexture.h b/xbmc/guilib/GUITexture.h similarity index 100% rename from src/guilib/GUITexture.h rename to xbmc/guilib/GUITexture.h diff --git a/src/guilib/GUITextureD3D.cpp b/xbmc/guilib/GUITextureD3D.cpp similarity index 100% rename from src/guilib/GUITextureD3D.cpp rename to xbmc/guilib/GUITextureD3D.cpp diff --git a/src/guilib/GUITextureD3D.h b/xbmc/guilib/GUITextureD3D.h similarity index 100% rename from src/guilib/GUITextureD3D.h rename to xbmc/guilib/GUITextureD3D.h diff --git a/src/guilib/GUITextureGL.cpp b/xbmc/guilib/GUITextureGL.cpp similarity index 100% rename from src/guilib/GUITextureGL.cpp rename to xbmc/guilib/GUITextureGL.cpp diff --git a/src/guilib/GUITextureGL.h b/xbmc/guilib/GUITextureGL.h similarity index 100% rename from src/guilib/GUITextureGL.h rename to xbmc/guilib/GUITextureGL.h diff --git a/src/guilib/GUITextureGLES.cpp b/xbmc/guilib/GUITextureGLES.cpp similarity index 100% rename from src/guilib/GUITextureGLES.cpp rename to xbmc/guilib/GUITextureGLES.cpp diff --git a/src/guilib/GUITextureGLES.h b/xbmc/guilib/GUITextureGLES.h similarity index 100% rename from src/guilib/GUITextureGLES.h rename to xbmc/guilib/GUITextureGLES.h diff --git a/src/guilib/GUIToggleButtonControl.cpp b/xbmc/guilib/GUIToggleButtonControl.cpp similarity index 100% rename from src/guilib/GUIToggleButtonControl.cpp rename to xbmc/guilib/GUIToggleButtonControl.cpp diff --git a/src/guilib/GUIToggleButtonControl.h b/xbmc/guilib/GUIToggleButtonControl.h similarity index 100% rename from src/guilib/GUIToggleButtonControl.h rename to xbmc/guilib/GUIToggleButtonControl.h diff --git a/src/guilib/GUIVideoControl.cpp b/xbmc/guilib/GUIVideoControl.cpp similarity index 100% rename from src/guilib/GUIVideoControl.cpp rename to xbmc/guilib/GUIVideoControl.cpp diff --git a/src/guilib/GUIVideoControl.h b/xbmc/guilib/GUIVideoControl.h similarity index 100% rename from src/guilib/GUIVideoControl.h rename to xbmc/guilib/GUIVideoControl.h diff --git a/src/guilib/GUIVisualisationControl.cpp b/xbmc/guilib/GUIVisualisationControl.cpp similarity index 100% rename from src/guilib/GUIVisualisationControl.cpp rename to xbmc/guilib/GUIVisualisationControl.cpp diff --git a/src/guilib/GUIVisualisationControl.h b/xbmc/guilib/GUIVisualisationControl.h similarity index 100% rename from src/guilib/GUIVisualisationControl.h rename to xbmc/guilib/GUIVisualisationControl.h diff --git a/src/guilib/GUIWindow.cpp b/xbmc/guilib/GUIWindow.cpp similarity index 100% rename from src/guilib/GUIWindow.cpp rename to xbmc/guilib/GUIWindow.cpp diff --git a/src/guilib/GUIWindow.h b/xbmc/guilib/GUIWindow.h similarity index 100% rename from src/guilib/GUIWindow.h rename to xbmc/guilib/GUIWindow.h diff --git a/src/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp similarity index 100% rename from src/guilib/GUIWindowManager.cpp rename to xbmc/guilib/GUIWindowManager.cpp diff --git a/src/guilib/GUIWindowManager.h b/xbmc/guilib/GUIWindowManager.h similarity index 100% rename from src/guilib/GUIWindowManager.h rename to xbmc/guilib/GUIWindowManager.h diff --git a/src/guilib/GUIWrappingListContainer.cpp b/xbmc/guilib/GUIWrappingListContainer.cpp similarity index 100% rename from src/guilib/GUIWrappingListContainer.cpp rename to xbmc/guilib/GUIWrappingListContainer.cpp diff --git a/src/guilib/GUIWrappingListContainer.h b/xbmc/guilib/GUIWrappingListContainer.h similarity index 100% rename from src/guilib/GUIWrappingListContainer.h rename to xbmc/guilib/GUIWrappingListContainer.h diff --git a/src/guilib/Geometry.h b/xbmc/guilib/Geometry.h similarity index 100% rename from src/guilib/Geometry.h rename to xbmc/guilib/Geometry.h diff --git a/src/guilib/GraphicContext.cpp b/xbmc/guilib/GraphicContext.cpp similarity index 100% rename from src/guilib/GraphicContext.cpp rename to xbmc/guilib/GraphicContext.cpp diff --git a/src/guilib/GraphicContext.h b/xbmc/guilib/GraphicContext.h similarity index 100% rename from src/guilib/GraphicContext.h rename to xbmc/guilib/GraphicContext.h diff --git a/src/guilib/IAudioDeviceChangedCallback.h b/xbmc/guilib/IAudioDeviceChangedCallback.h similarity index 100% rename from src/guilib/IAudioDeviceChangedCallback.h rename to xbmc/guilib/IAudioDeviceChangedCallback.h diff --git a/src/guilib/IDirtyRegionSolver.h b/xbmc/guilib/IDirtyRegionSolver.h similarity index 100% rename from src/guilib/IDirtyRegionSolver.h rename to xbmc/guilib/IDirtyRegionSolver.h diff --git a/src/guilib/IGUIContainer.h b/xbmc/guilib/IGUIContainer.h similarity index 100% rename from src/guilib/IGUIContainer.h rename to xbmc/guilib/IGUIContainer.h diff --git a/src/guilib/IMsgTargetCallback.h b/xbmc/guilib/IMsgTargetCallback.h similarity index 100% rename from src/guilib/IMsgTargetCallback.h rename to xbmc/guilib/IMsgTargetCallback.h diff --git a/src/guilib/IRenderingCallback.h b/xbmc/guilib/IRenderingCallback.h similarity index 100% rename from src/guilib/IRenderingCallback.h rename to xbmc/guilib/IRenderingCallback.h diff --git a/src/guilib/ISliderCallback.h b/xbmc/guilib/ISliderCallback.h similarity index 100% rename from src/guilib/ISliderCallback.h rename to xbmc/guilib/ISliderCallback.h diff --git a/src/guilib/IWindowManagerCallback.cpp b/xbmc/guilib/IWindowManagerCallback.cpp similarity index 100% rename from src/guilib/IWindowManagerCallback.cpp rename to xbmc/guilib/IWindowManagerCallback.cpp diff --git a/src/guilib/IWindowManagerCallback.h b/xbmc/guilib/IWindowManagerCallback.h similarity index 100% rename from src/guilib/IWindowManagerCallback.h rename to xbmc/guilib/IWindowManagerCallback.h diff --git a/src/guilib/JpegIO.cpp b/xbmc/guilib/JpegIO.cpp similarity index 100% rename from src/guilib/JpegIO.cpp rename to xbmc/guilib/JpegIO.cpp diff --git a/src/guilib/JpegIO.h b/xbmc/guilib/JpegIO.h similarity index 100% rename from src/guilib/JpegIO.h rename to xbmc/guilib/JpegIO.h diff --git a/src/guilib/Key.cpp b/xbmc/guilib/Key.cpp similarity index 100% rename from src/guilib/Key.cpp rename to xbmc/guilib/Key.cpp diff --git a/src/guilib/Key.h b/xbmc/guilib/Key.h similarity index 100% rename from src/guilib/Key.h rename to xbmc/guilib/Key.h diff --git a/src/guilib/LocalizeStrings.cpp b/xbmc/guilib/LocalizeStrings.cpp similarity index 100% rename from src/guilib/LocalizeStrings.cpp rename to xbmc/guilib/LocalizeStrings.cpp diff --git a/src/guilib/LocalizeStrings.h b/xbmc/guilib/LocalizeStrings.h similarity index 100% rename from src/guilib/LocalizeStrings.h rename to xbmc/guilib/LocalizeStrings.h diff --git a/src/guilib/Makefile.in b/xbmc/guilib/Makefile.in similarity index 100% rename from src/guilib/Makefile.in rename to xbmc/guilib/Makefile.in diff --git a/src/guilib/MatrixGLES.cpp b/xbmc/guilib/MatrixGLES.cpp similarity index 100% rename from src/guilib/MatrixGLES.cpp rename to xbmc/guilib/MatrixGLES.cpp diff --git a/src/guilib/MatrixGLES.h b/xbmc/guilib/MatrixGLES.h similarity index 100% rename from src/guilib/MatrixGLES.h rename to xbmc/guilib/MatrixGLES.h diff --git a/src/guilib/Resolution.h b/xbmc/guilib/Resolution.h similarity index 100% rename from src/guilib/Resolution.h rename to xbmc/guilib/Resolution.h diff --git a/src/guilib/Shader.cpp b/xbmc/guilib/Shader.cpp similarity index 100% rename from src/guilib/Shader.cpp rename to xbmc/guilib/Shader.cpp diff --git a/src/guilib/Shader.h b/xbmc/guilib/Shader.h similarity index 100% rename from src/guilib/Shader.h rename to xbmc/guilib/Shader.h diff --git a/src/guilib/StereoscopicsManager.cpp b/xbmc/guilib/StereoscopicsManager.cpp similarity index 100% rename from src/guilib/StereoscopicsManager.cpp rename to xbmc/guilib/StereoscopicsManager.cpp diff --git a/src/guilib/StereoscopicsManager.h b/xbmc/guilib/StereoscopicsManager.h similarity index 100% rename from src/guilib/StereoscopicsManager.h rename to xbmc/guilib/StereoscopicsManager.h diff --git a/src/guilib/Texture.cpp b/xbmc/guilib/Texture.cpp similarity index 100% rename from src/guilib/Texture.cpp rename to xbmc/guilib/Texture.cpp diff --git a/src/guilib/Texture.h b/xbmc/guilib/Texture.h similarity index 100% rename from src/guilib/Texture.h rename to xbmc/guilib/Texture.h diff --git a/src/guilib/TextureBundle.cpp b/xbmc/guilib/TextureBundle.cpp similarity index 100% rename from src/guilib/TextureBundle.cpp rename to xbmc/guilib/TextureBundle.cpp diff --git a/src/guilib/TextureBundle.h b/xbmc/guilib/TextureBundle.h similarity index 100% rename from src/guilib/TextureBundle.h rename to xbmc/guilib/TextureBundle.h diff --git a/src/guilib/TextureBundleXBT.cpp b/xbmc/guilib/TextureBundleXBT.cpp similarity index 100% rename from src/guilib/TextureBundleXBT.cpp rename to xbmc/guilib/TextureBundleXBT.cpp diff --git a/src/guilib/TextureBundleXBT.h b/xbmc/guilib/TextureBundleXBT.h similarity index 100% rename from src/guilib/TextureBundleXBT.h rename to xbmc/guilib/TextureBundleXBT.h diff --git a/src/guilib/TextureBundleXPR.cpp b/xbmc/guilib/TextureBundleXPR.cpp similarity index 100% rename from src/guilib/TextureBundleXPR.cpp rename to xbmc/guilib/TextureBundleXPR.cpp diff --git a/src/guilib/TextureBundleXPR.h b/xbmc/guilib/TextureBundleXPR.h similarity index 100% rename from src/guilib/TextureBundleXPR.h rename to xbmc/guilib/TextureBundleXPR.h diff --git a/src/guilib/TextureDX.cpp b/xbmc/guilib/TextureDX.cpp similarity index 100% rename from src/guilib/TextureDX.cpp rename to xbmc/guilib/TextureDX.cpp diff --git a/src/guilib/TextureDX.h b/xbmc/guilib/TextureDX.h similarity index 100% rename from src/guilib/TextureDX.h rename to xbmc/guilib/TextureDX.h diff --git a/src/guilib/TextureGL.cpp b/xbmc/guilib/TextureGL.cpp similarity index 100% rename from src/guilib/TextureGL.cpp rename to xbmc/guilib/TextureGL.cpp diff --git a/src/guilib/TextureGL.h b/xbmc/guilib/TextureGL.h similarity index 100% rename from src/guilib/TextureGL.h rename to xbmc/guilib/TextureGL.h diff --git a/src/guilib/TextureManager.cpp b/xbmc/guilib/TextureManager.cpp similarity index 100% rename from src/guilib/TextureManager.cpp rename to xbmc/guilib/TextureManager.cpp diff --git a/src/guilib/TextureManager.h b/xbmc/guilib/TextureManager.h similarity index 100% rename from src/guilib/TextureManager.h rename to xbmc/guilib/TextureManager.h diff --git a/src/guilib/TexturePi.cpp b/xbmc/guilib/TexturePi.cpp similarity index 100% rename from src/guilib/TexturePi.cpp rename to xbmc/guilib/TexturePi.cpp diff --git a/src/guilib/TexturePi.h b/xbmc/guilib/TexturePi.h similarity index 100% rename from src/guilib/TexturePi.h rename to xbmc/guilib/TexturePi.h diff --git a/src/guilib/TransformMatrix.h b/xbmc/guilib/TransformMatrix.h similarity index 100% rename from src/guilib/TransformMatrix.h rename to xbmc/guilib/TransformMatrix.h diff --git a/src/guilib/Tween.h b/xbmc/guilib/Tween.h similarity index 100% rename from src/guilib/Tween.h rename to xbmc/guilib/Tween.h diff --git a/src/guilib/VisibleEffect.cpp b/xbmc/guilib/VisibleEffect.cpp similarity index 100% rename from src/guilib/VisibleEffect.cpp rename to xbmc/guilib/VisibleEffect.cpp diff --git a/src/guilib/VisibleEffect.h b/xbmc/guilib/VisibleEffect.h similarity index 100% rename from src/guilib/VisibleEffect.h rename to xbmc/guilib/VisibleEffect.h diff --git a/src/guilib/WindowIDs.h b/xbmc/guilib/WindowIDs.h similarity index 100% rename from src/guilib/WindowIDs.h rename to xbmc/guilib/WindowIDs.h diff --git a/src/guilib/XBTF.cpp b/xbmc/guilib/XBTF.cpp similarity index 100% rename from src/guilib/XBTF.cpp rename to xbmc/guilib/XBTF.cpp diff --git a/src/guilib/XBTF.h b/xbmc/guilib/XBTF.h similarity index 100% rename from src/guilib/XBTF.h rename to xbmc/guilib/XBTF.h diff --git a/src/guilib/XBTFReader.cpp b/xbmc/guilib/XBTFReader.cpp similarity index 100% rename from src/guilib/XBTFReader.cpp rename to xbmc/guilib/XBTFReader.cpp diff --git a/src/guilib/XBTFReader.h b/xbmc/guilib/XBTFReader.h similarity index 100% rename from src/guilib/XBTFReader.h rename to xbmc/guilib/XBTFReader.h diff --git a/src/guilib/cximage.cpp b/xbmc/guilib/cximage.cpp similarity index 100% rename from src/guilib/cximage.cpp rename to xbmc/guilib/cximage.cpp diff --git a/src/guilib/cximage.h b/xbmc/guilib/cximage.h similarity index 100% rename from src/guilib/cximage.h rename to xbmc/guilib/cximage.h diff --git a/src/guilib/gui3d.h b/xbmc/guilib/gui3d.h similarity index 100% rename from src/guilib/gui3d.h rename to xbmc/guilib/gui3d.h diff --git a/src/guilib/iimage.h b/xbmc/guilib/iimage.h similarity index 100% rename from src/guilib/iimage.h rename to xbmc/guilib/iimage.h diff --git a/src/guilib/imagefactory.cpp b/xbmc/guilib/imagefactory.cpp similarity index 100% rename from src/guilib/imagefactory.cpp rename to xbmc/guilib/imagefactory.cpp diff --git a/src/guilib/imagefactory.h b/xbmc/guilib/imagefactory.h similarity index 100% rename from src/guilib/imagefactory.h rename to xbmc/guilib/imagefactory.h diff --git a/src/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp similarity index 100% rename from src/input/ButtonTranslator.cpp rename to xbmc/input/ButtonTranslator.cpp diff --git a/src/input/ButtonTranslator.h b/xbmc/input/ButtonTranslator.h similarity index 100% rename from src/input/ButtonTranslator.h rename to xbmc/input/ButtonTranslator.h diff --git a/src/input/InertialScrollingHandler.cpp b/xbmc/input/InertialScrollingHandler.cpp similarity index 100% rename from src/input/InertialScrollingHandler.cpp rename to xbmc/input/InertialScrollingHandler.cpp diff --git a/src/input/InertialScrollingHandler.h b/xbmc/input/InertialScrollingHandler.h similarity index 100% rename from src/input/InertialScrollingHandler.h rename to xbmc/input/InertialScrollingHandler.h diff --git a/src/input/KeyboardLayout.cpp b/xbmc/input/KeyboardLayout.cpp similarity index 100% rename from src/input/KeyboardLayout.cpp rename to xbmc/input/KeyboardLayout.cpp diff --git a/src/input/KeyboardLayout.h b/xbmc/input/KeyboardLayout.h similarity index 100% rename from src/input/KeyboardLayout.h rename to xbmc/input/KeyboardLayout.h diff --git a/src/input/KeyboardLayoutConfiguration.cpp b/xbmc/input/KeyboardLayoutConfiguration.cpp similarity index 100% rename from src/input/KeyboardLayoutConfiguration.cpp rename to xbmc/input/KeyboardLayoutConfiguration.cpp diff --git a/src/input/KeyboardLayoutConfiguration.h b/xbmc/input/KeyboardLayoutConfiguration.h similarity index 100% rename from src/input/KeyboardLayoutConfiguration.h rename to xbmc/input/KeyboardLayoutConfiguration.h diff --git a/src/input/KeyboardStat.cpp b/xbmc/input/KeyboardStat.cpp similarity index 100% rename from src/input/KeyboardStat.cpp rename to xbmc/input/KeyboardStat.cpp diff --git a/src/input/KeyboardStat.h b/xbmc/input/KeyboardStat.h similarity index 100% rename from src/input/KeyboardStat.h rename to xbmc/input/KeyboardStat.h diff --git a/src/input/Makefile b/xbmc/input/Makefile similarity index 100% rename from src/input/Makefile rename to xbmc/input/Makefile diff --git a/src/input/MouseStat.cpp b/xbmc/input/MouseStat.cpp similarity index 100% rename from src/input/MouseStat.cpp rename to xbmc/input/MouseStat.cpp diff --git a/src/input/MouseStat.h b/xbmc/input/MouseStat.h similarity index 100% rename from src/input/MouseStat.h rename to xbmc/input/MouseStat.h diff --git a/src/input/SDLJoystick.cpp b/xbmc/input/SDLJoystick.cpp similarity index 100% rename from src/input/SDLJoystick.cpp rename to xbmc/input/SDLJoystick.cpp diff --git a/src/input/SDLJoystick.h b/xbmc/input/SDLJoystick.h similarity index 100% rename from src/input/SDLJoystick.h rename to xbmc/input/SDLJoystick.h diff --git a/src/input/XBIRRemote.h b/xbmc/input/XBIRRemote.h similarity index 100% rename from src/input/XBIRRemote.h rename to xbmc/input/XBIRRemote.h diff --git a/src/input/XBMC_keyboard.h b/xbmc/input/XBMC_keyboard.h similarity index 100% rename from src/input/XBMC_keyboard.h rename to xbmc/input/XBMC_keyboard.h diff --git a/src/input/XBMC_keysym.h b/xbmc/input/XBMC_keysym.h similarity index 100% rename from src/input/XBMC_keysym.h rename to xbmc/input/XBMC_keysym.h diff --git a/src/input/XBMC_keytable.cpp b/xbmc/input/XBMC_keytable.cpp similarity index 100% rename from src/input/XBMC_keytable.cpp rename to xbmc/input/XBMC_keytable.cpp diff --git a/src/input/XBMC_keytable.h b/xbmc/input/XBMC_keytable.h similarity index 100% rename from src/input/XBMC_keytable.h rename to xbmc/input/XBMC_keytable.h diff --git a/src/input/XBMC_mouse.h b/xbmc/input/XBMC_mouse.h similarity index 100% rename from src/input/XBMC_mouse.h rename to xbmc/input/XBMC_mouse.h diff --git a/src/input/XBMC_vkeys.h b/xbmc/input/XBMC_vkeys.h similarity index 100% rename from src/input/XBMC_vkeys.h rename to xbmc/input/XBMC_vkeys.h diff --git a/src/input/linux/Keymap.h b/xbmc/input/linux/Keymap.h similarity index 100% rename from src/input/linux/Keymap.h rename to xbmc/input/linux/Keymap.h diff --git a/src/input/linux/LIRC.cpp b/xbmc/input/linux/LIRC.cpp similarity index 100% rename from src/input/linux/LIRC.cpp rename to xbmc/input/linux/LIRC.cpp diff --git a/src/input/linux/LIRC.h b/xbmc/input/linux/LIRC.h similarity index 100% rename from src/input/linux/LIRC.h rename to xbmc/input/linux/LIRC.h diff --git a/src/input/linux/LinuxInputDevices.cpp b/xbmc/input/linux/LinuxInputDevices.cpp similarity index 100% rename from src/input/linux/LinuxInputDevices.cpp rename to xbmc/input/linux/LinuxInputDevices.cpp diff --git a/src/input/linux/LinuxInputDevices.h b/xbmc/input/linux/LinuxInputDevices.h similarity index 100% rename from src/input/linux/LinuxInputDevices.h rename to xbmc/input/linux/LinuxInputDevices.h diff --git a/src/input/linux/Makefile.in b/xbmc/input/linux/Makefile.in similarity index 100% rename from src/input/linux/Makefile.in rename to xbmc/input/linux/Makefile.in diff --git a/src/input/linux/XKBCommonKeymap.cpp b/xbmc/input/linux/XKBCommonKeymap.cpp similarity index 100% rename from src/input/linux/XKBCommonKeymap.cpp rename to xbmc/input/linux/XKBCommonKeymap.cpp diff --git a/src/input/linux/XKBCommonKeymap.h b/xbmc/input/linux/XKBCommonKeymap.h similarity index 100% rename from src/input/linux/XKBCommonKeymap.h rename to xbmc/input/linux/XKBCommonKeymap.h diff --git a/src/input/touch/ITouchActionHandler.h b/xbmc/input/touch/ITouchActionHandler.h similarity index 100% rename from src/input/touch/ITouchActionHandler.h rename to xbmc/input/touch/ITouchActionHandler.h diff --git a/src/input/touch/ITouchInputHandler.h b/xbmc/input/touch/ITouchInputHandler.h similarity index 100% rename from src/input/touch/ITouchInputHandler.h rename to xbmc/input/touch/ITouchInputHandler.h diff --git a/src/input/touch/ITouchInputHandling.cpp b/xbmc/input/touch/ITouchInputHandling.cpp similarity index 100% rename from src/input/touch/ITouchInputHandling.cpp rename to xbmc/input/touch/ITouchInputHandling.cpp diff --git a/src/input/touch/ITouchInputHandling.h b/xbmc/input/touch/ITouchInputHandling.h similarity index 100% rename from src/input/touch/ITouchInputHandling.h rename to xbmc/input/touch/ITouchInputHandling.h diff --git a/src/input/touch/Makefile b/xbmc/input/touch/Makefile similarity index 100% rename from src/input/touch/Makefile rename to xbmc/input/touch/Makefile diff --git a/src/input/touch/TouchTypes.h b/xbmc/input/touch/TouchTypes.h similarity index 100% rename from src/input/touch/TouchTypes.h rename to xbmc/input/touch/TouchTypes.h diff --git a/src/input/touch/generic/GenericTouchActionHandler.cpp b/xbmc/input/touch/generic/GenericTouchActionHandler.cpp similarity index 100% rename from src/input/touch/generic/GenericTouchActionHandler.cpp rename to xbmc/input/touch/generic/GenericTouchActionHandler.cpp diff --git a/src/input/touch/generic/GenericTouchActionHandler.h b/xbmc/input/touch/generic/GenericTouchActionHandler.h similarity index 100% rename from src/input/touch/generic/GenericTouchActionHandler.h rename to xbmc/input/touch/generic/GenericTouchActionHandler.h diff --git a/src/input/touch/generic/GenericTouchInputHandler.cpp b/xbmc/input/touch/generic/GenericTouchInputHandler.cpp similarity index 100% rename from src/input/touch/generic/GenericTouchInputHandler.cpp rename to xbmc/input/touch/generic/GenericTouchInputHandler.cpp diff --git a/src/input/touch/generic/GenericTouchInputHandler.h b/xbmc/input/touch/generic/GenericTouchInputHandler.h similarity index 100% rename from src/input/touch/generic/GenericTouchInputHandler.h rename to xbmc/input/touch/generic/GenericTouchInputHandler.h diff --git a/src/input/touch/generic/GenericTouchPinchDetector.cpp b/xbmc/input/touch/generic/GenericTouchPinchDetector.cpp similarity index 100% rename from src/input/touch/generic/GenericTouchPinchDetector.cpp rename to xbmc/input/touch/generic/GenericTouchPinchDetector.cpp diff --git a/src/input/touch/generic/GenericTouchPinchDetector.h b/xbmc/input/touch/generic/GenericTouchPinchDetector.h similarity index 100% rename from src/input/touch/generic/GenericTouchPinchDetector.h rename to xbmc/input/touch/generic/GenericTouchPinchDetector.h diff --git a/src/input/touch/generic/GenericTouchRotateDetector.cpp b/xbmc/input/touch/generic/GenericTouchRotateDetector.cpp similarity index 100% rename from src/input/touch/generic/GenericTouchRotateDetector.cpp rename to xbmc/input/touch/generic/GenericTouchRotateDetector.cpp diff --git a/src/input/touch/generic/GenericTouchRotateDetector.h b/xbmc/input/touch/generic/GenericTouchRotateDetector.h similarity index 100% rename from src/input/touch/generic/GenericTouchRotateDetector.h rename to xbmc/input/touch/generic/GenericTouchRotateDetector.h diff --git a/src/input/touch/generic/GenericTouchSwipeDetector.cpp b/xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp similarity index 100% rename from src/input/touch/generic/GenericTouchSwipeDetector.cpp rename to xbmc/input/touch/generic/GenericTouchSwipeDetector.cpp diff --git a/src/input/touch/generic/GenericTouchSwipeDetector.h b/xbmc/input/touch/generic/GenericTouchSwipeDetector.h similarity index 100% rename from src/input/touch/generic/GenericTouchSwipeDetector.h rename to xbmc/input/touch/generic/GenericTouchSwipeDetector.h diff --git a/src/input/touch/generic/IGenericTouchGestureDetector.h b/xbmc/input/touch/generic/IGenericTouchGestureDetector.h similarity index 100% rename from src/input/touch/generic/IGenericTouchGestureDetector.h rename to xbmc/input/touch/generic/IGenericTouchGestureDetector.h diff --git a/src/input/touch/generic/Makefile b/xbmc/input/touch/generic/Makefile similarity index 100% rename from src/input/touch/generic/Makefile rename to xbmc/input/touch/generic/Makefile diff --git a/src/input/windows/IRServerSuite.cpp b/xbmc/input/windows/IRServerSuite.cpp similarity index 100% rename from src/input/windows/IRServerSuite.cpp rename to xbmc/input/windows/IRServerSuite.cpp diff --git a/src/input/windows/IRServerSuite.h b/xbmc/input/windows/IRServerSuite.h similarity index 100% rename from src/input/windows/IRServerSuite.h rename to xbmc/input/windows/IRServerSuite.h diff --git a/src/input/windows/IrssMessage.cpp b/xbmc/input/windows/IrssMessage.cpp similarity index 100% rename from src/input/windows/IrssMessage.cpp rename to xbmc/input/windows/IrssMessage.cpp diff --git a/src/input/windows/IrssMessage.h b/xbmc/input/windows/IrssMessage.h similarity index 100% rename from src/input/windows/IrssMessage.h rename to xbmc/input/windows/IrssMessage.h diff --git a/src/input/windows/WINJoystick.cpp b/xbmc/input/windows/WINJoystick.cpp similarity index 100% rename from src/input/windows/WINJoystick.cpp rename to xbmc/input/windows/WINJoystick.cpp diff --git a/src/input/windows/WINJoystick.h b/xbmc/input/windows/WINJoystick.h similarity index 100% rename from src/input/windows/WINJoystick.h rename to xbmc/input/windows/WINJoystick.h diff --git a/src/interfaces/AnnouncementManager.cpp b/xbmc/interfaces/AnnouncementManager.cpp similarity index 100% rename from src/interfaces/AnnouncementManager.cpp rename to xbmc/interfaces/AnnouncementManager.cpp diff --git a/src/interfaces/AnnouncementManager.h b/xbmc/interfaces/AnnouncementManager.h similarity index 100% rename from src/interfaces/AnnouncementManager.h rename to xbmc/interfaces/AnnouncementManager.h diff --git a/src/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp similarity index 100% rename from src/interfaces/Builtins.cpp rename to xbmc/interfaces/Builtins.cpp diff --git a/src/interfaces/Builtins.h b/xbmc/interfaces/Builtins.h similarity index 100% rename from src/interfaces/Builtins.h rename to xbmc/interfaces/Builtins.h diff --git a/src/interfaces/IAnnouncer.h b/xbmc/interfaces/IAnnouncer.h similarity index 100% rename from src/interfaces/IAnnouncer.h rename to xbmc/interfaces/IAnnouncer.h diff --git a/src/interfaces/Makefile.in b/xbmc/interfaces/Makefile.in similarity index 100% rename from src/interfaces/Makefile.in rename to xbmc/interfaces/Makefile.in diff --git a/src/interfaces/generic/ILanguageInvocationHandler.h b/xbmc/interfaces/generic/ILanguageInvocationHandler.h similarity index 100% rename from src/interfaces/generic/ILanguageInvocationHandler.h rename to xbmc/interfaces/generic/ILanguageInvocationHandler.h diff --git a/src/interfaces/generic/ILanguageInvoker.h b/xbmc/interfaces/generic/ILanguageInvoker.h similarity index 100% rename from src/interfaces/generic/ILanguageInvoker.h rename to xbmc/interfaces/generic/ILanguageInvoker.h diff --git a/src/interfaces/generic/LanguageInvokerThread.cpp b/xbmc/interfaces/generic/LanguageInvokerThread.cpp similarity index 100% rename from src/interfaces/generic/LanguageInvokerThread.cpp rename to xbmc/interfaces/generic/LanguageInvokerThread.cpp diff --git a/src/interfaces/generic/LanguageInvokerThread.h b/xbmc/interfaces/generic/LanguageInvokerThread.h similarity index 100% rename from src/interfaces/generic/LanguageInvokerThread.h rename to xbmc/interfaces/generic/LanguageInvokerThread.h diff --git a/src/interfaces/generic/Makefile b/xbmc/interfaces/generic/Makefile similarity index 100% rename from src/interfaces/generic/Makefile rename to xbmc/interfaces/generic/Makefile diff --git a/src/interfaces/generic/ScriptInvocationManager.cpp b/xbmc/interfaces/generic/ScriptInvocationManager.cpp similarity index 100% rename from src/interfaces/generic/ScriptInvocationManager.cpp rename to xbmc/interfaces/generic/ScriptInvocationManager.cpp diff --git a/src/interfaces/generic/ScriptInvocationManager.h b/xbmc/interfaces/generic/ScriptInvocationManager.h similarity index 100% rename from src/interfaces/generic/ScriptInvocationManager.h rename to xbmc/interfaces/generic/ScriptInvocationManager.h diff --git a/src/interfaces/info/InfoBool.cpp b/xbmc/interfaces/info/InfoBool.cpp similarity index 100% rename from src/interfaces/info/InfoBool.cpp rename to xbmc/interfaces/info/InfoBool.cpp diff --git a/src/interfaces/info/InfoBool.h b/xbmc/interfaces/info/InfoBool.h similarity index 100% rename from src/interfaces/info/InfoBool.h rename to xbmc/interfaces/info/InfoBool.h diff --git a/src/interfaces/info/InfoExpression.cpp b/xbmc/interfaces/info/InfoExpression.cpp similarity index 100% rename from src/interfaces/info/InfoExpression.cpp rename to xbmc/interfaces/info/InfoExpression.cpp diff --git a/src/interfaces/info/InfoExpression.h b/xbmc/interfaces/info/InfoExpression.h similarity index 100% rename from src/interfaces/info/InfoExpression.h rename to xbmc/interfaces/info/InfoExpression.h diff --git a/src/interfaces/info/Makefile b/xbmc/interfaces/info/Makefile similarity index 100% rename from src/interfaces/info/Makefile rename to xbmc/interfaces/info/Makefile diff --git a/src/interfaces/info/SkinVariable.cpp b/xbmc/interfaces/info/SkinVariable.cpp similarity index 100% rename from src/interfaces/info/SkinVariable.cpp rename to xbmc/interfaces/info/SkinVariable.cpp diff --git a/src/interfaces/info/SkinVariable.h b/xbmc/interfaces/info/SkinVariable.h similarity index 100% rename from src/interfaces/info/SkinVariable.h rename to xbmc/interfaces/info/SkinVariable.h diff --git a/src/interfaces/json-rpc/AddonsOperations.cpp b/xbmc/interfaces/json-rpc/AddonsOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/AddonsOperations.cpp rename to xbmc/interfaces/json-rpc/AddonsOperations.cpp diff --git a/src/interfaces/json-rpc/AddonsOperations.h b/xbmc/interfaces/json-rpc/AddonsOperations.h similarity index 100% rename from src/interfaces/json-rpc/AddonsOperations.h rename to xbmc/interfaces/json-rpc/AddonsOperations.h diff --git a/src/interfaces/json-rpc/ApplicationOperations.cpp b/xbmc/interfaces/json-rpc/ApplicationOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/ApplicationOperations.cpp rename to xbmc/interfaces/json-rpc/ApplicationOperations.cpp diff --git a/src/interfaces/json-rpc/ApplicationOperations.h b/xbmc/interfaces/json-rpc/ApplicationOperations.h similarity index 100% rename from src/interfaces/json-rpc/ApplicationOperations.h rename to xbmc/interfaces/json-rpc/ApplicationOperations.h diff --git a/src/interfaces/json-rpc/AudioLibrary.cpp b/xbmc/interfaces/json-rpc/AudioLibrary.cpp similarity index 100% rename from src/interfaces/json-rpc/AudioLibrary.cpp rename to xbmc/interfaces/json-rpc/AudioLibrary.cpp diff --git a/src/interfaces/json-rpc/AudioLibrary.h b/xbmc/interfaces/json-rpc/AudioLibrary.h similarity index 100% rename from src/interfaces/json-rpc/AudioLibrary.h rename to xbmc/interfaces/json-rpc/AudioLibrary.h diff --git a/src/interfaces/json-rpc/FavouritesOperations.cpp b/xbmc/interfaces/json-rpc/FavouritesOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/FavouritesOperations.cpp rename to xbmc/interfaces/json-rpc/FavouritesOperations.cpp diff --git a/src/interfaces/json-rpc/FavouritesOperations.h b/xbmc/interfaces/json-rpc/FavouritesOperations.h similarity index 100% rename from src/interfaces/json-rpc/FavouritesOperations.h rename to xbmc/interfaces/json-rpc/FavouritesOperations.h diff --git a/src/interfaces/json-rpc/FileItemHandler.cpp b/xbmc/interfaces/json-rpc/FileItemHandler.cpp similarity index 100% rename from src/interfaces/json-rpc/FileItemHandler.cpp rename to xbmc/interfaces/json-rpc/FileItemHandler.cpp diff --git a/src/interfaces/json-rpc/FileItemHandler.h b/xbmc/interfaces/json-rpc/FileItemHandler.h similarity index 100% rename from src/interfaces/json-rpc/FileItemHandler.h rename to xbmc/interfaces/json-rpc/FileItemHandler.h diff --git a/src/interfaces/json-rpc/FileOperations.cpp b/xbmc/interfaces/json-rpc/FileOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/FileOperations.cpp rename to xbmc/interfaces/json-rpc/FileOperations.cpp diff --git a/src/interfaces/json-rpc/FileOperations.h b/xbmc/interfaces/json-rpc/FileOperations.h similarity index 100% rename from src/interfaces/json-rpc/FileOperations.h rename to xbmc/interfaces/json-rpc/FileOperations.h diff --git a/src/interfaces/json-rpc/GUIOperations.cpp b/xbmc/interfaces/json-rpc/GUIOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/GUIOperations.cpp rename to xbmc/interfaces/json-rpc/GUIOperations.cpp diff --git a/src/interfaces/json-rpc/GUIOperations.h b/xbmc/interfaces/json-rpc/GUIOperations.h similarity index 100% rename from src/interfaces/json-rpc/GUIOperations.h rename to xbmc/interfaces/json-rpc/GUIOperations.h diff --git a/src/interfaces/json-rpc/IClient.h b/xbmc/interfaces/json-rpc/IClient.h similarity index 100% rename from src/interfaces/json-rpc/IClient.h rename to xbmc/interfaces/json-rpc/IClient.h diff --git a/src/interfaces/json-rpc/IJSONRPCAnnouncer.h b/xbmc/interfaces/json-rpc/IJSONRPCAnnouncer.h similarity index 100% rename from src/interfaces/json-rpc/IJSONRPCAnnouncer.h rename to xbmc/interfaces/json-rpc/IJSONRPCAnnouncer.h diff --git a/src/interfaces/json-rpc/ITransportLayer.h b/xbmc/interfaces/json-rpc/ITransportLayer.h similarity index 100% rename from src/interfaces/json-rpc/ITransportLayer.h rename to xbmc/interfaces/json-rpc/ITransportLayer.h diff --git a/src/interfaces/json-rpc/InputOperations.cpp b/xbmc/interfaces/json-rpc/InputOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/InputOperations.cpp rename to xbmc/interfaces/json-rpc/InputOperations.cpp diff --git a/src/interfaces/json-rpc/InputOperations.h b/xbmc/interfaces/json-rpc/InputOperations.h similarity index 100% rename from src/interfaces/json-rpc/InputOperations.h rename to xbmc/interfaces/json-rpc/InputOperations.h diff --git a/src/interfaces/json-rpc/JSONRPC.cpp b/xbmc/interfaces/json-rpc/JSONRPC.cpp similarity index 100% rename from src/interfaces/json-rpc/JSONRPC.cpp rename to xbmc/interfaces/json-rpc/JSONRPC.cpp diff --git a/src/interfaces/json-rpc/JSONRPC.h b/xbmc/interfaces/json-rpc/JSONRPC.h similarity index 100% rename from src/interfaces/json-rpc/JSONRPC.h rename to xbmc/interfaces/json-rpc/JSONRPC.h diff --git a/src/interfaces/json-rpc/JSONRPCUtils.h b/xbmc/interfaces/json-rpc/JSONRPCUtils.h similarity index 100% rename from src/interfaces/json-rpc/JSONRPCUtils.h rename to xbmc/interfaces/json-rpc/JSONRPCUtils.h diff --git a/src/interfaces/json-rpc/JSONServiceDescription.cpp b/xbmc/interfaces/json-rpc/JSONServiceDescription.cpp similarity index 100% rename from src/interfaces/json-rpc/JSONServiceDescription.cpp rename to xbmc/interfaces/json-rpc/JSONServiceDescription.cpp diff --git a/src/interfaces/json-rpc/JSONServiceDescription.h b/xbmc/interfaces/json-rpc/JSONServiceDescription.h similarity index 100% rename from src/interfaces/json-rpc/JSONServiceDescription.h rename to xbmc/interfaces/json-rpc/JSONServiceDescription.h diff --git a/src/interfaces/json-rpc/JSONUtils.h b/xbmc/interfaces/json-rpc/JSONUtils.h similarity index 100% rename from src/interfaces/json-rpc/JSONUtils.h rename to xbmc/interfaces/json-rpc/JSONUtils.h diff --git a/src/interfaces/json-rpc/Makefile b/xbmc/interfaces/json-rpc/Makefile similarity index 100% rename from src/interfaces/json-rpc/Makefile rename to xbmc/interfaces/json-rpc/Makefile diff --git a/src/interfaces/json-rpc/PVROperations.cpp b/xbmc/interfaces/json-rpc/PVROperations.cpp similarity index 100% rename from src/interfaces/json-rpc/PVROperations.cpp rename to xbmc/interfaces/json-rpc/PVROperations.cpp diff --git a/src/interfaces/json-rpc/PVROperations.h b/xbmc/interfaces/json-rpc/PVROperations.h similarity index 100% rename from src/interfaces/json-rpc/PVROperations.h rename to xbmc/interfaces/json-rpc/PVROperations.h diff --git a/src/interfaces/json-rpc/PlayerOperations.cpp b/xbmc/interfaces/json-rpc/PlayerOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/PlayerOperations.cpp rename to xbmc/interfaces/json-rpc/PlayerOperations.cpp diff --git a/src/interfaces/json-rpc/PlayerOperations.h b/xbmc/interfaces/json-rpc/PlayerOperations.h similarity index 100% rename from src/interfaces/json-rpc/PlayerOperations.h rename to xbmc/interfaces/json-rpc/PlayerOperations.h diff --git a/src/interfaces/json-rpc/PlaylistOperations.cpp b/xbmc/interfaces/json-rpc/PlaylistOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/PlaylistOperations.cpp rename to xbmc/interfaces/json-rpc/PlaylistOperations.cpp diff --git a/src/interfaces/json-rpc/PlaylistOperations.h b/xbmc/interfaces/json-rpc/PlaylistOperations.h similarity index 100% rename from src/interfaces/json-rpc/PlaylistOperations.h rename to xbmc/interfaces/json-rpc/PlaylistOperations.h diff --git a/src/interfaces/json-rpc/ProfilesOperations.cpp b/xbmc/interfaces/json-rpc/ProfilesOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/ProfilesOperations.cpp rename to xbmc/interfaces/json-rpc/ProfilesOperations.cpp diff --git a/src/interfaces/json-rpc/ProfilesOperations.h b/xbmc/interfaces/json-rpc/ProfilesOperations.h similarity index 100% rename from src/interfaces/json-rpc/ProfilesOperations.h rename to xbmc/interfaces/json-rpc/ProfilesOperations.h diff --git a/src/interfaces/json-rpc/SettingsOperations.cpp b/xbmc/interfaces/json-rpc/SettingsOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/SettingsOperations.cpp rename to xbmc/interfaces/json-rpc/SettingsOperations.cpp diff --git a/src/interfaces/json-rpc/SettingsOperations.h b/xbmc/interfaces/json-rpc/SettingsOperations.h similarity index 100% rename from src/interfaces/json-rpc/SettingsOperations.h rename to xbmc/interfaces/json-rpc/SettingsOperations.h diff --git a/src/interfaces/json-rpc/SystemOperations.cpp b/xbmc/interfaces/json-rpc/SystemOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/SystemOperations.cpp rename to xbmc/interfaces/json-rpc/SystemOperations.cpp diff --git a/src/interfaces/json-rpc/SystemOperations.h b/xbmc/interfaces/json-rpc/SystemOperations.h similarity index 100% rename from src/interfaces/json-rpc/SystemOperations.h rename to xbmc/interfaces/json-rpc/SystemOperations.h diff --git a/src/interfaces/json-rpc/TextureOperations.cpp b/xbmc/interfaces/json-rpc/TextureOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/TextureOperations.cpp rename to xbmc/interfaces/json-rpc/TextureOperations.cpp diff --git a/src/interfaces/json-rpc/TextureOperations.h b/xbmc/interfaces/json-rpc/TextureOperations.h similarity index 100% rename from src/interfaces/json-rpc/TextureOperations.h rename to xbmc/interfaces/json-rpc/TextureOperations.h diff --git a/src/interfaces/json-rpc/VideoLibrary.cpp b/xbmc/interfaces/json-rpc/VideoLibrary.cpp similarity index 100% rename from src/interfaces/json-rpc/VideoLibrary.cpp rename to xbmc/interfaces/json-rpc/VideoLibrary.cpp diff --git a/src/interfaces/json-rpc/VideoLibrary.h b/xbmc/interfaces/json-rpc/VideoLibrary.h similarity index 100% rename from src/interfaces/json-rpc/VideoLibrary.h rename to xbmc/interfaces/json-rpc/VideoLibrary.h diff --git a/src/interfaces/json-rpc/XBMCOperations.cpp b/xbmc/interfaces/json-rpc/XBMCOperations.cpp similarity index 100% rename from src/interfaces/json-rpc/XBMCOperations.cpp rename to xbmc/interfaces/json-rpc/XBMCOperations.cpp diff --git a/src/interfaces/json-rpc/XBMCOperations.h b/xbmc/interfaces/json-rpc/XBMCOperations.h similarity index 100% rename from src/interfaces/json-rpc/XBMCOperations.h rename to xbmc/interfaces/json-rpc/XBMCOperations.h diff --git a/src/interfaces/json-rpc/schema/license.txt b/xbmc/interfaces/json-rpc/schema/license.txt similarity index 100% rename from src/interfaces/json-rpc/schema/license.txt rename to xbmc/interfaces/json-rpc/schema/license.txt diff --git a/src/interfaces/json-rpc/schema/methods.json b/xbmc/interfaces/json-rpc/schema/methods.json similarity index 100% rename from src/interfaces/json-rpc/schema/methods.json rename to xbmc/interfaces/json-rpc/schema/methods.json diff --git a/src/interfaces/json-rpc/schema/notifications.json b/xbmc/interfaces/json-rpc/schema/notifications.json similarity index 100% rename from src/interfaces/json-rpc/schema/notifications.json rename to xbmc/interfaces/json-rpc/schema/notifications.json diff --git a/src/interfaces/json-rpc/schema/types.json b/xbmc/interfaces/json-rpc/schema/types.json similarity index 100% rename from src/interfaces/json-rpc/schema/types.json rename to xbmc/interfaces/json-rpc/schema/types.json diff --git a/src/interfaces/json-rpc/schema/version.txt b/xbmc/interfaces/json-rpc/schema/version.txt similarity index 100% rename from src/interfaces/json-rpc/schema/version.txt rename to xbmc/interfaces/json-rpc/schema/version.txt diff --git a/src/interfaces/legacy/Addon.cpp b/xbmc/interfaces/legacy/Addon.cpp similarity index 100% rename from src/interfaces/legacy/Addon.cpp rename to xbmc/interfaces/legacy/Addon.cpp diff --git a/src/interfaces/legacy/Addon.h b/xbmc/interfaces/legacy/Addon.h similarity index 100% rename from src/interfaces/legacy/Addon.h rename to xbmc/interfaces/legacy/Addon.h diff --git a/src/interfaces/legacy/AddonCallback.cpp b/xbmc/interfaces/legacy/AddonCallback.cpp similarity index 100% rename from src/interfaces/legacy/AddonCallback.cpp rename to xbmc/interfaces/legacy/AddonCallback.cpp diff --git a/src/interfaces/legacy/AddonCallback.h b/xbmc/interfaces/legacy/AddonCallback.h similarity index 100% rename from src/interfaces/legacy/AddonCallback.h rename to xbmc/interfaces/legacy/AddonCallback.h diff --git a/src/interfaces/legacy/AddonClass.cpp b/xbmc/interfaces/legacy/AddonClass.cpp similarity index 100% rename from src/interfaces/legacy/AddonClass.cpp rename to xbmc/interfaces/legacy/AddonClass.cpp diff --git a/src/interfaces/legacy/AddonClass.h b/xbmc/interfaces/legacy/AddonClass.h similarity index 100% rename from src/interfaces/legacy/AddonClass.h rename to xbmc/interfaces/legacy/AddonClass.h diff --git a/src/interfaces/legacy/AddonString.h b/xbmc/interfaces/legacy/AddonString.h similarity index 100% rename from src/interfaces/legacy/AddonString.h rename to xbmc/interfaces/legacy/AddonString.h diff --git a/src/interfaces/legacy/AddonUtils.cpp b/xbmc/interfaces/legacy/AddonUtils.cpp similarity index 100% rename from src/interfaces/legacy/AddonUtils.cpp rename to xbmc/interfaces/legacy/AddonUtils.cpp diff --git a/src/interfaces/legacy/AddonUtils.h b/xbmc/interfaces/legacy/AddonUtils.h similarity index 100% rename from src/interfaces/legacy/AddonUtils.h rename to xbmc/interfaces/legacy/AddonUtils.h diff --git a/src/interfaces/legacy/Alternative.h b/xbmc/interfaces/legacy/Alternative.h similarity index 100% rename from src/interfaces/legacy/Alternative.h rename to xbmc/interfaces/legacy/Alternative.h diff --git a/src/interfaces/legacy/CallbackFunction.cpp b/xbmc/interfaces/legacy/CallbackFunction.cpp similarity index 100% rename from src/interfaces/legacy/CallbackFunction.cpp rename to xbmc/interfaces/legacy/CallbackFunction.cpp diff --git a/src/interfaces/legacy/CallbackFunction.h b/xbmc/interfaces/legacy/CallbackFunction.h similarity index 100% rename from src/interfaces/legacy/CallbackFunction.h rename to xbmc/interfaces/legacy/CallbackFunction.h diff --git a/src/interfaces/legacy/CallbackHandler.cpp b/xbmc/interfaces/legacy/CallbackHandler.cpp similarity index 100% rename from src/interfaces/legacy/CallbackHandler.cpp rename to xbmc/interfaces/legacy/CallbackHandler.cpp diff --git a/src/interfaces/legacy/CallbackHandler.h b/xbmc/interfaces/legacy/CallbackHandler.h similarity index 100% rename from src/interfaces/legacy/CallbackHandler.h rename to xbmc/interfaces/legacy/CallbackHandler.h diff --git a/src/interfaces/legacy/Control.cpp b/xbmc/interfaces/legacy/Control.cpp similarity index 100% rename from src/interfaces/legacy/Control.cpp rename to xbmc/interfaces/legacy/Control.cpp diff --git a/src/interfaces/legacy/Control.h b/xbmc/interfaces/legacy/Control.h similarity index 100% rename from src/interfaces/legacy/Control.h rename to xbmc/interfaces/legacy/Control.h diff --git a/src/interfaces/legacy/Dialog.cpp b/xbmc/interfaces/legacy/Dialog.cpp similarity index 100% rename from src/interfaces/legacy/Dialog.cpp rename to xbmc/interfaces/legacy/Dialog.cpp diff --git a/src/interfaces/legacy/Dialog.h b/xbmc/interfaces/legacy/Dialog.h similarity index 100% rename from src/interfaces/legacy/Dialog.h rename to xbmc/interfaces/legacy/Dialog.h diff --git a/src/interfaces/legacy/Dictionary.h b/xbmc/interfaces/legacy/Dictionary.h similarity index 100% rename from src/interfaces/legacy/Dictionary.h rename to xbmc/interfaces/legacy/Dictionary.h diff --git a/src/interfaces/legacy/Exception.h b/xbmc/interfaces/legacy/Exception.h similarity index 100% rename from src/interfaces/legacy/Exception.h rename to xbmc/interfaces/legacy/Exception.h diff --git a/src/interfaces/legacy/File.cpp b/xbmc/interfaces/legacy/File.cpp similarity index 100% rename from src/interfaces/legacy/File.cpp rename to xbmc/interfaces/legacy/File.cpp diff --git a/src/interfaces/legacy/File.h b/xbmc/interfaces/legacy/File.h similarity index 100% rename from src/interfaces/legacy/File.h rename to xbmc/interfaces/legacy/File.h diff --git a/src/interfaces/legacy/InfoTagMusic.cpp b/xbmc/interfaces/legacy/InfoTagMusic.cpp similarity index 100% rename from src/interfaces/legacy/InfoTagMusic.cpp rename to xbmc/interfaces/legacy/InfoTagMusic.cpp diff --git a/src/interfaces/legacy/InfoTagMusic.h b/xbmc/interfaces/legacy/InfoTagMusic.h similarity index 100% rename from src/interfaces/legacy/InfoTagMusic.h rename to xbmc/interfaces/legacy/InfoTagMusic.h diff --git a/src/interfaces/legacy/InfoTagVideo.cpp b/xbmc/interfaces/legacy/InfoTagVideo.cpp similarity index 100% rename from src/interfaces/legacy/InfoTagVideo.cpp rename to xbmc/interfaces/legacy/InfoTagVideo.cpp diff --git a/src/interfaces/legacy/InfoTagVideo.h b/xbmc/interfaces/legacy/InfoTagVideo.h similarity index 100% rename from src/interfaces/legacy/InfoTagVideo.h rename to xbmc/interfaces/legacy/InfoTagVideo.h diff --git a/src/interfaces/legacy/Keyboard.cpp b/xbmc/interfaces/legacy/Keyboard.cpp similarity index 100% rename from src/interfaces/legacy/Keyboard.cpp rename to xbmc/interfaces/legacy/Keyboard.cpp diff --git a/src/interfaces/legacy/Keyboard.h b/xbmc/interfaces/legacy/Keyboard.h similarity index 100% rename from src/interfaces/legacy/Keyboard.h rename to xbmc/interfaces/legacy/Keyboard.h diff --git a/src/interfaces/legacy/LanguageHook.cpp b/xbmc/interfaces/legacy/LanguageHook.cpp similarity index 100% rename from src/interfaces/legacy/LanguageHook.cpp rename to xbmc/interfaces/legacy/LanguageHook.cpp diff --git a/src/interfaces/legacy/LanguageHook.h b/xbmc/interfaces/legacy/LanguageHook.h similarity index 100% rename from src/interfaces/legacy/LanguageHook.h rename to xbmc/interfaces/legacy/LanguageHook.h diff --git a/src/interfaces/legacy/List.h b/xbmc/interfaces/legacy/List.h similarity index 100% rename from src/interfaces/legacy/List.h rename to xbmc/interfaces/legacy/List.h diff --git a/src/interfaces/legacy/ListItem.cpp b/xbmc/interfaces/legacy/ListItem.cpp similarity index 100% rename from src/interfaces/legacy/ListItem.cpp rename to xbmc/interfaces/legacy/ListItem.cpp diff --git a/src/interfaces/legacy/ListItem.h b/xbmc/interfaces/legacy/ListItem.h similarity index 100% rename from src/interfaces/legacy/ListItem.h rename to xbmc/interfaces/legacy/ListItem.h diff --git a/src/interfaces/legacy/Makefile b/xbmc/interfaces/legacy/Makefile similarity index 100% rename from src/interfaces/legacy/Makefile rename to xbmc/interfaces/legacy/Makefile diff --git a/src/interfaces/legacy/ModuleXbmc.cpp b/xbmc/interfaces/legacy/ModuleXbmc.cpp similarity index 100% rename from src/interfaces/legacy/ModuleXbmc.cpp rename to xbmc/interfaces/legacy/ModuleXbmc.cpp diff --git a/src/interfaces/legacy/ModuleXbmc.h b/xbmc/interfaces/legacy/ModuleXbmc.h similarity index 100% rename from src/interfaces/legacy/ModuleXbmc.h rename to xbmc/interfaces/legacy/ModuleXbmc.h diff --git a/src/interfaces/legacy/ModuleXbmcgui.cpp b/xbmc/interfaces/legacy/ModuleXbmcgui.cpp similarity index 100% rename from src/interfaces/legacy/ModuleXbmcgui.cpp rename to xbmc/interfaces/legacy/ModuleXbmcgui.cpp diff --git a/src/interfaces/legacy/ModuleXbmcgui.h b/xbmc/interfaces/legacy/ModuleXbmcgui.h similarity index 100% rename from src/interfaces/legacy/ModuleXbmcgui.h rename to xbmc/interfaces/legacy/ModuleXbmcgui.h diff --git a/src/interfaces/legacy/ModuleXbmcplugin.cpp b/xbmc/interfaces/legacy/ModuleXbmcplugin.cpp similarity index 100% rename from src/interfaces/legacy/ModuleXbmcplugin.cpp rename to xbmc/interfaces/legacy/ModuleXbmcplugin.cpp diff --git a/src/interfaces/legacy/ModuleXbmcplugin.h b/xbmc/interfaces/legacy/ModuleXbmcplugin.h similarity index 100% rename from src/interfaces/legacy/ModuleXbmcplugin.h rename to xbmc/interfaces/legacy/ModuleXbmcplugin.h diff --git a/src/interfaces/legacy/ModuleXbmcvfs.cpp b/xbmc/interfaces/legacy/ModuleXbmcvfs.cpp similarity index 100% rename from src/interfaces/legacy/ModuleXbmcvfs.cpp rename to xbmc/interfaces/legacy/ModuleXbmcvfs.cpp diff --git a/src/interfaces/legacy/ModuleXbmcvfs.h b/xbmc/interfaces/legacy/ModuleXbmcvfs.h similarity index 100% rename from src/interfaces/legacy/ModuleXbmcvfs.h rename to xbmc/interfaces/legacy/ModuleXbmcvfs.h diff --git a/src/interfaces/legacy/Monitor.cpp b/xbmc/interfaces/legacy/Monitor.cpp similarity index 100% rename from src/interfaces/legacy/Monitor.cpp rename to xbmc/interfaces/legacy/Monitor.cpp diff --git a/src/interfaces/legacy/Monitor.h b/xbmc/interfaces/legacy/Monitor.h similarity index 100% rename from src/interfaces/legacy/Monitor.h rename to xbmc/interfaces/legacy/Monitor.h diff --git a/src/interfaces/legacy/PlayList.cpp b/xbmc/interfaces/legacy/PlayList.cpp similarity index 100% rename from src/interfaces/legacy/PlayList.cpp rename to xbmc/interfaces/legacy/PlayList.cpp diff --git a/src/interfaces/legacy/PlayList.h b/xbmc/interfaces/legacy/PlayList.h similarity index 100% rename from src/interfaces/legacy/PlayList.h rename to xbmc/interfaces/legacy/PlayList.h diff --git a/src/interfaces/legacy/Player.cpp b/xbmc/interfaces/legacy/Player.cpp similarity index 100% rename from src/interfaces/legacy/Player.cpp rename to xbmc/interfaces/legacy/Player.cpp diff --git a/src/interfaces/legacy/Player.h b/xbmc/interfaces/legacy/Player.h similarity index 100% rename from src/interfaces/legacy/Player.h rename to xbmc/interfaces/legacy/Player.h diff --git a/src/interfaces/legacy/RenderCapture.h b/xbmc/interfaces/legacy/RenderCapture.h similarity index 100% rename from src/interfaces/legacy/RenderCapture.h rename to xbmc/interfaces/legacy/RenderCapture.h diff --git a/src/interfaces/legacy/Stat.h b/xbmc/interfaces/legacy/Stat.h similarity index 100% rename from src/interfaces/legacy/Stat.h rename to xbmc/interfaces/legacy/Stat.h diff --git a/src/interfaces/legacy/String.cpp b/xbmc/interfaces/legacy/String.cpp similarity index 100% rename from src/interfaces/legacy/String.cpp rename to xbmc/interfaces/legacy/String.cpp diff --git a/src/interfaces/legacy/Tuple.h b/xbmc/interfaces/legacy/Tuple.h similarity index 100% rename from src/interfaces/legacy/Tuple.h rename to xbmc/interfaces/legacy/Tuple.h diff --git a/src/interfaces/legacy/Window.cpp b/xbmc/interfaces/legacy/Window.cpp similarity index 100% rename from src/interfaces/legacy/Window.cpp rename to xbmc/interfaces/legacy/Window.cpp diff --git a/src/interfaces/legacy/Window.h b/xbmc/interfaces/legacy/Window.h similarity index 100% rename from src/interfaces/legacy/Window.h rename to xbmc/interfaces/legacy/Window.h diff --git a/src/interfaces/legacy/WindowDialog.cpp b/xbmc/interfaces/legacy/WindowDialog.cpp similarity index 100% rename from src/interfaces/legacy/WindowDialog.cpp rename to xbmc/interfaces/legacy/WindowDialog.cpp diff --git a/src/interfaces/legacy/WindowDialog.h b/xbmc/interfaces/legacy/WindowDialog.h similarity index 100% rename from src/interfaces/legacy/WindowDialog.h rename to xbmc/interfaces/legacy/WindowDialog.h diff --git a/src/interfaces/legacy/WindowDialogMixin.cpp b/xbmc/interfaces/legacy/WindowDialogMixin.cpp similarity index 100% rename from src/interfaces/legacy/WindowDialogMixin.cpp rename to xbmc/interfaces/legacy/WindowDialogMixin.cpp diff --git a/src/interfaces/legacy/WindowDialogMixin.h b/xbmc/interfaces/legacy/WindowDialogMixin.h similarity index 100% rename from src/interfaces/legacy/WindowDialogMixin.h rename to xbmc/interfaces/legacy/WindowDialogMixin.h diff --git a/src/interfaces/legacy/WindowException.h b/xbmc/interfaces/legacy/WindowException.h similarity index 100% rename from src/interfaces/legacy/WindowException.h rename to xbmc/interfaces/legacy/WindowException.h diff --git a/src/interfaces/legacy/WindowInterceptor.h b/xbmc/interfaces/legacy/WindowInterceptor.h similarity index 100% rename from src/interfaces/legacy/WindowInterceptor.h rename to xbmc/interfaces/legacy/WindowInterceptor.h diff --git a/src/interfaces/legacy/WindowXML.cpp b/xbmc/interfaces/legacy/WindowXML.cpp similarity index 100% rename from src/interfaces/legacy/WindowXML.cpp rename to xbmc/interfaces/legacy/WindowXML.cpp diff --git a/src/interfaces/legacy/WindowXML.h b/xbmc/interfaces/legacy/WindowXML.h similarity index 100% rename from src/interfaces/legacy/WindowXML.h rename to xbmc/interfaces/legacy/WindowXML.h diff --git a/src/interfaces/legacy/aojsonrpc.h b/xbmc/interfaces/legacy/aojsonrpc.h similarity index 100% rename from src/interfaces/legacy/aojsonrpc.h rename to xbmc/interfaces/legacy/aojsonrpc.h diff --git a/src/interfaces/legacy/swighelper.h b/xbmc/interfaces/legacy/swighelper.h similarity index 100% rename from src/interfaces/legacy/swighelper.h rename to xbmc/interfaces/legacy/swighelper.h diff --git a/src/interfaces/python/AddonPythonInvoker.cpp b/xbmc/interfaces/python/AddonPythonInvoker.cpp similarity index 100% rename from src/interfaces/python/AddonPythonInvoker.cpp rename to xbmc/interfaces/python/AddonPythonInvoker.cpp diff --git a/src/interfaces/python/AddonPythonInvoker.h b/xbmc/interfaces/python/AddonPythonInvoker.h similarity index 100% rename from src/interfaces/python/AddonPythonInvoker.h rename to xbmc/interfaces/python/AddonPythonInvoker.h diff --git a/src/interfaces/python/CallbackHandler.cpp b/xbmc/interfaces/python/CallbackHandler.cpp similarity index 100% rename from src/interfaces/python/CallbackHandler.cpp rename to xbmc/interfaces/python/CallbackHandler.cpp diff --git a/src/interfaces/python/CallbackHandler.h b/xbmc/interfaces/python/CallbackHandler.h similarity index 100% rename from src/interfaces/python/CallbackHandler.h rename to xbmc/interfaces/python/CallbackHandler.h diff --git a/src/interfaces/python/Doxyfile b/xbmc/interfaces/python/Doxyfile similarity index 100% rename from src/interfaces/python/Doxyfile rename to xbmc/interfaces/python/Doxyfile diff --git a/src/interfaces/python/LanguageHook.cpp b/xbmc/interfaces/python/LanguageHook.cpp similarity index 100% rename from src/interfaces/python/LanguageHook.cpp rename to xbmc/interfaces/python/LanguageHook.cpp diff --git a/src/interfaces/python/LanguageHook.h b/xbmc/interfaces/python/LanguageHook.h similarity index 100% rename from src/interfaces/python/LanguageHook.h rename to xbmc/interfaces/python/LanguageHook.h diff --git a/src/interfaces/python/Makefile.in b/xbmc/interfaces/python/Makefile.in similarity index 100% rename from src/interfaces/python/Makefile.in rename to xbmc/interfaces/python/Makefile.in diff --git a/src/interfaces/python/MethodType.groovy b/xbmc/interfaces/python/MethodType.groovy similarity index 100% rename from src/interfaces/python/MethodType.groovy rename to xbmc/interfaces/python/MethodType.groovy diff --git a/src/interfaces/python/PyContext.cpp b/xbmc/interfaces/python/PyContext.cpp similarity index 100% rename from src/interfaces/python/PyContext.cpp rename to xbmc/interfaces/python/PyContext.cpp diff --git a/src/interfaces/python/PyContext.h b/xbmc/interfaces/python/PyContext.h similarity index 100% rename from src/interfaces/python/PyContext.h rename to xbmc/interfaces/python/PyContext.h diff --git a/src/interfaces/python/PythonInvoker.cpp b/xbmc/interfaces/python/PythonInvoker.cpp similarity index 100% rename from src/interfaces/python/PythonInvoker.cpp rename to xbmc/interfaces/python/PythonInvoker.cpp diff --git a/src/interfaces/python/PythonInvoker.h b/xbmc/interfaces/python/PythonInvoker.h similarity index 100% rename from src/interfaces/python/PythonInvoker.h rename to xbmc/interfaces/python/PythonInvoker.h diff --git a/src/interfaces/python/PythonSwig.cpp.template b/xbmc/interfaces/python/PythonSwig.cpp.template similarity index 100% rename from src/interfaces/python/PythonSwig.cpp.template rename to xbmc/interfaces/python/PythonSwig.cpp.template diff --git a/src/interfaces/python/PythonTools.groovy b/xbmc/interfaces/python/PythonTools.groovy similarity index 100% rename from src/interfaces/python/PythonTools.groovy rename to xbmc/interfaces/python/PythonTools.groovy diff --git a/src/interfaces/python/XBPython.cpp b/xbmc/interfaces/python/XBPython.cpp similarity index 100% rename from src/interfaces/python/XBPython.cpp rename to xbmc/interfaces/python/XBPython.cpp diff --git a/src/interfaces/python/XBPython.h b/xbmc/interfaces/python/XBPython.h similarity index 100% rename from src/interfaces/python/XBPython.h rename to xbmc/interfaces/python/XBPython.h diff --git a/src/interfaces/python/preamble.h b/xbmc/interfaces/python/preamble.h similarity index 100% rename from src/interfaces/python/preamble.h rename to xbmc/interfaces/python/preamble.h diff --git a/src/interfaces/python/pythreadstate.h b/xbmc/interfaces/python/pythreadstate.h similarity index 100% rename from src/interfaces/python/pythreadstate.h rename to xbmc/interfaces/python/pythreadstate.h diff --git a/src/interfaces/python/swig.cpp b/xbmc/interfaces/python/swig.cpp similarity index 100% rename from src/interfaces/python/swig.cpp rename to xbmc/interfaces/python/swig.cpp diff --git a/src/interfaces/python/swig.h b/xbmc/interfaces/python/swig.h similarity index 100% rename from src/interfaces/python/swig.h rename to xbmc/interfaces/python/swig.h diff --git a/src/interfaces/python/test/Makefile.in b/xbmc/interfaces/python/test/Makefile.in similarity index 100% rename from src/interfaces/python/test/Makefile.in rename to xbmc/interfaces/python/test/Makefile.in diff --git a/src/interfaces/python/test/TestSwig.cpp b/xbmc/interfaces/python/test/TestSwig.cpp similarity index 100% rename from src/interfaces/python/test/TestSwig.cpp rename to xbmc/interfaces/python/test/TestSwig.cpp diff --git a/src/interfaces/python/typemaps/python.Alternative.intm b/xbmc/interfaces/python/typemaps/python.Alternative.intm similarity index 100% rename from src/interfaces/python/typemaps/python.Alternative.intm rename to xbmc/interfaces/python/typemaps/python.Alternative.intm diff --git a/src/interfaces/python/typemaps/python.Alternative.outtm b/xbmc/interfaces/python/typemaps/python.Alternative.outtm similarity index 100% rename from src/interfaces/python/typemaps/python.Alternative.outtm rename to xbmc/interfaces/python/typemaps/python.Alternative.outtm diff --git a/src/interfaces/python/typemaps/python.Tuple.intm b/xbmc/interfaces/python/typemaps/python.Tuple.intm similarity index 100% rename from src/interfaces/python/typemaps/python.Tuple.intm rename to xbmc/interfaces/python/typemaps/python.Tuple.intm diff --git a/src/interfaces/python/typemaps/python.Tuple.outtm b/xbmc/interfaces/python/typemaps/python.Tuple.outtm similarity index 100% rename from src/interfaces/python/typemaps/python.Tuple.outtm rename to xbmc/interfaces/python/typemaps/python.Tuple.outtm diff --git a/src/interfaces/python/typemaps/python.boost_shared_ptr.outtm b/xbmc/interfaces/python/typemaps/python.boost_shared_ptr.outtm similarity index 100% rename from src/interfaces/python/typemaps/python.boost_shared_ptr.outtm rename to xbmc/interfaces/python/typemaps/python.boost_shared_ptr.outtm diff --git a/src/interfaces/python/typemaps/python.buffer.intm b/xbmc/interfaces/python/typemaps/python.buffer.intm similarity index 100% rename from src/interfaces/python/typemaps/python.buffer.intm rename to xbmc/interfaces/python/typemaps/python.buffer.intm diff --git a/src/interfaces/python/typemaps/python.buffer.outtm b/xbmc/interfaces/python/typemaps/python.buffer.outtm similarity index 100% rename from src/interfaces/python/typemaps/python.buffer.outtm rename to xbmc/interfaces/python/typemaps/python.buffer.outtm diff --git a/src/interfaces/python/typemaps/python.dict.intm b/xbmc/interfaces/python/typemaps/python.dict.intm similarity index 100% rename from src/interfaces/python/typemaps/python.dict.intm rename to xbmc/interfaces/python/typemaps/python.dict.intm diff --git a/src/interfaces/python/typemaps/python.map.intm b/xbmc/interfaces/python/typemaps/python.map.intm similarity index 100% rename from src/interfaces/python/typemaps/python.map.intm rename to xbmc/interfaces/python/typemaps/python.map.intm diff --git a/src/interfaces/python/typemaps/python.string.outtm b/xbmc/interfaces/python/typemaps/python.string.outtm similarity index 100% rename from src/interfaces/python/typemaps/python.string.outtm rename to xbmc/interfaces/python/typemaps/python.string.outtm diff --git a/src/interfaces/python/typemaps/python.vector.intm b/xbmc/interfaces/python/typemaps/python.vector.intm similarity index 100% rename from src/interfaces/python/typemaps/python.vector.intm rename to xbmc/interfaces/python/typemaps/python.vector.intm diff --git a/src/interfaces/python/typemaps/python.vector.outtm b/xbmc/interfaces/python/typemaps/python.vector.outtm similarity index 100% rename from src/interfaces/python/typemaps/python.vector.outtm rename to xbmc/interfaces/python/typemaps/python.vector.outtm diff --git a/src/interfaces/swig/AddonModuleXbmc.i b/xbmc/interfaces/swig/AddonModuleXbmc.i similarity index 100% rename from src/interfaces/swig/AddonModuleXbmc.i rename to xbmc/interfaces/swig/AddonModuleXbmc.i diff --git a/src/interfaces/swig/AddonModuleXbmcaddon.i b/xbmc/interfaces/swig/AddonModuleXbmcaddon.i similarity index 100% rename from src/interfaces/swig/AddonModuleXbmcaddon.i rename to xbmc/interfaces/swig/AddonModuleXbmcaddon.i diff --git a/src/interfaces/swig/AddonModuleXbmcgui.i b/xbmc/interfaces/swig/AddonModuleXbmcgui.i similarity index 100% rename from src/interfaces/swig/AddonModuleXbmcgui.i rename to xbmc/interfaces/swig/AddonModuleXbmcgui.i diff --git a/src/interfaces/swig/AddonModuleXbmcplugin.i b/xbmc/interfaces/swig/AddonModuleXbmcplugin.i similarity index 100% rename from src/interfaces/swig/AddonModuleXbmcplugin.i rename to xbmc/interfaces/swig/AddonModuleXbmcplugin.i diff --git a/src/interfaces/swig/AddonModuleXbmcvfs.i b/xbmc/interfaces/swig/AddonModuleXbmcvfs.i similarity index 100% rename from src/interfaces/swig/AddonModuleXbmcvfs.i rename to xbmc/interfaces/swig/AddonModuleXbmcvfs.i diff --git a/src/linux/ConvUtils.cpp b/xbmc/linux/ConvUtils.cpp similarity index 100% rename from src/linux/ConvUtils.cpp rename to xbmc/linux/ConvUtils.cpp diff --git a/src/linux/ConvUtils.h b/xbmc/linux/ConvUtils.h similarity index 100% rename from src/linux/ConvUtils.h rename to xbmc/linux/ConvUtils.h diff --git a/src/linux/DBusMessage.cpp b/xbmc/linux/DBusMessage.cpp similarity index 100% rename from src/linux/DBusMessage.cpp rename to xbmc/linux/DBusMessage.cpp diff --git a/src/linux/DBusMessage.h b/xbmc/linux/DBusMessage.h similarity index 100% rename from src/linux/DBusMessage.h rename to xbmc/linux/DBusMessage.h diff --git a/src/linux/DBusReserve.cpp b/xbmc/linux/DBusReserve.cpp similarity index 100% rename from src/linux/DBusReserve.cpp rename to xbmc/linux/DBusReserve.cpp diff --git a/src/linux/DBusReserve.h b/xbmc/linux/DBusReserve.h similarity index 100% rename from src/linux/DBusReserve.h rename to xbmc/linux/DBusReserve.h diff --git a/src/linux/DBusUtil.cpp b/xbmc/linux/DBusUtil.cpp similarity index 100% rename from src/linux/DBusUtil.cpp rename to xbmc/linux/DBusUtil.cpp diff --git a/src/linux/DBusUtil.h b/xbmc/linux/DBusUtil.h similarity index 100% rename from src/linux/DBusUtil.h rename to xbmc/linux/DBusUtil.h diff --git a/src/linux/DllBCM.h b/xbmc/linux/DllBCM.h similarity index 100% rename from src/linux/DllBCM.h rename to xbmc/linux/DllBCM.h diff --git a/src/linux/DllOMX.h b/xbmc/linux/DllOMX.h similarity index 100% rename from src/linux/DllOMX.h rename to xbmc/linux/DllOMX.h diff --git a/src/linux/LinuxResourceCounter.cpp b/xbmc/linux/LinuxResourceCounter.cpp similarity index 100% rename from src/linux/LinuxResourceCounter.cpp rename to xbmc/linux/LinuxResourceCounter.cpp diff --git a/src/linux/LinuxResourceCounter.h b/xbmc/linux/LinuxResourceCounter.h similarity index 100% rename from src/linux/LinuxResourceCounter.h rename to xbmc/linux/LinuxResourceCounter.h diff --git a/src/linux/LinuxTimezone.cpp b/xbmc/linux/LinuxTimezone.cpp similarity index 100% rename from src/linux/LinuxTimezone.cpp rename to xbmc/linux/LinuxTimezone.cpp diff --git a/src/linux/LinuxTimezone.h b/xbmc/linux/LinuxTimezone.h similarity index 100% rename from src/linux/LinuxTimezone.h rename to xbmc/linux/LinuxTimezone.h diff --git a/src/linux/Makefile.in b/xbmc/linux/Makefile.in similarity index 100% rename from src/linux/Makefile.in rename to xbmc/linux/Makefile.in diff --git a/src/linux/OMXClock.cpp b/xbmc/linux/OMXClock.cpp similarity index 100% rename from src/linux/OMXClock.cpp rename to xbmc/linux/OMXClock.cpp diff --git a/src/linux/OMXClock.h b/xbmc/linux/OMXClock.h similarity index 100% rename from src/linux/OMXClock.h rename to xbmc/linux/OMXClock.h diff --git a/src/linux/OMXCore.cpp b/xbmc/linux/OMXCore.cpp similarity index 100% rename from src/linux/OMXCore.cpp rename to xbmc/linux/OMXCore.cpp diff --git a/src/linux/OMXCore.h b/xbmc/linux/OMXCore.h similarity index 100% rename from src/linux/OMXCore.h rename to xbmc/linux/OMXCore.h diff --git a/src/linux/PlatformDefs.h b/xbmc/linux/PlatformDefs.h similarity index 100% rename from src/linux/PlatformDefs.h rename to xbmc/linux/PlatformDefs.h diff --git a/src/linux/PlatformInclude.h b/xbmc/linux/PlatformInclude.h similarity index 100% rename from src/linux/PlatformInclude.h rename to xbmc/linux/PlatformInclude.h diff --git a/src/linux/PosixMountProvider.cpp b/xbmc/linux/PosixMountProvider.cpp similarity index 100% rename from src/linux/PosixMountProvider.cpp rename to xbmc/linux/PosixMountProvider.cpp diff --git a/src/linux/PosixMountProvider.h b/xbmc/linux/PosixMountProvider.h similarity index 100% rename from src/linux/PosixMountProvider.h rename to xbmc/linux/PosixMountProvider.h diff --git a/src/linux/RBP.cpp b/xbmc/linux/RBP.cpp similarity index 100% rename from src/linux/RBP.cpp rename to xbmc/linux/RBP.cpp diff --git a/src/linux/RBP.h b/xbmc/linux/RBP.h similarity index 100% rename from src/linux/RBP.h rename to xbmc/linux/RBP.h diff --git a/src/linux/XFileUtils.cpp b/xbmc/linux/XFileUtils.cpp similarity index 100% rename from src/linux/XFileUtils.cpp rename to xbmc/linux/XFileUtils.cpp diff --git a/src/linux/XFileUtils.h b/xbmc/linux/XFileUtils.h similarity index 100% rename from src/linux/XFileUtils.h rename to xbmc/linux/XFileUtils.h diff --git a/src/linux/XHandle.cpp b/xbmc/linux/XHandle.cpp similarity index 100% rename from src/linux/XHandle.cpp rename to xbmc/linux/XHandle.cpp diff --git a/src/linux/XHandle.h b/xbmc/linux/XHandle.h similarity index 100% rename from src/linux/XHandle.h rename to xbmc/linux/XHandle.h diff --git a/src/linux/XHandlePublic.h b/xbmc/linux/XHandlePublic.h similarity index 100% rename from src/linux/XHandlePublic.h rename to xbmc/linux/XHandlePublic.h diff --git a/src/linux/XMemUtils.cpp b/xbmc/linux/XMemUtils.cpp similarity index 100% rename from src/linux/XMemUtils.cpp rename to xbmc/linux/XMemUtils.cpp diff --git a/src/linux/XMemUtils.h b/xbmc/linux/XMemUtils.h similarity index 100% rename from src/linux/XMemUtils.h rename to xbmc/linux/XMemUtils.h diff --git a/src/linux/XTimeUtils.cpp b/xbmc/linux/XTimeUtils.cpp similarity index 100% rename from src/linux/XTimeUtils.cpp rename to xbmc/linux/XTimeUtils.cpp diff --git a/src/linux/XTimeUtils.h b/xbmc/linux/XTimeUtils.h similarity index 100% rename from src/linux/XTimeUtils.h rename to xbmc/linux/XTimeUtils.h diff --git a/src/linux/sse4/CopyFrame.cpp b/xbmc/linux/sse4/CopyFrame.cpp similarity index 100% rename from src/linux/sse4/CopyFrame.cpp rename to xbmc/linux/sse4/CopyFrame.cpp diff --git a/src/linux/sse4/DllLibSSE4.h b/xbmc/linux/sse4/DllLibSSE4.h similarity index 100% rename from src/linux/sse4/DllLibSSE4.h rename to xbmc/linux/sse4/DllLibSSE4.h diff --git a/src/linux/sse4/Makefile.in b/xbmc/linux/sse4/Makefile.in similarity index 100% rename from src/linux/sse4/Makefile.in rename to xbmc/linux/sse4/Makefile.in diff --git a/src/linux/stat_utf8.h b/xbmc/linux/stat_utf8.h similarity index 100% rename from src/linux/stat_utf8.h rename to xbmc/linux/stat_utf8.h diff --git a/src/linux/stdio_utf8.h b/xbmc/linux/stdio_utf8.h similarity index 100% rename from src/linux/stdio_utf8.h rename to xbmc/linux/stdio_utf8.h diff --git a/src/listproviders/DirectoryProvider.cpp b/xbmc/listproviders/DirectoryProvider.cpp similarity index 100% rename from src/listproviders/DirectoryProvider.cpp rename to xbmc/listproviders/DirectoryProvider.cpp diff --git a/src/listproviders/DirectoryProvider.h b/xbmc/listproviders/DirectoryProvider.h similarity index 100% rename from src/listproviders/DirectoryProvider.h rename to xbmc/listproviders/DirectoryProvider.h diff --git a/src/listproviders/IListProvider.cpp b/xbmc/listproviders/IListProvider.cpp similarity index 100% rename from src/listproviders/IListProvider.cpp rename to xbmc/listproviders/IListProvider.cpp diff --git a/src/listproviders/IListProvider.h b/xbmc/listproviders/IListProvider.h similarity index 100% rename from src/listproviders/IListProvider.h rename to xbmc/listproviders/IListProvider.h diff --git a/src/listproviders/Makefile b/xbmc/listproviders/Makefile similarity index 100% rename from src/listproviders/Makefile rename to xbmc/listproviders/Makefile diff --git a/src/listproviders/StaticProvider.cpp b/xbmc/listproviders/StaticProvider.cpp similarity index 100% rename from src/listproviders/StaticProvider.cpp rename to xbmc/listproviders/StaticProvider.cpp diff --git a/src/listproviders/StaticProvider.h b/xbmc/listproviders/StaticProvider.h similarity index 100% rename from src/listproviders/StaticProvider.h rename to xbmc/listproviders/StaticProvider.h diff --git a/src/main/Makefile.in b/xbmc/main/Makefile.in similarity index 100% rename from src/main/Makefile.in rename to xbmc/main/Makefile.in diff --git a/src/main/main.cpp b/xbmc/main/main.cpp similarity index 100% rename from src/main/main.cpp rename to xbmc/main/main.cpp diff --git a/src/main/osx/SDLMain.h b/xbmc/main/osx/SDLMain.h similarity index 100% rename from src/main/osx/SDLMain.h rename to xbmc/main/osx/SDLMain.h diff --git a/src/main/osx/SDLMain.mm b/xbmc/main/osx/SDLMain.mm similarity index 100% rename from src/main/osx/SDLMain.mm rename to xbmc/main/osx/SDLMain.mm diff --git a/src/media/Makefile b/xbmc/media/Makefile similarity index 100% rename from src/media/Makefile rename to xbmc/media/Makefile diff --git a/src/media/MediaType.cpp b/xbmc/media/MediaType.cpp similarity index 100% rename from src/media/MediaType.cpp rename to xbmc/media/MediaType.cpp diff --git a/src/media/MediaType.h b/xbmc/media/MediaType.h similarity index 100% rename from src/media/MediaType.h rename to xbmc/media/MediaType.h diff --git a/src/music/Album.cpp b/xbmc/music/Album.cpp similarity index 100% rename from src/music/Album.cpp rename to xbmc/music/Album.cpp diff --git a/src/music/Album.h b/xbmc/music/Album.h similarity index 100% rename from src/music/Album.h rename to xbmc/music/Album.h diff --git a/src/music/Artist.cpp b/xbmc/music/Artist.cpp similarity index 100% rename from src/music/Artist.cpp rename to xbmc/music/Artist.cpp diff --git a/src/music/Artist.h b/xbmc/music/Artist.h similarity index 100% rename from src/music/Artist.h rename to xbmc/music/Artist.h diff --git a/src/music/GUIViewStateMusic.cpp b/xbmc/music/GUIViewStateMusic.cpp similarity index 100% rename from src/music/GUIViewStateMusic.cpp rename to xbmc/music/GUIViewStateMusic.cpp diff --git a/src/music/GUIViewStateMusic.h b/xbmc/music/GUIViewStateMusic.h similarity index 100% rename from src/music/GUIViewStateMusic.h rename to xbmc/music/GUIViewStateMusic.h diff --git a/src/music/Makefile b/xbmc/music/Makefile similarity index 100% rename from src/music/Makefile rename to xbmc/music/Makefile diff --git a/src/music/MusicDatabase.cpp b/xbmc/music/MusicDatabase.cpp similarity index 100% rename from src/music/MusicDatabase.cpp rename to xbmc/music/MusicDatabase.cpp diff --git a/src/music/MusicDatabase.h b/xbmc/music/MusicDatabase.h similarity index 100% rename from src/music/MusicDatabase.h rename to xbmc/music/MusicDatabase.h diff --git a/src/music/MusicDbUrl.cpp b/xbmc/music/MusicDbUrl.cpp similarity index 100% rename from src/music/MusicDbUrl.cpp rename to xbmc/music/MusicDbUrl.cpp diff --git a/src/music/MusicDbUrl.h b/xbmc/music/MusicDbUrl.h similarity index 100% rename from src/music/MusicDbUrl.h rename to xbmc/music/MusicDbUrl.h diff --git a/src/music/MusicInfoLoader.cpp b/xbmc/music/MusicInfoLoader.cpp similarity index 100% rename from src/music/MusicInfoLoader.cpp rename to xbmc/music/MusicInfoLoader.cpp diff --git a/src/music/MusicInfoLoader.h b/xbmc/music/MusicInfoLoader.h similarity index 100% rename from src/music/MusicInfoLoader.h rename to xbmc/music/MusicInfoLoader.h diff --git a/src/music/MusicThumbLoader.cpp b/xbmc/music/MusicThumbLoader.cpp similarity index 100% rename from src/music/MusicThumbLoader.cpp rename to xbmc/music/MusicThumbLoader.cpp diff --git a/src/music/MusicThumbLoader.h b/xbmc/music/MusicThumbLoader.h similarity index 100% rename from src/music/MusicThumbLoader.h rename to xbmc/music/MusicThumbLoader.h diff --git a/src/music/Song.cpp b/xbmc/music/Song.cpp similarity index 100% rename from src/music/Song.cpp rename to xbmc/music/Song.cpp diff --git a/src/music/Song.h b/xbmc/music/Song.h similarity index 100% rename from src/music/Song.h rename to xbmc/music/Song.h diff --git a/src/music/dialogs/GUIDialogMusicInfo.cpp b/xbmc/music/dialogs/GUIDialogMusicInfo.cpp similarity index 100% rename from src/music/dialogs/GUIDialogMusicInfo.cpp rename to xbmc/music/dialogs/GUIDialogMusicInfo.cpp diff --git a/src/music/dialogs/GUIDialogMusicInfo.h b/xbmc/music/dialogs/GUIDialogMusicInfo.h similarity index 100% rename from src/music/dialogs/GUIDialogMusicInfo.h rename to xbmc/music/dialogs/GUIDialogMusicInfo.h diff --git a/src/music/dialogs/GUIDialogMusicOSD.cpp b/xbmc/music/dialogs/GUIDialogMusicOSD.cpp similarity index 100% rename from src/music/dialogs/GUIDialogMusicOSD.cpp rename to xbmc/music/dialogs/GUIDialogMusicOSD.cpp diff --git a/src/music/dialogs/GUIDialogMusicOSD.h b/xbmc/music/dialogs/GUIDialogMusicOSD.h similarity index 100% rename from src/music/dialogs/GUIDialogMusicOSD.h rename to xbmc/music/dialogs/GUIDialogMusicOSD.h diff --git a/src/music/dialogs/GUIDialogMusicOverlay.cpp b/xbmc/music/dialogs/GUIDialogMusicOverlay.cpp similarity index 100% rename from src/music/dialogs/GUIDialogMusicOverlay.cpp rename to xbmc/music/dialogs/GUIDialogMusicOverlay.cpp diff --git a/src/music/dialogs/GUIDialogMusicOverlay.h b/xbmc/music/dialogs/GUIDialogMusicOverlay.h similarity index 100% rename from src/music/dialogs/GUIDialogMusicOverlay.h rename to xbmc/music/dialogs/GUIDialogMusicOverlay.h diff --git a/src/music/dialogs/GUIDialogSongInfo.cpp b/xbmc/music/dialogs/GUIDialogSongInfo.cpp similarity index 100% rename from src/music/dialogs/GUIDialogSongInfo.cpp rename to xbmc/music/dialogs/GUIDialogSongInfo.cpp diff --git a/src/music/dialogs/GUIDialogSongInfo.h b/xbmc/music/dialogs/GUIDialogSongInfo.h similarity index 100% rename from src/music/dialogs/GUIDialogSongInfo.h rename to xbmc/music/dialogs/GUIDialogSongInfo.h diff --git a/src/music/dialogs/GUIDialogVisualisationPresetList.cpp b/xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp similarity index 100% rename from src/music/dialogs/GUIDialogVisualisationPresetList.cpp rename to xbmc/music/dialogs/GUIDialogVisualisationPresetList.cpp diff --git a/src/music/dialogs/GUIDialogVisualisationPresetList.h b/xbmc/music/dialogs/GUIDialogVisualisationPresetList.h similarity index 100% rename from src/music/dialogs/GUIDialogVisualisationPresetList.h rename to xbmc/music/dialogs/GUIDialogVisualisationPresetList.h diff --git a/src/music/dialogs/Makefile b/xbmc/music/dialogs/Makefile similarity index 100% rename from src/music/dialogs/Makefile rename to xbmc/music/dialogs/Makefile diff --git a/src/music/infoscanner/Makefile b/xbmc/music/infoscanner/Makefile similarity index 100% rename from src/music/infoscanner/Makefile rename to xbmc/music/infoscanner/Makefile diff --git a/src/music/infoscanner/MusicAlbumInfo.cpp b/xbmc/music/infoscanner/MusicAlbumInfo.cpp similarity index 100% rename from src/music/infoscanner/MusicAlbumInfo.cpp rename to xbmc/music/infoscanner/MusicAlbumInfo.cpp diff --git a/src/music/infoscanner/MusicAlbumInfo.h b/xbmc/music/infoscanner/MusicAlbumInfo.h similarity index 100% rename from src/music/infoscanner/MusicAlbumInfo.h rename to xbmc/music/infoscanner/MusicAlbumInfo.h diff --git a/src/music/infoscanner/MusicArtistInfo.cpp b/xbmc/music/infoscanner/MusicArtistInfo.cpp similarity index 100% rename from src/music/infoscanner/MusicArtistInfo.cpp rename to xbmc/music/infoscanner/MusicArtistInfo.cpp diff --git a/src/music/infoscanner/MusicArtistInfo.h b/xbmc/music/infoscanner/MusicArtistInfo.h similarity index 100% rename from src/music/infoscanner/MusicArtistInfo.h rename to xbmc/music/infoscanner/MusicArtistInfo.h diff --git a/src/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp similarity index 100% rename from src/music/infoscanner/MusicInfoScanner.cpp rename to xbmc/music/infoscanner/MusicInfoScanner.cpp diff --git a/src/music/infoscanner/MusicInfoScanner.h b/xbmc/music/infoscanner/MusicInfoScanner.h similarity index 100% rename from src/music/infoscanner/MusicInfoScanner.h rename to xbmc/music/infoscanner/MusicInfoScanner.h diff --git a/src/music/infoscanner/MusicInfoScraper.cpp b/xbmc/music/infoscanner/MusicInfoScraper.cpp similarity index 100% rename from src/music/infoscanner/MusicInfoScraper.cpp rename to xbmc/music/infoscanner/MusicInfoScraper.cpp diff --git a/src/music/infoscanner/MusicInfoScraper.h b/xbmc/music/infoscanner/MusicInfoScraper.h similarity index 100% rename from src/music/infoscanner/MusicInfoScraper.h rename to xbmc/music/infoscanner/MusicInfoScraper.h diff --git a/src/music/karaoke/GUIDialogKaraokeSongSelector.cpp b/xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp similarity index 100% rename from src/music/karaoke/GUIDialogKaraokeSongSelector.cpp rename to xbmc/music/karaoke/GUIDialogKaraokeSongSelector.cpp diff --git a/src/music/karaoke/GUIDialogKaraokeSongSelector.h b/xbmc/music/karaoke/GUIDialogKaraokeSongSelector.h similarity index 100% rename from src/music/karaoke/GUIDialogKaraokeSongSelector.h rename to xbmc/music/karaoke/GUIDialogKaraokeSongSelector.h diff --git a/src/music/karaoke/GUIWindowKaraokeLyrics.cpp b/xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp similarity index 100% rename from src/music/karaoke/GUIWindowKaraokeLyrics.cpp rename to xbmc/music/karaoke/GUIWindowKaraokeLyrics.cpp diff --git a/src/music/karaoke/GUIWindowKaraokeLyrics.h b/xbmc/music/karaoke/GUIWindowKaraokeLyrics.h similarity index 100% rename from src/music/karaoke/GUIWindowKaraokeLyrics.h rename to xbmc/music/karaoke/GUIWindowKaraokeLyrics.h diff --git a/src/music/karaoke/Makefile.in b/xbmc/music/karaoke/Makefile.in similarity index 100% rename from src/music/karaoke/Makefile.in rename to xbmc/music/karaoke/Makefile.in diff --git a/src/music/karaoke/cdgdata.h b/xbmc/music/karaoke/cdgdata.h similarity index 100% rename from src/music/karaoke/cdgdata.h rename to xbmc/music/karaoke/cdgdata.h diff --git a/src/music/karaoke/karaokelyrics.cpp b/xbmc/music/karaoke/karaokelyrics.cpp similarity index 100% rename from src/music/karaoke/karaokelyrics.cpp rename to xbmc/music/karaoke/karaokelyrics.cpp diff --git a/src/music/karaoke/karaokelyrics.h b/xbmc/music/karaoke/karaokelyrics.h similarity index 100% rename from src/music/karaoke/karaokelyrics.h rename to xbmc/music/karaoke/karaokelyrics.h diff --git a/src/music/karaoke/karaokelyricscdg.cpp b/xbmc/music/karaoke/karaokelyricscdg.cpp similarity index 100% rename from src/music/karaoke/karaokelyricscdg.cpp rename to xbmc/music/karaoke/karaokelyricscdg.cpp diff --git a/src/music/karaoke/karaokelyricscdg.h b/xbmc/music/karaoke/karaokelyricscdg.h similarity index 100% rename from src/music/karaoke/karaokelyricscdg.h rename to xbmc/music/karaoke/karaokelyricscdg.h diff --git a/src/music/karaoke/karaokelyricsfactory.cpp b/xbmc/music/karaoke/karaokelyricsfactory.cpp similarity index 100% rename from src/music/karaoke/karaokelyricsfactory.cpp rename to xbmc/music/karaoke/karaokelyricsfactory.cpp diff --git a/src/music/karaoke/karaokelyricsfactory.h b/xbmc/music/karaoke/karaokelyricsfactory.h similarity index 100% rename from src/music/karaoke/karaokelyricsfactory.h rename to xbmc/music/karaoke/karaokelyricsfactory.h diff --git a/src/music/karaoke/karaokelyricsmanager.cpp b/xbmc/music/karaoke/karaokelyricsmanager.cpp similarity index 100% rename from src/music/karaoke/karaokelyricsmanager.cpp rename to xbmc/music/karaoke/karaokelyricsmanager.cpp diff --git a/src/music/karaoke/karaokelyricsmanager.h b/xbmc/music/karaoke/karaokelyricsmanager.h similarity index 100% rename from src/music/karaoke/karaokelyricsmanager.h rename to xbmc/music/karaoke/karaokelyricsmanager.h diff --git a/src/music/karaoke/karaokelyricstext.cpp b/xbmc/music/karaoke/karaokelyricstext.cpp similarity index 100% rename from src/music/karaoke/karaokelyricstext.cpp rename to xbmc/music/karaoke/karaokelyricstext.cpp diff --git a/src/music/karaoke/karaokelyricstext.h b/xbmc/music/karaoke/karaokelyricstext.h similarity index 100% rename from src/music/karaoke/karaokelyricstext.h rename to xbmc/music/karaoke/karaokelyricstext.h diff --git a/src/music/karaoke/karaokelyricstextkar.cpp b/xbmc/music/karaoke/karaokelyricstextkar.cpp similarity index 100% rename from src/music/karaoke/karaokelyricstextkar.cpp rename to xbmc/music/karaoke/karaokelyricstextkar.cpp diff --git a/src/music/karaoke/karaokelyricstextkar.h b/xbmc/music/karaoke/karaokelyricstextkar.h similarity index 100% rename from src/music/karaoke/karaokelyricstextkar.h rename to xbmc/music/karaoke/karaokelyricstextkar.h diff --git a/src/music/karaoke/karaokelyricstextlrc.cpp b/xbmc/music/karaoke/karaokelyricstextlrc.cpp similarity index 100% rename from src/music/karaoke/karaokelyricstextlrc.cpp rename to xbmc/music/karaoke/karaokelyricstextlrc.cpp diff --git a/src/music/karaoke/karaokelyricstextlrc.h b/xbmc/music/karaoke/karaokelyricstextlrc.h similarity index 100% rename from src/music/karaoke/karaokelyricstextlrc.h rename to xbmc/music/karaoke/karaokelyricstextlrc.h diff --git a/src/music/karaoke/karaokelyricstextustar.cpp b/xbmc/music/karaoke/karaokelyricstextustar.cpp similarity index 100% rename from src/music/karaoke/karaokelyricstextustar.cpp rename to xbmc/music/karaoke/karaokelyricstextustar.cpp diff --git a/src/music/karaoke/karaokelyricstextustar.h b/xbmc/music/karaoke/karaokelyricstextustar.h similarity index 100% rename from src/music/karaoke/karaokelyricstextustar.h rename to xbmc/music/karaoke/karaokelyricstextustar.h diff --git a/src/music/karaoke/karaokevideobackground.cpp b/xbmc/music/karaoke/karaokevideobackground.cpp similarity index 100% rename from src/music/karaoke/karaokevideobackground.cpp rename to xbmc/music/karaoke/karaokevideobackground.cpp diff --git a/src/music/karaoke/karaokevideobackground.h b/xbmc/music/karaoke/karaokevideobackground.h similarity index 100% rename from src/music/karaoke/karaokevideobackground.h rename to xbmc/music/karaoke/karaokevideobackground.h diff --git a/src/music/karaoke/karaokewindowbackground.cpp b/xbmc/music/karaoke/karaokewindowbackground.cpp similarity index 100% rename from src/music/karaoke/karaokewindowbackground.cpp rename to xbmc/music/karaoke/karaokewindowbackground.cpp diff --git a/src/music/karaoke/karaokewindowbackground.h b/xbmc/music/karaoke/karaokewindowbackground.h similarity index 100% rename from src/music/karaoke/karaokewindowbackground.h rename to xbmc/music/karaoke/karaokewindowbackground.h diff --git a/src/music/tags/ImusicInfoTagLoader.h b/xbmc/music/tags/ImusicInfoTagLoader.h similarity index 100% rename from src/music/tags/ImusicInfoTagLoader.h rename to xbmc/music/tags/ImusicInfoTagLoader.h diff --git a/src/music/tags/Makefile b/xbmc/music/tags/Makefile similarity index 100% rename from src/music/tags/Makefile rename to xbmc/music/tags/Makefile diff --git a/src/music/tags/MusicInfoTag.cpp b/xbmc/music/tags/MusicInfoTag.cpp similarity index 100% rename from src/music/tags/MusicInfoTag.cpp rename to xbmc/music/tags/MusicInfoTag.cpp diff --git a/src/music/tags/MusicInfoTag.h b/xbmc/music/tags/MusicInfoTag.h similarity index 100% rename from src/music/tags/MusicInfoTag.h rename to xbmc/music/tags/MusicInfoTag.h diff --git a/src/music/tags/MusicInfoTagLoaderASAP.cpp b/xbmc/music/tags/MusicInfoTagLoaderASAP.cpp similarity index 100% rename from src/music/tags/MusicInfoTagLoaderASAP.cpp rename to xbmc/music/tags/MusicInfoTagLoaderASAP.cpp diff --git a/src/music/tags/MusicInfoTagLoaderASAP.h b/xbmc/music/tags/MusicInfoTagLoaderASAP.h similarity index 100% rename from src/music/tags/MusicInfoTagLoaderASAP.h rename to xbmc/music/tags/MusicInfoTagLoaderASAP.h diff --git a/src/music/tags/MusicInfoTagLoaderCDDA.cpp b/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp similarity index 100% rename from src/music/tags/MusicInfoTagLoaderCDDA.cpp rename to xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp diff --git a/src/music/tags/MusicInfoTagLoaderCDDA.h b/xbmc/music/tags/MusicInfoTagLoaderCDDA.h similarity index 100% rename from src/music/tags/MusicInfoTagLoaderCDDA.h rename to xbmc/music/tags/MusicInfoTagLoaderCDDA.h diff --git a/src/music/tags/MusicInfoTagLoaderDatabase.cpp b/xbmc/music/tags/MusicInfoTagLoaderDatabase.cpp similarity index 100% rename from src/music/tags/MusicInfoTagLoaderDatabase.cpp rename to xbmc/music/tags/MusicInfoTagLoaderDatabase.cpp diff --git a/src/music/tags/MusicInfoTagLoaderDatabase.h b/xbmc/music/tags/MusicInfoTagLoaderDatabase.h similarity index 100% rename from src/music/tags/MusicInfoTagLoaderDatabase.h rename to xbmc/music/tags/MusicInfoTagLoaderDatabase.h diff --git a/src/music/tags/MusicInfoTagLoaderFactory.cpp b/xbmc/music/tags/MusicInfoTagLoaderFactory.cpp similarity index 100% rename from src/music/tags/MusicInfoTagLoaderFactory.cpp rename to xbmc/music/tags/MusicInfoTagLoaderFactory.cpp diff --git a/src/music/tags/MusicInfoTagLoaderFactory.h b/xbmc/music/tags/MusicInfoTagLoaderFactory.h similarity index 100% rename from src/music/tags/MusicInfoTagLoaderFactory.h rename to xbmc/music/tags/MusicInfoTagLoaderFactory.h diff --git a/src/music/tags/MusicInfoTagLoaderMidi.cpp b/xbmc/music/tags/MusicInfoTagLoaderMidi.cpp similarity index 100% rename from src/music/tags/MusicInfoTagLoaderMidi.cpp rename to xbmc/music/tags/MusicInfoTagLoaderMidi.cpp diff --git a/src/music/tags/MusicInfoTagLoaderMidi.h b/xbmc/music/tags/MusicInfoTagLoaderMidi.h similarity index 100% rename from src/music/tags/MusicInfoTagLoaderMidi.h rename to xbmc/music/tags/MusicInfoTagLoaderMidi.h diff --git a/src/music/tags/MusicInfoTagLoaderNSF.cpp b/xbmc/music/tags/MusicInfoTagLoaderNSF.cpp similarity index 100% rename from src/music/tags/MusicInfoTagLoaderNSF.cpp rename to xbmc/music/tags/MusicInfoTagLoaderNSF.cpp diff --git a/src/music/tags/MusicInfoTagLoaderNSF.h b/xbmc/music/tags/MusicInfoTagLoaderNSF.h similarity index 100% rename from src/music/tags/MusicInfoTagLoaderNSF.h rename to xbmc/music/tags/MusicInfoTagLoaderNSF.h diff --git a/src/music/tags/MusicInfoTagLoaderSPC.cpp b/xbmc/music/tags/MusicInfoTagLoaderSPC.cpp similarity index 100% rename from src/music/tags/MusicInfoTagLoaderSPC.cpp rename to xbmc/music/tags/MusicInfoTagLoaderSPC.cpp diff --git a/src/music/tags/MusicInfoTagLoaderSPC.h b/xbmc/music/tags/MusicInfoTagLoaderSPC.h similarity index 100% rename from src/music/tags/MusicInfoTagLoaderSPC.h rename to xbmc/music/tags/MusicInfoTagLoaderSPC.h diff --git a/src/music/tags/MusicInfoTagLoaderShn.cpp b/xbmc/music/tags/MusicInfoTagLoaderShn.cpp similarity index 100% rename from src/music/tags/MusicInfoTagLoaderShn.cpp rename to xbmc/music/tags/MusicInfoTagLoaderShn.cpp diff --git a/src/music/tags/MusicInfoTagLoaderShn.h b/xbmc/music/tags/MusicInfoTagLoaderShn.h similarity index 100% rename from src/music/tags/MusicInfoTagLoaderShn.h rename to xbmc/music/tags/MusicInfoTagLoaderShn.h diff --git a/src/music/tags/MusicInfoTagLoaderYM.cpp b/xbmc/music/tags/MusicInfoTagLoaderYM.cpp similarity index 100% rename from src/music/tags/MusicInfoTagLoaderYM.cpp rename to xbmc/music/tags/MusicInfoTagLoaderYM.cpp diff --git a/src/music/tags/MusicInfoTagLoaderYM.h b/xbmc/music/tags/MusicInfoTagLoaderYM.h similarity index 100% rename from src/music/tags/MusicInfoTagLoaderYM.h rename to xbmc/music/tags/MusicInfoTagLoaderYM.h diff --git a/src/music/tags/TagLibVFSStream.cpp b/xbmc/music/tags/TagLibVFSStream.cpp similarity index 100% rename from src/music/tags/TagLibVFSStream.cpp rename to xbmc/music/tags/TagLibVFSStream.cpp diff --git a/src/music/tags/TagLibVFSStream.h b/xbmc/music/tags/TagLibVFSStream.h similarity index 100% rename from src/music/tags/TagLibVFSStream.h rename to xbmc/music/tags/TagLibVFSStream.h diff --git a/src/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp similarity index 100% rename from src/music/tags/TagLoaderTagLib.cpp rename to xbmc/music/tags/TagLoaderTagLib.cpp diff --git a/src/music/tags/TagLoaderTagLib.h b/xbmc/music/tags/TagLoaderTagLib.h similarity index 100% rename from src/music/tags/TagLoaderTagLib.h rename to xbmc/music/tags/TagLoaderTagLib.h diff --git a/src/music/tags/test/Makefile b/xbmc/music/tags/test/Makefile similarity index 100% rename from src/music/tags/test/Makefile rename to xbmc/music/tags/test/Makefile diff --git a/src/music/tags/test/TestTagLoaderTagLib.cpp b/xbmc/music/tags/test/TestTagLoaderTagLib.cpp similarity index 100% rename from src/music/tags/test/TestTagLoaderTagLib.cpp rename to xbmc/music/tags/test/TestTagLoaderTagLib.cpp diff --git a/src/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp similarity index 100% rename from src/music/windows/GUIWindowMusicBase.cpp rename to xbmc/music/windows/GUIWindowMusicBase.cpp diff --git a/src/music/windows/GUIWindowMusicBase.h b/xbmc/music/windows/GUIWindowMusicBase.h similarity index 100% rename from src/music/windows/GUIWindowMusicBase.h rename to xbmc/music/windows/GUIWindowMusicBase.h diff --git a/src/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp similarity index 100% rename from src/music/windows/GUIWindowMusicNav.cpp rename to xbmc/music/windows/GUIWindowMusicNav.cpp diff --git a/src/music/windows/GUIWindowMusicNav.h b/xbmc/music/windows/GUIWindowMusicNav.h similarity index 100% rename from src/music/windows/GUIWindowMusicNav.h rename to xbmc/music/windows/GUIWindowMusicNav.h diff --git a/src/music/windows/GUIWindowMusicPlaylist.cpp b/xbmc/music/windows/GUIWindowMusicPlaylist.cpp similarity index 100% rename from src/music/windows/GUIWindowMusicPlaylist.cpp rename to xbmc/music/windows/GUIWindowMusicPlaylist.cpp diff --git a/src/music/windows/GUIWindowMusicPlaylist.h b/xbmc/music/windows/GUIWindowMusicPlaylist.h similarity index 100% rename from src/music/windows/GUIWindowMusicPlaylist.h rename to xbmc/music/windows/GUIWindowMusicPlaylist.h diff --git a/src/music/windows/GUIWindowMusicPlaylistEditor.cpp b/xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp similarity index 100% rename from src/music/windows/GUIWindowMusicPlaylistEditor.cpp rename to xbmc/music/windows/GUIWindowMusicPlaylistEditor.cpp diff --git a/src/music/windows/GUIWindowMusicPlaylistEditor.h b/xbmc/music/windows/GUIWindowMusicPlaylistEditor.h similarity index 100% rename from src/music/windows/GUIWindowMusicPlaylistEditor.h rename to xbmc/music/windows/GUIWindowMusicPlaylistEditor.h diff --git a/src/music/windows/GUIWindowMusicSongs.cpp b/xbmc/music/windows/GUIWindowMusicSongs.cpp similarity index 100% rename from src/music/windows/GUIWindowMusicSongs.cpp rename to xbmc/music/windows/GUIWindowMusicSongs.cpp diff --git a/src/music/windows/GUIWindowMusicSongs.h b/xbmc/music/windows/GUIWindowMusicSongs.h similarity index 100% rename from src/music/windows/GUIWindowMusicSongs.h rename to xbmc/music/windows/GUIWindowMusicSongs.h diff --git a/src/music/windows/GUIWindowVisualisation.cpp b/xbmc/music/windows/GUIWindowVisualisation.cpp similarity index 100% rename from src/music/windows/GUIWindowVisualisation.cpp rename to xbmc/music/windows/GUIWindowVisualisation.cpp diff --git a/src/music/windows/GUIWindowVisualisation.h b/xbmc/music/windows/GUIWindowVisualisation.h similarity index 100% rename from src/music/windows/GUIWindowVisualisation.h rename to xbmc/music/windows/GUIWindowVisualisation.h diff --git a/src/music/windows/Makefile b/xbmc/music/windows/Makefile similarity index 100% rename from src/music/windows/Makefile rename to xbmc/music/windows/Makefile diff --git a/src/network/AirPlayServer.cpp b/xbmc/network/AirPlayServer.cpp similarity index 100% rename from src/network/AirPlayServer.cpp rename to xbmc/network/AirPlayServer.cpp diff --git a/src/network/AirPlayServer.h b/xbmc/network/AirPlayServer.h similarity index 100% rename from src/network/AirPlayServer.h rename to xbmc/network/AirPlayServer.h diff --git a/src/network/AirTunesServer.cpp b/xbmc/network/AirTunesServer.cpp similarity index 100% rename from src/network/AirTunesServer.cpp rename to xbmc/network/AirTunesServer.cpp diff --git a/src/network/AirTunesServer.h b/xbmc/network/AirTunesServer.h similarity index 100% rename from src/network/AirTunesServer.h rename to xbmc/network/AirTunesServer.h diff --git a/src/network/DNSNameCache.cpp b/xbmc/network/DNSNameCache.cpp similarity index 100% rename from src/network/DNSNameCache.cpp rename to xbmc/network/DNSNameCache.cpp diff --git a/src/network/DNSNameCache.h b/xbmc/network/DNSNameCache.h similarity index 100% rename from src/network/DNSNameCache.h rename to xbmc/network/DNSNameCache.h diff --git a/src/network/DllLibPlist.h b/xbmc/network/DllLibPlist.h similarity index 100% rename from src/network/DllLibPlist.h rename to xbmc/network/DllLibPlist.h diff --git a/src/network/DllLibShairplay.h b/xbmc/network/DllLibShairplay.h similarity index 100% rename from src/network/DllLibShairplay.h rename to xbmc/network/DllLibShairplay.h diff --git a/src/network/EventClient.cpp b/xbmc/network/EventClient.cpp similarity index 100% rename from src/network/EventClient.cpp rename to xbmc/network/EventClient.cpp diff --git a/src/network/EventClient.h b/xbmc/network/EventClient.h similarity index 100% rename from src/network/EventClient.h rename to xbmc/network/EventClient.h diff --git a/src/network/EventPacket.cpp b/xbmc/network/EventPacket.cpp similarity index 100% rename from src/network/EventPacket.cpp rename to xbmc/network/EventPacket.cpp diff --git a/src/network/EventPacket.h b/xbmc/network/EventPacket.h similarity index 100% rename from src/network/EventPacket.h rename to xbmc/network/EventPacket.h diff --git a/src/network/EventServer.cpp b/xbmc/network/EventServer.cpp similarity index 100% rename from src/network/EventServer.cpp rename to xbmc/network/EventServer.cpp diff --git a/src/network/EventServer.h b/xbmc/network/EventServer.h similarity index 100% rename from src/network/EventServer.h rename to xbmc/network/EventServer.h diff --git a/src/network/GUIDialogAccessPoints.cpp b/xbmc/network/GUIDialogAccessPoints.cpp similarity index 100% rename from src/network/GUIDialogAccessPoints.cpp rename to xbmc/network/GUIDialogAccessPoints.cpp diff --git a/src/network/GUIDialogAccessPoints.h b/xbmc/network/GUIDialogAccessPoints.h similarity index 100% rename from src/network/GUIDialogAccessPoints.h rename to xbmc/network/GUIDialogAccessPoints.h diff --git a/src/network/GUIDialogNetworkSetup.cpp b/xbmc/network/GUIDialogNetworkSetup.cpp similarity index 100% rename from src/network/GUIDialogNetworkSetup.cpp rename to xbmc/network/GUIDialogNetworkSetup.cpp diff --git a/src/network/GUIDialogNetworkSetup.h b/xbmc/network/GUIDialogNetworkSetup.h similarity index 100% rename from src/network/GUIDialogNetworkSetup.h rename to xbmc/network/GUIDialogNetworkSetup.h diff --git a/src/network/Makefile.in b/xbmc/network/Makefile.in similarity index 100% rename from src/network/Makefile.in rename to xbmc/network/Makefile.in diff --git a/src/network/Network.cpp b/xbmc/network/Network.cpp similarity index 100% rename from src/network/Network.cpp rename to xbmc/network/Network.cpp diff --git a/src/network/Network.h b/xbmc/network/Network.h similarity index 100% rename from src/network/Network.h rename to xbmc/network/Network.h diff --git a/src/network/NetworkServices.cpp b/xbmc/network/NetworkServices.cpp similarity index 100% rename from src/network/NetworkServices.cpp rename to xbmc/network/NetworkServices.cpp diff --git a/src/network/NetworkServices.h b/xbmc/network/NetworkServices.h similarity index 100% rename from src/network/NetworkServices.h rename to xbmc/network/NetworkServices.h diff --git a/src/network/Socket.cpp b/xbmc/network/Socket.cpp similarity index 100% rename from src/network/Socket.cpp rename to xbmc/network/Socket.cpp diff --git a/src/network/Socket.h b/xbmc/network/Socket.h similarity index 100% rename from src/network/Socket.h rename to xbmc/network/Socket.h diff --git a/src/network/TCPServer.cpp b/xbmc/network/TCPServer.cpp similarity index 100% rename from src/network/TCPServer.cpp rename to xbmc/network/TCPServer.cpp diff --git a/src/network/TCPServer.h b/xbmc/network/TCPServer.h similarity index 100% rename from src/network/TCPServer.h rename to xbmc/network/TCPServer.h diff --git a/src/network/UdpClient.cpp b/xbmc/network/UdpClient.cpp similarity index 100% rename from src/network/UdpClient.cpp rename to xbmc/network/UdpClient.cpp diff --git a/src/network/UdpClient.h b/xbmc/network/UdpClient.h similarity index 100% rename from src/network/UdpClient.h rename to xbmc/network/UdpClient.h diff --git a/src/network/WakeOnAccess.cpp b/xbmc/network/WakeOnAccess.cpp similarity index 100% rename from src/network/WakeOnAccess.cpp rename to xbmc/network/WakeOnAccess.cpp diff --git a/src/network/WakeOnAccess.h b/xbmc/network/WakeOnAccess.h similarity index 100% rename from src/network/WakeOnAccess.h rename to xbmc/network/WakeOnAccess.h diff --git a/src/network/WebServer.cpp b/xbmc/network/WebServer.cpp similarity index 100% rename from src/network/WebServer.cpp rename to xbmc/network/WebServer.cpp diff --git a/src/network/WebServer.h b/xbmc/network/WebServer.h similarity index 100% rename from src/network/WebServer.h rename to xbmc/network/WebServer.h diff --git a/src/network/Zeroconf.cpp b/xbmc/network/Zeroconf.cpp similarity index 100% rename from src/network/Zeroconf.cpp rename to xbmc/network/Zeroconf.cpp diff --git a/src/network/Zeroconf.h b/xbmc/network/Zeroconf.h similarity index 100% rename from src/network/Zeroconf.h rename to xbmc/network/Zeroconf.h diff --git a/src/network/ZeroconfBrowser.cpp b/xbmc/network/ZeroconfBrowser.cpp similarity index 100% rename from src/network/ZeroconfBrowser.cpp rename to xbmc/network/ZeroconfBrowser.cpp diff --git a/src/network/ZeroconfBrowser.h b/xbmc/network/ZeroconfBrowser.h similarity index 100% rename from src/network/ZeroconfBrowser.h rename to xbmc/network/ZeroconfBrowser.h diff --git a/src/network/cddb.cpp b/xbmc/network/cddb.cpp similarity index 100% rename from src/network/cddb.cpp rename to xbmc/network/cddb.cpp diff --git a/src/network/cddb.h b/xbmc/network/cddb.h similarity index 100% rename from src/network/cddb.h rename to xbmc/network/cddb.h diff --git a/src/network/httprequesthandler/HTTPImageHandler.cpp b/xbmc/network/httprequesthandler/HTTPImageHandler.cpp similarity index 100% rename from src/network/httprequesthandler/HTTPImageHandler.cpp rename to xbmc/network/httprequesthandler/HTTPImageHandler.cpp diff --git a/src/network/httprequesthandler/HTTPImageHandler.h b/xbmc/network/httprequesthandler/HTTPImageHandler.h similarity index 100% rename from src/network/httprequesthandler/HTTPImageHandler.h rename to xbmc/network/httprequesthandler/HTTPImageHandler.h diff --git a/src/network/httprequesthandler/HTTPJsonRpcHandler.cpp b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp similarity index 100% rename from src/network/httprequesthandler/HTTPJsonRpcHandler.cpp rename to xbmc/network/httprequesthandler/HTTPJsonRpcHandler.cpp diff --git a/src/network/httprequesthandler/HTTPJsonRpcHandler.h b/xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h similarity index 100% rename from src/network/httprequesthandler/HTTPJsonRpcHandler.h rename to xbmc/network/httprequesthandler/HTTPJsonRpcHandler.h diff --git a/src/network/httprequesthandler/HTTPVfsHandler.cpp b/xbmc/network/httprequesthandler/HTTPVfsHandler.cpp similarity index 100% rename from src/network/httprequesthandler/HTTPVfsHandler.cpp rename to xbmc/network/httprequesthandler/HTTPVfsHandler.cpp diff --git a/src/network/httprequesthandler/HTTPVfsHandler.h b/xbmc/network/httprequesthandler/HTTPVfsHandler.h similarity index 100% rename from src/network/httprequesthandler/HTTPVfsHandler.h rename to xbmc/network/httprequesthandler/HTTPVfsHandler.h diff --git a/src/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp similarity index 100% rename from src/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp rename to xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.cpp diff --git a/src/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h b/xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h similarity index 100% rename from src/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h rename to xbmc/network/httprequesthandler/HTTPWebinterfaceAddonsHandler.h diff --git a/src/network/httprequesthandler/HTTPWebinterfaceHandler.cpp b/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.cpp similarity index 100% rename from src/network/httprequesthandler/HTTPWebinterfaceHandler.cpp rename to xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.cpp diff --git a/src/network/httprequesthandler/HTTPWebinterfaceHandler.h b/xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.h similarity index 100% rename from src/network/httprequesthandler/HTTPWebinterfaceHandler.h rename to xbmc/network/httprequesthandler/HTTPWebinterfaceHandler.h diff --git a/src/network/httprequesthandler/IHTTPRequestHandler.cpp b/xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp similarity index 100% rename from src/network/httprequesthandler/IHTTPRequestHandler.cpp rename to xbmc/network/httprequesthandler/IHTTPRequestHandler.cpp diff --git a/src/network/httprequesthandler/IHTTPRequestHandler.h b/xbmc/network/httprequesthandler/IHTTPRequestHandler.h similarity index 100% rename from src/network/httprequesthandler/IHTTPRequestHandler.h rename to xbmc/network/httprequesthandler/IHTTPRequestHandler.h diff --git a/src/network/httprequesthandler/Makefile b/xbmc/network/httprequesthandler/Makefile similarity index 100% rename from src/network/httprequesthandler/Makefile rename to xbmc/network/httprequesthandler/Makefile diff --git a/src/network/linux/Makefile b/xbmc/network/linux/Makefile similarity index 100% rename from src/network/linux/Makefile rename to xbmc/network/linux/Makefile diff --git a/src/network/linux/NetworkLinux.cpp b/xbmc/network/linux/NetworkLinux.cpp similarity index 100% rename from src/network/linux/NetworkLinux.cpp rename to xbmc/network/linux/NetworkLinux.cpp diff --git a/src/network/linux/NetworkLinux.h b/xbmc/network/linux/NetworkLinux.h similarity index 100% rename from src/network/linux/NetworkLinux.h rename to xbmc/network/linux/NetworkLinux.h diff --git a/src/network/linux/ZeroconfAvahi.cpp b/xbmc/network/linux/ZeroconfAvahi.cpp similarity index 100% rename from src/network/linux/ZeroconfAvahi.cpp rename to xbmc/network/linux/ZeroconfAvahi.cpp diff --git a/src/network/linux/ZeroconfAvahi.h b/xbmc/network/linux/ZeroconfAvahi.h similarity index 100% rename from src/network/linux/ZeroconfAvahi.h rename to xbmc/network/linux/ZeroconfAvahi.h diff --git a/src/network/linux/ZeroconfBrowserAvahi.cpp b/xbmc/network/linux/ZeroconfBrowserAvahi.cpp similarity index 100% rename from src/network/linux/ZeroconfBrowserAvahi.cpp rename to xbmc/network/linux/ZeroconfBrowserAvahi.cpp diff --git a/src/network/linux/ZeroconfBrowserAvahi.h b/xbmc/network/linux/ZeroconfBrowserAvahi.h similarity index 100% rename from src/network/linux/ZeroconfBrowserAvahi.h rename to xbmc/network/linux/ZeroconfBrowserAvahi.h diff --git a/src/network/mdns/Makefile b/xbmc/network/mdns/Makefile similarity index 100% rename from src/network/mdns/Makefile rename to xbmc/network/mdns/Makefile diff --git a/src/network/mdns/ZeroconfBrowserMDNS.cpp b/xbmc/network/mdns/ZeroconfBrowserMDNS.cpp similarity index 100% rename from src/network/mdns/ZeroconfBrowserMDNS.cpp rename to xbmc/network/mdns/ZeroconfBrowserMDNS.cpp diff --git a/src/network/mdns/ZeroconfBrowserMDNS.h b/xbmc/network/mdns/ZeroconfBrowserMDNS.h similarity index 100% rename from src/network/mdns/ZeroconfBrowserMDNS.h rename to xbmc/network/mdns/ZeroconfBrowserMDNS.h diff --git a/src/network/mdns/ZeroconfMDNS.cpp b/xbmc/network/mdns/ZeroconfMDNS.cpp similarity index 100% rename from src/network/mdns/ZeroconfMDNS.cpp rename to xbmc/network/mdns/ZeroconfMDNS.cpp diff --git a/src/network/mdns/ZeroconfMDNS.h b/xbmc/network/mdns/ZeroconfMDNS.h similarity index 100% rename from src/network/mdns/ZeroconfMDNS.h rename to xbmc/network/mdns/ZeroconfMDNS.h diff --git a/src/network/osx/Makefile b/xbmc/network/osx/Makefile similarity index 100% rename from src/network/osx/Makefile rename to xbmc/network/osx/Makefile diff --git a/src/network/osx/ZeroconfBrowserOSX.cpp b/xbmc/network/osx/ZeroconfBrowserOSX.cpp similarity index 100% rename from src/network/osx/ZeroconfBrowserOSX.cpp rename to xbmc/network/osx/ZeroconfBrowserOSX.cpp diff --git a/src/network/osx/ZeroconfBrowserOSX.h b/xbmc/network/osx/ZeroconfBrowserOSX.h similarity index 100% rename from src/network/osx/ZeroconfBrowserOSX.h rename to xbmc/network/osx/ZeroconfBrowserOSX.h diff --git a/src/network/osx/ZeroconfOSX.cpp b/xbmc/network/osx/ZeroconfOSX.cpp similarity index 100% rename from src/network/osx/ZeroconfOSX.cpp rename to xbmc/network/osx/ZeroconfOSX.cpp diff --git a/src/network/osx/ZeroconfOSX.h b/xbmc/network/osx/ZeroconfOSX.h similarity index 100% rename from src/network/osx/ZeroconfOSX.h rename to xbmc/network/osx/ZeroconfOSX.h diff --git a/src/network/osx/ioshacks.h b/xbmc/network/osx/ioshacks.h similarity index 100% rename from src/network/osx/ioshacks.h rename to xbmc/network/osx/ioshacks.h diff --git a/src/network/upnp/Makefile.in b/xbmc/network/upnp/Makefile.in similarity index 100% rename from src/network/upnp/Makefile.in rename to xbmc/network/upnp/Makefile.in diff --git a/src/network/upnp/UPnP.cpp b/xbmc/network/upnp/UPnP.cpp similarity index 100% rename from src/network/upnp/UPnP.cpp rename to xbmc/network/upnp/UPnP.cpp diff --git a/src/network/upnp/UPnP.h b/xbmc/network/upnp/UPnP.h similarity index 100% rename from src/network/upnp/UPnP.h rename to xbmc/network/upnp/UPnP.h diff --git a/src/network/upnp/UPnPInternal.cpp b/xbmc/network/upnp/UPnPInternal.cpp similarity index 100% rename from src/network/upnp/UPnPInternal.cpp rename to xbmc/network/upnp/UPnPInternal.cpp diff --git a/src/network/upnp/UPnPInternal.h b/xbmc/network/upnp/UPnPInternal.h similarity index 100% rename from src/network/upnp/UPnPInternal.h rename to xbmc/network/upnp/UPnPInternal.h diff --git a/src/network/upnp/UPnPPlayer.cpp b/xbmc/network/upnp/UPnPPlayer.cpp similarity index 100% rename from src/network/upnp/UPnPPlayer.cpp rename to xbmc/network/upnp/UPnPPlayer.cpp diff --git a/src/network/upnp/UPnPPlayer.h b/xbmc/network/upnp/UPnPPlayer.h similarity index 100% rename from src/network/upnp/UPnPPlayer.h rename to xbmc/network/upnp/UPnPPlayer.h diff --git a/src/network/upnp/UPnPRenderer.cpp b/xbmc/network/upnp/UPnPRenderer.cpp similarity index 100% rename from src/network/upnp/UPnPRenderer.cpp rename to xbmc/network/upnp/UPnPRenderer.cpp diff --git a/src/network/upnp/UPnPRenderer.h b/xbmc/network/upnp/UPnPRenderer.h similarity index 100% rename from src/network/upnp/UPnPRenderer.h rename to xbmc/network/upnp/UPnPRenderer.h diff --git a/src/network/upnp/UPnPServer.cpp b/xbmc/network/upnp/UPnPServer.cpp similarity index 100% rename from src/network/upnp/UPnPServer.cpp rename to xbmc/network/upnp/UPnPServer.cpp diff --git a/src/network/upnp/UPnPServer.h b/xbmc/network/upnp/UPnPServer.h similarity index 100% rename from src/network/upnp/UPnPServer.h rename to xbmc/network/upnp/UPnPServer.h diff --git a/src/network/upnp/UPnPSettings.cpp b/xbmc/network/upnp/UPnPSettings.cpp similarity index 100% rename from src/network/upnp/UPnPSettings.cpp rename to xbmc/network/upnp/UPnPSettings.cpp diff --git a/src/network/upnp/UPnPSettings.h b/xbmc/network/upnp/UPnPSettings.h similarity index 100% rename from src/network/upnp/UPnPSettings.h rename to xbmc/network/upnp/UPnPSettings.h diff --git a/src/network/websocket/Makefile b/xbmc/network/websocket/Makefile similarity index 100% rename from src/network/websocket/Makefile rename to xbmc/network/websocket/Makefile diff --git a/src/network/websocket/WebSocket.cpp b/xbmc/network/websocket/WebSocket.cpp similarity index 100% rename from src/network/websocket/WebSocket.cpp rename to xbmc/network/websocket/WebSocket.cpp diff --git a/src/network/websocket/WebSocket.h b/xbmc/network/websocket/WebSocket.h similarity index 100% rename from src/network/websocket/WebSocket.h rename to xbmc/network/websocket/WebSocket.h diff --git a/src/network/websocket/WebSocketManager.cpp b/xbmc/network/websocket/WebSocketManager.cpp similarity index 100% rename from src/network/websocket/WebSocketManager.cpp rename to xbmc/network/websocket/WebSocketManager.cpp diff --git a/src/network/websocket/WebSocketManager.h b/xbmc/network/websocket/WebSocketManager.h similarity index 100% rename from src/network/websocket/WebSocketManager.h rename to xbmc/network/websocket/WebSocketManager.h diff --git a/src/network/websocket/WebSocketV13.cpp b/xbmc/network/websocket/WebSocketV13.cpp similarity index 100% rename from src/network/websocket/WebSocketV13.cpp rename to xbmc/network/websocket/WebSocketV13.cpp diff --git a/src/network/websocket/WebSocketV13.h b/xbmc/network/websocket/WebSocketV13.h similarity index 100% rename from src/network/websocket/WebSocketV13.h rename to xbmc/network/websocket/WebSocketV13.h diff --git a/src/network/websocket/WebSocketV8.cpp b/xbmc/network/websocket/WebSocketV8.cpp similarity index 100% rename from src/network/websocket/WebSocketV8.cpp rename to xbmc/network/websocket/WebSocketV8.cpp diff --git a/src/network/websocket/WebSocketV8.h b/xbmc/network/websocket/WebSocketV8.h similarity index 100% rename from src/network/websocket/WebSocketV8.h rename to xbmc/network/websocket/WebSocketV8.h diff --git a/src/network/windows/NetworkWin32.cpp b/xbmc/network/windows/NetworkWin32.cpp similarity index 100% rename from src/network/windows/NetworkWin32.cpp rename to xbmc/network/windows/NetworkWin32.cpp diff --git a/src/network/windows/NetworkWin32.h b/xbmc/network/windows/NetworkWin32.h similarity index 100% rename from src/network/windows/NetworkWin32.h rename to xbmc/network/windows/NetworkWin32.h diff --git a/src/osx/AutoPool.h b/xbmc/osx/AutoPool.h similarity index 100% rename from src/osx/AutoPool.h rename to xbmc/osx/AutoPool.h diff --git a/src/osx/AutoPool.mm b/xbmc/osx/AutoPool.mm similarity index 100% rename from src/osx/AutoPool.mm rename to xbmc/osx/AutoPool.mm diff --git a/src/osx/CocoaInterface.h b/xbmc/osx/CocoaInterface.h similarity index 100% rename from src/osx/CocoaInterface.h rename to xbmc/osx/CocoaInterface.h diff --git a/src/osx/CocoaInterface.mm b/xbmc/osx/CocoaInterface.mm similarity index 100% rename from src/osx/CocoaInterface.mm rename to xbmc/osx/CocoaInterface.mm diff --git a/src/osx/Credits.html b/xbmc/osx/Credits.html similarity index 100% rename from src/osx/Credits.html rename to xbmc/osx/Credits.html diff --git a/src/osx/DarwinUtils.h b/xbmc/osx/DarwinUtils.h similarity index 100% rename from src/osx/DarwinUtils.h rename to xbmc/osx/DarwinUtils.h diff --git a/src/osx/DarwinUtils.mm b/xbmc/osx/DarwinUtils.mm similarity index 100% rename from src/osx/DarwinUtils.mm rename to xbmc/osx/DarwinUtils.mm diff --git a/src/osx/HotKeyController.h b/xbmc/osx/HotKeyController.h similarity index 100% rename from src/osx/HotKeyController.h rename to xbmc/osx/HotKeyController.h diff --git a/src/osx/HotKeyController.m b/xbmc/osx/HotKeyController.m similarity index 100% rename from src/osx/HotKeyController.m rename to xbmc/osx/HotKeyController.m diff --git a/src/osx/IOSEAGLView.h b/xbmc/osx/IOSEAGLView.h similarity index 100% rename from src/osx/IOSEAGLView.h rename to xbmc/osx/IOSEAGLView.h diff --git a/src/osx/IOSEAGLView.mm b/xbmc/osx/IOSEAGLView.mm similarity index 100% rename from src/osx/IOSEAGLView.mm rename to xbmc/osx/IOSEAGLView.mm diff --git a/src/osx/IOSExternalTouchController.h b/xbmc/osx/IOSExternalTouchController.h similarity index 100% rename from src/osx/IOSExternalTouchController.h rename to xbmc/osx/IOSExternalTouchController.h diff --git a/src/osx/IOSExternalTouchController.mm b/xbmc/osx/IOSExternalTouchController.mm similarity index 100% rename from src/osx/IOSExternalTouchController.mm rename to xbmc/osx/IOSExternalTouchController.mm diff --git a/src/osx/IOSScreenManager.h b/xbmc/osx/IOSScreenManager.h similarity index 100% rename from src/osx/IOSScreenManager.h rename to xbmc/osx/IOSScreenManager.h diff --git a/src/osx/IOSScreenManager.mm b/xbmc/osx/IOSScreenManager.mm similarity index 100% rename from src/osx/IOSScreenManager.mm rename to xbmc/osx/IOSScreenManager.mm diff --git a/src/osx/Info.plist.in b/xbmc/osx/Info.plist.in similarity index 100% rename from src/osx/Info.plist.in rename to xbmc/osx/Info.plist.in diff --git a/src/osx/Makefile.in b/xbmc/osx/Makefile.in similarity index 100% rename from src/osx/Makefile.in rename to xbmc/osx/Makefile.in diff --git a/src/osx/OSXGNUReplacements.c b/xbmc/osx/OSXGNUReplacements.c similarity index 100% rename from src/osx/OSXGNUReplacements.c rename to xbmc/osx/OSXGNUReplacements.c diff --git a/src/osx/OSXGNUReplacements.h b/xbmc/osx/OSXGNUReplacements.h similarity index 100% rename from src/osx/OSXGNUReplacements.h rename to xbmc/osx/OSXGNUReplacements.h diff --git a/src/osx/OSXTextInputResponder.h b/xbmc/osx/OSXTextInputResponder.h similarity index 100% rename from src/osx/OSXTextInputResponder.h rename to xbmc/osx/OSXTextInputResponder.h diff --git a/src/osx/OSXTextInputResponder.mm b/xbmc/osx/OSXTextInputResponder.mm similarity index 100% rename from src/osx/OSXTextInputResponder.mm rename to xbmc/osx/OSXTextInputResponder.mm diff --git a/src/osx/XBMCHelper.cpp b/xbmc/osx/XBMCHelper.cpp similarity index 100% rename from src/osx/XBMCHelper.cpp rename to xbmc/osx/XBMCHelper.cpp diff --git a/src/osx/XBMCHelper.h b/xbmc/osx/XBMCHelper.h similarity index 100% rename from src/osx/XBMCHelper.h rename to xbmc/osx/XBMCHelper.h diff --git a/src/osx/atv2/English.lproj/InfoPlist.strings b/xbmc/osx/atv2/English.lproj/InfoPlist.strings similarity index 100% rename from src/osx/atv2/English.lproj/InfoPlist.strings rename to xbmc/osx/atv2/English.lproj/InfoPlist.strings diff --git a/src/osx/atv2/KodiAppliance.h b/xbmc/osx/atv2/KodiAppliance.h similarity index 100% rename from src/osx/atv2/KodiAppliance.h rename to xbmc/osx/atv2/KodiAppliance.h diff --git a/src/osx/atv2/KodiAppliance.mm b/xbmc/osx/atv2/KodiAppliance.mm similarity index 100% rename from src/osx/atv2/KodiAppliance.mm rename to xbmc/osx/atv2/KodiAppliance.mm diff --git a/src/osx/atv2/KodiController.h b/xbmc/osx/atv2/KodiController.h similarity index 100% rename from src/osx/atv2/KodiController.h rename to xbmc/osx/atv2/KodiController.h diff --git a/src/osx/atv2/KodiController.mm b/xbmc/osx/atv2/KodiController.mm similarity index 100% rename from src/osx/atv2/KodiController.mm rename to xbmc/osx/atv2/KodiController.mm diff --git a/src/osx/atv2/XBMCATV2-Info.plist.in b/xbmc/osx/atv2/XBMCATV2-Info.plist.in similarity index 100% rename from src/osx/atv2/XBMCATV2-Info.plist.in rename to xbmc/osx/atv2/XBMCATV2-Info.plist.in diff --git a/src/osx/atv2/XBMCDebugHelpers.h b/xbmc/osx/atv2/XBMCDebugHelpers.h similarity index 100% rename from src/osx/atv2/XBMCDebugHelpers.h rename to xbmc/osx/atv2/XBMCDebugHelpers.h diff --git a/src/osx/atv2/kodiclient.h b/xbmc/osx/atv2/kodiclient.h similarity index 100% rename from src/osx/atv2/kodiclient.h rename to xbmc/osx/atv2/kodiclient.h diff --git a/src/osx/atv2/kodiclientwrapper.h b/xbmc/osx/atv2/kodiclientwrapper.h similarity index 100% rename from src/osx/atv2/kodiclientwrapper.h rename to xbmc/osx/atv2/kodiclientwrapper.h diff --git a/src/osx/atv2/kodiclientwrapper.mm b/xbmc/osx/atv2/kodiclientwrapper.mm similarity index 100% rename from src/osx/atv2/kodiclientwrapper.mm rename to xbmc/osx/atv2/kodiclientwrapper.mm diff --git a/src/osx/atv2/substrate.h b/xbmc/osx/atv2/substrate.h similarity index 100% rename from src/osx/atv2/substrate.h rename to xbmc/osx/atv2/substrate.h diff --git a/src/osx/ios/Default-568h@2x.png b/xbmc/osx/ios/Default-568h@2x.png similarity index 100% rename from src/osx/ios/Default-568h@2x.png rename to xbmc/osx/ios/Default-568h@2x.png diff --git a/src/osx/ios/Default-667h@2x.png b/xbmc/osx/ios/Default-667h@2x.png similarity index 100% rename from src/osx/ios/Default-667h@2x.png rename to xbmc/osx/ios/Default-667h@2x.png diff --git a/src/osx/ios/Default-736h@3x.png b/xbmc/osx/ios/Default-736h@3x.png similarity index 100% rename from src/osx/ios/Default-736h@3x.png rename to xbmc/osx/ios/Default-736h@3x.png diff --git a/src/osx/ios/Default-Landscape-736h@3x.png b/xbmc/osx/ios/Default-Landscape-736h@3x.png similarity index 100% rename from src/osx/ios/Default-Landscape-736h@3x.png rename to xbmc/osx/ios/Default-Landscape-736h@3x.png diff --git a/src/osx/ios/English.lproj/InfoPlist.strings b/xbmc/osx/ios/English.lproj/InfoPlist.strings similarity index 100% rename from src/osx/ios/English.lproj/InfoPlist.strings rename to xbmc/osx/ios/English.lproj/InfoPlist.strings diff --git a/src/osx/ios/IOSKeyboard.h b/xbmc/osx/ios/IOSKeyboard.h similarity index 100% rename from src/osx/ios/IOSKeyboard.h rename to xbmc/osx/ios/IOSKeyboard.h diff --git a/src/osx/ios/IOSKeyboard.mm b/xbmc/osx/ios/IOSKeyboard.mm similarity index 100% rename from src/osx/ios/IOSKeyboard.mm rename to xbmc/osx/ios/IOSKeyboard.mm diff --git a/src/osx/ios/IOSKeyboardView.h b/xbmc/osx/ios/IOSKeyboardView.h similarity index 100% rename from src/osx/ios/IOSKeyboardView.h rename to xbmc/osx/ios/IOSKeyboardView.h diff --git a/src/osx/ios/IOSKeyboardView.mm b/xbmc/osx/ios/IOSKeyboardView.mm similarity index 100% rename from src/osx/ios/IOSKeyboardView.mm rename to xbmc/osx/ios/IOSKeyboardView.mm diff --git a/src/osx/ios/XBMCApplication.h b/xbmc/osx/ios/XBMCApplication.h similarity index 100% rename from src/osx/ios/XBMCApplication.h rename to xbmc/osx/ios/XBMCApplication.h diff --git a/src/osx/ios/XBMCApplication.m b/xbmc/osx/ios/XBMCApplication.m similarity index 100% rename from src/osx/ios/XBMCApplication.m rename to xbmc/osx/ios/XBMCApplication.m diff --git a/src/osx/ios/XBMCController.h b/xbmc/osx/ios/XBMCController.h similarity index 100% rename from src/osx/ios/XBMCController.h rename to xbmc/osx/ios/XBMCController.h diff --git a/src/osx/ios/XBMCController.mm b/xbmc/osx/ios/XBMCController.mm similarity index 100% rename from src/osx/ios/XBMCController.mm rename to xbmc/osx/ios/XBMCController.mm diff --git a/src/osx/ios/XBMCDebugHelpers.h b/xbmc/osx/ios/XBMCDebugHelpers.h similarity index 100% rename from src/osx/ios/XBMCDebugHelpers.h rename to xbmc/osx/ios/XBMCDebugHelpers.h diff --git a/src/osx/ios/XBMCIOS-Info.plist.in b/xbmc/osx/ios/XBMCIOS-Info.plist.in similarity index 100% rename from src/osx/ios/XBMCIOS-Info.plist.in rename to xbmc/osx/ios/XBMCIOS-Info.plist.in diff --git a/src/osx/smc.c b/xbmc/osx/smc.c similarity index 100% rename from src/osx/smc.c rename to xbmc/osx/smc.c diff --git a/src/osx/smc.h b/xbmc/osx/smc.h similarity index 100% rename from src/osx/smc.h rename to xbmc/osx/smc.h diff --git a/src/peripherals/Makefile b/xbmc/peripherals/Makefile similarity index 100% rename from src/peripherals/Makefile rename to xbmc/peripherals/Makefile diff --git a/src/peripherals/PeripheralTypes.h b/xbmc/peripherals/PeripheralTypes.h similarity index 100% rename from src/peripherals/PeripheralTypes.h rename to xbmc/peripherals/PeripheralTypes.h diff --git a/src/peripherals/Peripherals.cpp b/xbmc/peripherals/Peripherals.cpp similarity index 100% rename from src/peripherals/Peripherals.cpp rename to xbmc/peripherals/Peripherals.cpp diff --git a/src/peripherals/Peripherals.h b/xbmc/peripherals/Peripherals.h similarity index 100% rename from src/peripherals/Peripherals.h rename to xbmc/peripherals/Peripherals.h diff --git a/src/peripherals/bus/Makefile.in b/xbmc/peripherals/bus/Makefile.in similarity index 100% rename from src/peripherals/bus/Makefile.in rename to xbmc/peripherals/bus/Makefile.in diff --git a/src/peripherals/bus/PeripheralBus.cpp b/xbmc/peripherals/bus/PeripheralBus.cpp similarity index 100% rename from src/peripherals/bus/PeripheralBus.cpp rename to xbmc/peripherals/bus/PeripheralBus.cpp diff --git a/src/peripherals/bus/PeripheralBus.h b/xbmc/peripherals/bus/PeripheralBus.h similarity index 100% rename from src/peripherals/bus/PeripheralBus.h rename to xbmc/peripherals/bus/PeripheralBus.h diff --git a/src/peripherals/bus/PeripheralBusUSB.h b/xbmc/peripherals/bus/PeripheralBusUSB.h similarity index 100% rename from src/peripherals/bus/PeripheralBusUSB.h rename to xbmc/peripherals/bus/PeripheralBusUSB.h diff --git a/src/peripherals/bus/linux/PeripheralBusUSBLibUSB.cpp b/xbmc/peripherals/bus/linux/PeripheralBusUSBLibUSB.cpp similarity index 100% rename from src/peripherals/bus/linux/PeripheralBusUSBLibUSB.cpp rename to xbmc/peripherals/bus/linux/PeripheralBusUSBLibUSB.cpp diff --git a/src/peripherals/bus/linux/PeripheralBusUSBLibUSB.h b/xbmc/peripherals/bus/linux/PeripheralBusUSBLibUSB.h similarity index 100% rename from src/peripherals/bus/linux/PeripheralBusUSBLibUSB.h rename to xbmc/peripherals/bus/linux/PeripheralBusUSBLibUSB.h diff --git a/src/peripherals/bus/linux/PeripheralBusUSBLibUdev.cpp b/xbmc/peripherals/bus/linux/PeripheralBusUSBLibUdev.cpp similarity index 100% rename from src/peripherals/bus/linux/PeripheralBusUSBLibUdev.cpp rename to xbmc/peripherals/bus/linux/PeripheralBusUSBLibUdev.cpp diff --git a/src/peripherals/bus/linux/PeripheralBusUSBLibUdev.h b/xbmc/peripherals/bus/linux/PeripheralBusUSBLibUdev.h similarity index 100% rename from src/peripherals/bus/linux/PeripheralBusUSBLibUdev.h rename to xbmc/peripherals/bus/linux/PeripheralBusUSBLibUdev.h diff --git a/src/peripherals/bus/osx/PeripheralBusUSB.cpp b/xbmc/peripherals/bus/osx/PeripheralBusUSB.cpp similarity index 100% rename from src/peripherals/bus/osx/PeripheralBusUSB.cpp rename to xbmc/peripherals/bus/osx/PeripheralBusUSB.cpp diff --git a/src/peripherals/bus/osx/PeripheralBusUSB.h b/xbmc/peripherals/bus/osx/PeripheralBusUSB.h similarity index 100% rename from src/peripherals/bus/osx/PeripheralBusUSB.h rename to xbmc/peripherals/bus/osx/PeripheralBusUSB.h diff --git a/src/peripherals/bus/virtual/PeripheralBusCEC.cpp b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp similarity index 100% rename from src/peripherals/bus/virtual/PeripheralBusCEC.cpp rename to xbmc/peripherals/bus/virtual/PeripheralBusCEC.cpp diff --git a/src/peripherals/bus/virtual/PeripheralBusCEC.h b/xbmc/peripherals/bus/virtual/PeripheralBusCEC.h similarity index 100% rename from src/peripherals/bus/virtual/PeripheralBusCEC.h rename to xbmc/peripherals/bus/virtual/PeripheralBusCEC.h diff --git a/src/peripherals/bus/win32/PeripheralBusUSB.cpp b/xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp similarity index 100% rename from src/peripherals/bus/win32/PeripheralBusUSB.cpp rename to xbmc/peripherals/bus/win32/PeripheralBusUSB.cpp diff --git a/src/peripherals/bus/win32/PeripheralBusUSB.h b/xbmc/peripherals/bus/win32/PeripheralBusUSB.h similarity index 100% rename from src/peripherals/bus/win32/PeripheralBusUSB.h rename to xbmc/peripherals/bus/win32/PeripheralBusUSB.h diff --git a/src/peripherals/devices/Makefile.in b/xbmc/peripherals/devices/Makefile.in similarity index 100% rename from src/peripherals/devices/Makefile.in rename to xbmc/peripherals/devices/Makefile.in diff --git a/src/peripherals/devices/Peripheral.cpp b/xbmc/peripherals/devices/Peripheral.cpp similarity index 100% rename from src/peripherals/devices/Peripheral.cpp rename to xbmc/peripherals/devices/Peripheral.cpp diff --git a/src/peripherals/devices/Peripheral.h b/xbmc/peripherals/devices/Peripheral.h similarity index 100% rename from src/peripherals/devices/Peripheral.h rename to xbmc/peripherals/devices/Peripheral.h diff --git a/src/peripherals/devices/PeripheralBluetooth.cpp b/xbmc/peripherals/devices/PeripheralBluetooth.cpp similarity index 100% rename from src/peripherals/devices/PeripheralBluetooth.cpp rename to xbmc/peripherals/devices/PeripheralBluetooth.cpp diff --git a/src/peripherals/devices/PeripheralBluetooth.h b/xbmc/peripherals/devices/PeripheralBluetooth.h similarity index 100% rename from src/peripherals/devices/PeripheralBluetooth.h rename to xbmc/peripherals/devices/PeripheralBluetooth.h diff --git a/src/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp similarity index 100% rename from src/peripherals/devices/PeripheralCecAdapter.cpp rename to xbmc/peripherals/devices/PeripheralCecAdapter.cpp diff --git a/src/peripherals/devices/PeripheralCecAdapter.h b/xbmc/peripherals/devices/PeripheralCecAdapter.h similarity index 100% rename from src/peripherals/devices/PeripheralCecAdapter.h rename to xbmc/peripherals/devices/PeripheralCecAdapter.h diff --git a/src/peripherals/devices/PeripheralDisk.cpp b/xbmc/peripherals/devices/PeripheralDisk.cpp similarity index 100% rename from src/peripherals/devices/PeripheralDisk.cpp rename to xbmc/peripherals/devices/PeripheralDisk.cpp diff --git a/src/peripherals/devices/PeripheralDisk.h b/xbmc/peripherals/devices/PeripheralDisk.h similarity index 100% rename from src/peripherals/devices/PeripheralDisk.h rename to xbmc/peripherals/devices/PeripheralDisk.h diff --git a/src/peripherals/devices/PeripheralHID.cpp b/xbmc/peripherals/devices/PeripheralHID.cpp similarity index 100% rename from src/peripherals/devices/PeripheralHID.cpp rename to xbmc/peripherals/devices/PeripheralHID.cpp diff --git a/src/peripherals/devices/PeripheralHID.h b/xbmc/peripherals/devices/PeripheralHID.h similarity index 100% rename from src/peripherals/devices/PeripheralHID.h rename to xbmc/peripherals/devices/PeripheralHID.h diff --git a/src/peripherals/devices/PeripheralImon.cpp b/xbmc/peripherals/devices/PeripheralImon.cpp similarity index 100% rename from src/peripherals/devices/PeripheralImon.cpp rename to xbmc/peripherals/devices/PeripheralImon.cpp diff --git a/src/peripherals/devices/PeripheralImon.h b/xbmc/peripherals/devices/PeripheralImon.h similarity index 100% rename from src/peripherals/devices/PeripheralImon.h rename to xbmc/peripherals/devices/PeripheralImon.h diff --git a/src/peripherals/devices/PeripheralNIC.cpp b/xbmc/peripherals/devices/PeripheralNIC.cpp similarity index 100% rename from src/peripherals/devices/PeripheralNIC.cpp rename to xbmc/peripherals/devices/PeripheralNIC.cpp diff --git a/src/peripherals/devices/PeripheralNIC.h b/xbmc/peripherals/devices/PeripheralNIC.h similarity index 100% rename from src/peripherals/devices/PeripheralNIC.h rename to xbmc/peripherals/devices/PeripheralNIC.h diff --git a/src/peripherals/devices/PeripheralNyxboard.cpp b/xbmc/peripherals/devices/PeripheralNyxboard.cpp similarity index 100% rename from src/peripherals/devices/PeripheralNyxboard.cpp rename to xbmc/peripherals/devices/PeripheralNyxboard.cpp diff --git a/src/peripherals/devices/PeripheralNyxboard.h b/xbmc/peripherals/devices/PeripheralNyxboard.h similarity index 100% rename from src/peripherals/devices/PeripheralNyxboard.h rename to xbmc/peripherals/devices/PeripheralNyxboard.h diff --git a/src/peripherals/devices/PeripheralTuner.cpp b/xbmc/peripherals/devices/PeripheralTuner.cpp similarity index 100% rename from src/peripherals/devices/PeripheralTuner.cpp rename to xbmc/peripherals/devices/PeripheralTuner.cpp diff --git a/src/peripherals/devices/PeripheralTuner.h b/xbmc/peripherals/devices/PeripheralTuner.h similarity index 100% rename from src/peripherals/devices/PeripheralTuner.h rename to xbmc/peripherals/devices/PeripheralTuner.h diff --git a/src/peripherals/dialogs/GUIDialogPeripheralManager.cpp b/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.cpp similarity index 100% rename from src/peripherals/dialogs/GUIDialogPeripheralManager.cpp rename to xbmc/peripherals/dialogs/GUIDialogPeripheralManager.cpp diff --git a/src/peripherals/dialogs/GUIDialogPeripheralManager.h b/xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h similarity index 100% rename from src/peripherals/dialogs/GUIDialogPeripheralManager.h rename to xbmc/peripherals/dialogs/GUIDialogPeripheralManager.h diff --git a/src/peripherals/dialogs/GUIDialogPeripheralSettings.cpp b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp similarity index 100% rename from src/peripherals/dialogs/GUIDialogPeripheralSettings.cpp rename to xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.cpp diff --git a/src/peripherals/dialogs/GUIDialogPeripheralSettings.h b/xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h similarity index 100% rename from src/peripherals/dialogs/GUIDialogPeripheralSettings.h rename to xbmc/peripherals/dialogs/GUIDialogPeripheralSettings.h diff --git a/src/peripherals/dialogs/Makefile b/xbmc/peripherals/dialogs/Makefile similarity index 100% rename from src/peripherals/dialogs/Makefile rename to xbmc/peripherals/dialogs/Makefile diff --git a/src/pictures/DllImageLib.h b/xbmc/pictures/DllImageLib.h similarity index 100% rename from src/pictures/DllImageLib.h rename to xbmc/pictures/DllImageLib.h diff --git a/src/pictures/DllLibExif.h b/xbmc/pictures/DllLibExif.h similarity index 100% rename from src/pictures/DllLibExif.h rename to xbmc/pictures/DllLibExif.h diff --git a/src/pictures/GUIDialogPictureInfo.cpp b/xbmc/pictures/GUIDialogPictureInfo.cpp similarity index 100% rename from src/pictures/GUIDialogPictureInfo.cpp rename to xbmc/pictures/GUIDialogPictureInfo.cpp diff --git a/src/pictures/GUIDialogPictureInfo.h b/xbmc/pictures/GUIDialogPictureInfo.h similarity index 100% rename from src/pictures/GUIDialogPictureInfo.h rename to xbmc/pictures/GUIDialogPictureInfo.h diff --git a/src/pictures/GUIViewStatePictures.cpp b/xbmc/pictures/GUIViewStatePictures.cpp similarity index 100% rename from src/pictures/GUIViewStatePictures.cpp rename to xbmc/pictures/GUIViewStatePictures.cpp diff --git a/src/pictures/GUIViewStatePictures.h b/xbmc/pictures/GUIViewStatePictures.h similarity index 100% rename from src/pictures/GUIViewStatePictures.h rename to xbmc/pictures/GUIViewStatePictures.h diff --git a/src/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp similarity index 100% rename from src/pictures/GUIWindowPictures.cpp rename to xbmc/pictures/GUIWindowPictures.cpp diff --git a/src/pictures/GUIWindowPictures.h b/xbmc/pictures/GUIWindowPictures.h similarity index 100% rename from src/pictures/GUIWindowPictures.h rename to xbmc/pictures/GUIWindowPictures.h diff --git a/src/pictures/GUIWindowSlideShow.cpp b/xbmc/pictures/GUIWindowSlideShow.cpp similarity index 100% rename from src/pictures/GUIWindowSlideShow.cpp rename to xbmc/pictures/GUIWindowSlideShow.cpp diff --git a/src/pictures/GUIWindowSlideShow.h b/xbmc/pictures/GUIWindowSlideShow.h similarity index 100% rename from src/pictures/GUIWindowSlideShow.h rename to xbmc/pictures/GUIWindowSlideShow.h diff --git a/src/pictures/Makefile b/xbmc/pictures/Makefile similarity index 100% rename from src/pictures/Makefile rename to xbmc/pictures/Makefile diff --git a/src/pictures/Picture.cpp b/xbmc/pictures/Picture.cpp similarity index 100% rename from src/pictures/Picture.cpp rename to xbmc/pictures/Picture.cpp diff --git a/src/pictures/Picture.h b/xbmc/pictures/Picture.h similarity index 100% rename from src/pictures/Picture.h rename to xbmc/pictures/Picture.h diff --git a/src/pictures/PictureInfoLoader.cpp b/xbmc/pictures/PictureInfoLoader.cpp similarity index 100% rename from src/pictures/PictureInfoLoader.cpp rename to xbmc/pictures/PictureInfoLoader.cpp diff --git a/src/pictures/PictureInfoLoader.h b/xbmc/pictures/PictureInfoLoader.h similarity index 100% rename from src/pictures/PictureInfoLoader.h rename to xbmc/pictures/PictureInfoLoader.h diff --git a/src/pictures/PictureInfoTag.cpp b/xbmc/pictures/PictureInfoTag.cpp similarity index 100% rename from src/pictures/PictureInfoTag.cpp rename to xbmc/pictures/PictureInfoTag.cpp diff --git a/src/pictures/PictureInfoTag.h b/xbmc/pictures/PictureInfoTag.h similarity index 100% rename from src/pictures/PictureInfoTag.h rename to xbmc/pictures/PictureInfoTag.h diff --git a/src/pictures/PictureThumbLoader.cpp b/xbmc/pictures/PictureThumbLoader.cpp similarity index 100% rename from src/pictures/PictureThumbLoader.cpp rename to xbmc/pictures/PictureThumbLoader.cpp diff --git a/src/pictures/PictureThumbLoader.h b/xbmc/pictures/PictureThumbLoader.h similarity index 100% rename from src/pictures/PictureThumbLoader.h rename to xbmc/pictures/PictureThumbLoader.h diff --git a/src/pictures/SlideShowPicture.cpp b/xbmc/pictures/SlideShowPicture.cpp similarity index 100% rename from src/pictures/SlideShowPicture.cpp rename to xbmc/pictures/SlideShowPicture.cpp diff --git a/src/pictures/SlideShowPicture.h b/xbmc/pictures/SlideShowPicture.h similarity index 100% rename from src/pictures/SlideShowPicture.h rename to xbmc/pictures/SlideShowPicture.h diff --git a/src/playlists/Makefile b/xbmc/playlists/Makefile similarity index 100% rename from src/playlists/Makefile rename to xbmc/playlists/Makefile diff --git a/src/playlists/PlayList.cpp b/xbmc/playlists/PlayList.cpp similarity index 100% rename from src/playlists/PlayList.cpp rename to xbmc/playlists/PlayList.cpp diff --git a/src/playlists/PlayList.h b/xbmc/playlists/PlayList.h similarity index 100% rename from src/playlists/PlayList.h rename to xbmc/playlists/PlayList.h diff --git a/src/playlists/PlayListB4S.cpp b/xbmc/playlists/PlayListB4S.cpp similarity index 100% rename from src/playlists/PlayListB4S.cpp rename to xbmc/playlists/PlayListB4S.cpp diff --git a/src/playlists/PlayListB4S.h b/xbmc/playlists/PlayListB4S.h similarity index 100% rename from src/playlists/PlayListB4S.h rename to xbmc/playlists/PlayListB4S.h diff --git a/src/playlists/PlayListFactory.cpp b/xbmc/playlists/PlayListFactory.cpp similarity index 100% rename from src/playlists/PlayListFactory.cpp rename to xbmc/playlists/PlayListFactory.cpp diff --git a/src/playlists/PlayListFactory.h b/xbmc/playlists/PlayListFactory.h similarity index 100% rename from src/playlists/PlayListFactory.h rename to xbmc/playlists/PlayListFactory.h diff --git a/src/playlists/PlayListM3U.cpp b/xbmc/playlists/PlayListM3U.cpp similarity index 100% rename from src/playlists/PlayListM3U.cpp rename to xbmc/playlists/PlayListM3U.cpp diff --git a/src/playlists/PlayListM3U.h b/xbmc/playlists/PlayListM3U.h similarity index 100% rename from src/playlists/PlayListM3U.h rename to xbmc/playlists/PlayListM3U.h diff --git a/src/playlists/PlayListPLS.cpp b/xbmc/playlists/PlayListPLS.cpp similarity index 100% rename from src/playlists/PlayListPLS.cpp rename to xbmc/playlists/PlayListPLS.cpp diff --git a/src/playlists/PlayListPLS.h b/xbmc/playlists/PlayListPLS.h similarity index 100% rename from src/playlists/PlayListPLS.h rename to xbmc/playlists/PlayListPLS.h diff --git a/src/playlists/PlayListURL.cpp b/xbmc/playlists/PlayListURL.cpp similarity index 100% rename from src/playlists/PlayListURL.cpp rename to xbmc/playlists/PlayListURL.cpp diff --git a/src/playlists/PlayListURL.h b/xbmc/playlists/PlayListURL.h similarity index 100% rename from src/playlists/PlayListURL.h rename to xbmc/playlists/PlayListURL.h diff --git a/src/playlists/PlayListWPL.cpp b/xbmc/playlists/PlayListWPL.cpp similarity index 100% rename from src/playlists/PlayListWPL.cpp rename to xbmc/playlists/PlayListWPL.cpp diff --git a/src/playlists/PlayListWPL.h b/xbmc/playlists/PlayListWPL.h similarity index 100% rename from src/playlists/PlayListWPL.h rename to xbmc/playlists/PlayListWPL.h diff --git a/src/playlists/PlayListXML.cpp b/xbmc/playlists/PlayListXML.cpp similarity index 100% rename from src/playlists/PlayListXML.cpp rename to xbmc/playlists/PlayListXML.cpp diff --git a/src/playlists/PlayListXML.h b/xbmc/playlists/PlayListXML.h similarity index 100% rename from src/playlists/PlayListXML.h rename to xbmc/playlists/PlayListXML.h diff --git a/src/playlists/SmartPlayList.cpp b/xbmc/playlists/SmartPlayList.cpp similarity index 100% rename from src/playlists/SmartPlayList.cpp rename to xbmc/playlists/SmartPlayList.cpp diff --git a/src/playlists/SmartPlayList.h b/xbmc/playlists/SmartPlayList.h similarity index 100% rename from src/playlists/SmartPlayList.h rename to xbmc/playlists/SmartPlayList.h diff --git a/src/playlists/SmartPlaylistFileItemListModifier.cpp b/xbmc/playlists/SmartPlaylistFileItemListModifier.cpp similarity index 100% rename from src/playlists/SmartPlaylistFileItemListModifier.cpp rename to xbmc/playlists/SmartPlaylistFileItemListModifier.cpp diff --git a/src/playlists/SmartPlaylistFileItemListModifier.h b/xbmc/playlists/SmartPlaylistFileItemListModifier.h similarity index 100% rename from src/playlists/SmartPlaylistFileItemListModifier.h rename to xbmc/playlists/SmartPlaylistFileItemListModifier.h diff --git a/src/powermanagement/DPMSSupport.cpp b/xbmc/powermanagement/DPMSSupport.cpp similarity index 100% rename from src/powermanagement/DPMSSupport.cpp rename to xbmc/powermanagement/DPMSSupport.cpp diff --git a/src/powermanagement/DPMSSupport.h b/xbmc/powermanagement/DPMSSupport.h similarity index 100% rename from src/powermanagement/DPMSSupport.h rename to xbmc/powermanagement/DPMSSupport.h diff --git a/src/powermanagement/IPowerSyscall.h b/xbmc/powermanagement/IPowerSyscall.h similarity index 100% rename from src/powermanagement/IPowerSyscall.h rename to xbmc/powermanagement/IPowerSyscall.h diff --git a/src/powermanagement/Makefile b/xbmc/powermanagement/Makefile similarity index 100% rename from src/powermanagement/Makefile rename to xbmc/powermanagement/Makefile diff --git a/src/powermanagement/PowerManager.cpp b/xbmc/powermanagement/PowerManager.cpp similarity index 100% rename from src/powermanagement/PowerManager.cpp rename to xbmc/powermanagement/PowerManager.cpp diff --git a/src/powermanagement/PowerManager.h b/xbmc/powermanagement/PowerManager.h similarity index 100% rename from src/powermanagement/PowerManager.h rename to xbmc/powermanagement/PowerManager.h diff --git a/src/powermanagement/android/AndroidPowerSyscall.cpp b/xbmc/powermanagement/android/AndroidPowerSyscall.cpp similarity index 100% rename from src/powermanagement/android/AndroidPowerSyscall.cpp rename to xbmc/powermanagement/android/AndroidPowerSyscall.cpp diff --git a/src/powermanagement/android/AndroidPowerSyscall.h b/xbmc/powermanagement/android/AndroidPowerSyscall.h similarity index 100% rename from src/powermanagement/android/AndroidPowerSyscall.h rename to xbmc/powermanagement/android/AndroidPowerSyscall.h diff --git a/src/powermanagement/android/Makefile b/xbmc/powermanagement/android/Makefile similarity index 100% rename from src/powermanagement/android/Makefile rename to xbmc/powermanagement/android/Makefile diff --git a/src/powermanagement/linux/ConsoleDeviceKitPowerSyscall.cpp b/xbmc/powermanagement/linux/ConsoleDeviceKitPowerSyscall.cpp similarity index 100% rename from src/powermanagement/linux/ConsoleDeviceKitPowerSyscall.cpp rename to xbmc/powermanagement/linux/ConsoleDeviceKitPowerSyscall.cpp diff --git a/src/powermanagement/linux/ConsoleDeviceKitPowerSyscall.h b/xbmc/powermanagement/linux/ConsoleDeviceKitPowerSyscall.h similarity index 100% rename from src/powermanagement/linux/ConsoleDeviceKitPowerSyscall.h rename to xbmc/powermanagement/linux/ConsoleDeviceKitPowerSyscall.h diff --git a/src/powermanagement/linux/ConsoleUPowerSyscall.cpp b/xbmc/powermanagement/linux/ConsoleUPowerSyscall.cpp similarity index 100% rename from src/powermanagement/linux/ConsoleUPowerSyscall.cpp rename to xbmc/powermanagement/linux/ConsoleUPowerSyscall.cpp diff --git a/src/powermanagement/linux/ConsoleUPowerSyscall.h b/xbmc/powermanagement/linux/ConsoleUPowerSyscall.h similarity index 100% rename from src/powermanagement/linux/ConsoleUPowerSyscall.h rename to xbmc/powermanagement/linux/ConsoleUPowerSyscall.h diff --git a/src/powermanagement/linux/FallbackPowerSyscall.h b/xbmc/powermanagement/linux/FallbackPowerSyscall.h similarity index 100% rename from src/powermanagement/linux/FallbackPowerSyscall.h rename to xbmc/powermanagement/linux/FallbackPowerSyscall.h diff --git a/src/powermanagement/linux/LogindUPowerSyscall.cpp b/xbmc/powermanagement/linux/LogindUPowerSyscall.cpp similarity index 100% rename from src/powermanagement/linux/LogindUPowerSyscall.cpp rename to xbmc/powermanagement/linux/LogindUPowerSyscall.cpp diff --git a/src/powermanagement/linux/LogindUPowerSyscall.h b/xbmc/powermanagement/linux/LogindUPowerSyscall.h similarity index 100% rename from src/powermanagement/linux/LogindUPowerSyscall.h rename to xbmc/powermanagement/linux/LogindUPowerSyscall.h diff --git a/src/powermanagement/linux/Makefile b/xbmc/powermanagement/linux/Makefile similarity index 100% rename from src/powermanagement/linux/Makefile rename to xbmc/powermanagement/linux/Makefile diff --git a/src/powermanagement/linux/UPowerSyscall.cpp b/xbmc/powermanagement/linux/UPowerSyscall.cpp similarity index 100% rename from src/powermanagement/linux/UPowerSyscall.cpp rename to xbmc/powermanagement/linux/UPowerSyscall.cpp diff --git a/src/powermanagement/linux/UPowerSyscall.h b/xbmc/powermanagement/linux/UPowerSyscall.h similarity index 100% rename from src/powermanagement/linux/UPowerSyscall.h rename to xbmc/powermanagement/linux/UPowerSyscall.h diff --git a/src/powermanagement/osx/CocoaPowerSyscall.cpp b/xbmc/powermanagement/osx/CocoaPowerSyscall.cpp similarity index 100% rename from src/powermanagement/osx/CocoaPowerSyscall.cpp rename to xbmc/powermanagement/osx/CocoaPowerSyscall.cpp diff --git a/src/powermanagement/osx/CocoaPowerSyscall.h b/xbmc/powermanagement/osx/CocoaPowerSyscall.h similarity index 100% rename from src/powermanagement/osx/CocoaPowerSyscall.h rename to xbmc/powermanagement/osx/CocoaPowerSyscall.h diff --git a/src/powermanagement/osx/Makefile b/xbmc/powermanagement/osx/Makefile similarity index 100% rename from src/powermanagement/osx/Makefile rename to xbmc/powermanagement/osx/Makefile diff --git a/src/powermanagement/windows/Win32PowerSyscall.cpp b/xbmc/powermanagement/windows/Win32PowerSyscall.cpp similarity index 100% rename from src/powermanagement/windows/Win32PowerSyscall.cpp rename to xbmc/powermanagement/windows/Win32PowerSyscall.cpp diff --git a/src/powermanagement/windows/Win32PowerSyscall.h b/xbmc/powermanagement/windows/Win32PowerSyscall.h similarity index 100% rename from src/powermanagement/windows/Win32PowerSyscall.h rename to xbmc/powermanagement/windows/Win32PowerSyscall.h diff --git a/src/profiles/Makefile b/xbmc/profiles/Makefile similarity index 100% rename from src/profiles/Makefile rename to xbmc/profiles/Makefile diff --git a/src/profiles/Profile.cpp b/xbmc/profiles/Profile.cpp similarity index 100% rename from src/profiles/Profile.cpp rename to xbmc/profiles/Profile.cpp diff --git a/src/profiles/Profile.h b/xbmc/profiles/Profile.h similarity index 100% rename from src/profiles/Profile.h rename to xbmc/profiles/Profile.h diff --git a/src/profiles/ProfilesManager.cpp b/xbmc/profiles/ProfilesManager.cpp similarity index 100% rename from src/profiles/ProfilesManager.cpp rename to xbmc/profiles/ProfilesManager.cpp diff --git a/src/profiles/ProfilesManager.h b/xbmc/profiles/ProfilesManager.h similarity index 100% rename from src/profiles/ProfilesManager.h rename to xbmc/profiles/ProfilesManager.h diff --git a/src/profiles/dialogs/GUIDialogLockSettings.cpp b/xbmc/profiles/dialogs/GUIDialogLockSettings.cpp similarity index 100% rename from src/profiles/dialogs/GUIDialogLockSettings.cpp rename to xbmc/profiles/dialogs/GUIDialogLockSettings.cpp diff --git a/src/profiles/dialogs/GUIDialogLockSettings.h b/xbmc/profiles/dialogs/GUIDialogLockSettings.h similarity index 100% rename from src/profiles/dialogs/GUIDialogLockSettings.h rename to xbmc/profiles/dialogs/GUIDialogLockSettings.h diff --git a/src/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp similarity index 100% rename from src/profiles/dialogs/GUIDialogProfileSettings.cpp rename to xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp diff --git a/src/profiles/dialogs/GUIDialogProfileSettings.h b/xbmc/profiles/dialogs/GUIDialogProfileSettings.h similarity index 100% rename from src/profiles/dialogs/GUIDialogProfileSettings.h rename to xbmc/profiles/dialogs/GUIDialogProfileSettings.h diff --git a/src/profiles/dialogs/Makefile b/xbmc/profiles/dialogs/Makefile similarity index 100% rename from src/profiles/dialogs/Makefile rename to xbmc/profiles/dialogs/Makefile diff --git a/src/profiles/windows/GUIWindowSettingsProfile.cpp b/xbmc/profiles/windows/GUIWindowSettingsProfile.cpp similarity index 100% rename from src/profiles/windows/GUIWindowSettingsProfile.cpp rename to xbmc/profiles/windows/GUIWindowSettingsProfile.cpp diff --git a/src/profiles/windows/GUIWindowSettingsProfile.h b/xbmc/profiles/windows/GUIWindowSettingsProfile.h similarity index 100% rename from src/profiles/windows/GUIWindowSettingsProfile.h rename to xbmc/profiles/windows/GUIWindowSettingsProfile.h diff --git a/src/profiles/windows/Makefile b/xbmc/profiles/windows/Makefile similarity index 100% rename from src/profiles/windows/Makefile rename to xbmc/profiles/windows/Makefile diff --git a/src/programs/GUIViewStatePrograms.cpp b/xbmc/programs/GUIViewStatePrograms.cpp similarity index 100% rename from src/programs/GUIViewStatePrograms.cpp rename to xbmc/programs/GUIViewStatePrograms.cpp diff --git a/src/programs/GUIViewStatePrograms.h b/xbmc/programs/GUIViewStatePrograms.h similarity index 100% rename from src/programs/GUIViewStatePrograms.h rename to xbmc/programs/GUIViewStatePrograms.h diff --git a/src/programs/GUIWindowPrograms.cpp b/xbmc/programs/GUIWindowPrograms.cpp similarity index 100% rename from src/programs/GUIWindowPrograms.cpp rename to xbmc/programs/GUIWindowPrograms.cpp diff --git a/src/programs/GUIWindowPrograms.h b/xbmc/programs/GUIWindowPrograms.h similarity index 100% rename from src/programs/GUIWindowPrograms.h rename to xbmc/programs/GUIWindowPrograms.h diff --git a/src/programs/Makefile b/xbmc/programs/Makefile similarity index 100% rename from src/programs/Makefile rename to xbmc/programs/Makefile diff --git a/src/pvr/Makefile b/xbmc/pvr/Makefile similarity index 100% rename from src/pvr/Makefile rename to xbmc/pvr/Makefile diff --git a/src/pvr/PVRDatabase.cpp b/xbmc/pvr/PVRDatabase.cpp similarity index 100% rename from src/pvr/PVRDatabase.cpp rename to xbmc/pvr/PVRDatabase.cpp diff --git a/src/pvr/PVRDatabase.h b/xbmc/pvr/PVRDatabase.h similarity index 100% rename from src/pvr/PVRDatabase.h rename to xbmc/pvr/PVRDatabase.h diff --git a/src/pvr/PVRGUIInfo.cpp b/xbmc/pvr/PVRGUIInfo.cpp similarity index 100% rename from src/pvr/PVRGUIInfo.cpp rename to xbmc/pvr/PVRGUIInfo.cpp diff --git a/src/pvr/PVRGUIInfo.h b/xbmc/pvr/PVRGUIInfo.h similarity index 100% rename from src/pvr/PVRGUIInfo.h rename to xbmc/pvr/PVRGUIInfo.h diff --git a/src/pvr/PVRManager.cpp b/xbmc/pvr/PVRManager.cpp similarity index 100% rename from src/pvr/PVRManager.cpp rename to xbmc/pvr/PVRManager.cpp diff --git a/src/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h similarity index 100% rename from src/pvr/PVRManager.h rename to xbmc/pvr/PVRManager.h diff --git a/src/pvr/addons/Makefile b/xbmc/pvr/addons/Makefile similarity index 100% rename from src/pvr/addons/Makefile rename to xbmc/pvr/addons/Makefile diff --git a/src/pvr/addons/PVRClient.cpp b/xbmc/pvr/addons/PVRClient.cpp similarity index 100% rename from src/pvr/addons/PVRClient.cpp rename to xbmc/pvr/addons/PVRClient.cpp diff --git a/src/pvr/addons/PVRClient.h b/xbmc/pvr/addons/PVRClient.h similarity index 100% rename from src/pvr/addons/PVRClient.h rename to xbmc/pvr/addons/PVRClient.h diff --git a/src/pvr/addons/PVRClients.cpp b/xbmc/pvr/addons/PVRClients.cpp similarity index 100% rename from src/pvr/addons/PVRClients.cpp rename to xbmc/pvr/addons/PVRClients.cpp diff --git a/src/pvr/addons/PVRClients.h b/xbmc/pvr/addons/PVRClients.h similarity index 100% rename from src/pvr/addons/PVRClients.h rename to xbmc/pvr/addons/PVRClients.h diff --git a/src/pvr/channels/Makefile b/xbmc/pvr/channels/Makefile similarity index 100% rename from src/pvr/channels/Makefile rename to xbmc/pvr/channels/Makefile diff --git a/src/pvr/channels/PVRChannel.cpp b/xbmc/pvr/channels/PVRChannel.cpp similarity index 100% rename from src/pvr/channels/PVRChannel.cpp rename to xbmc/pvr/channels/PVRChannel.cpp diff --git a/src/pvr/channels/PVRChannel.h b/xbmc/pvr/channels/PVRChannel.h similarity index 100% rename from src/pvr/channels/PVRChannel.h rename to xbmc/pvr/channels/PVRChannel.h diff --git a/src/pvr/channels/PVRChannelGroup.cpp b/xbmc/pvr/channels/PVRChannelGroup.cpp similarity index 100% rename from src/pvr/channels/PVRChannelGroup.cpp rename to xbmc/pvr/channels/PVRChannelGroup.cpp diff --git a/src/pvr/channels/PVRChannelGroup.h b/xbmc/pvr/channels/PVRChannelGroup.h similarity index 100% rename from src/pvr/channels/PVRChannelGroup.h rename to xbmc/pvr/channels/PVRChannelGroup.h diff --git a/src/pvr/channels/PVRChannelGroupInternal.cpp b/xbmc/pvr/channels/PVRChannelGroupInternal.cpp similarity index 100% rename from src/pvr/channels/PVRChannelGroupInternal.cpp rename to xbmc/pvr/channels/PVRChannelGroupInternal.cpp diff --git a/src/pvr/channels/PVRChannelGroupInternal.h b/xbmc/pvr/channels/PVRChannelGroupInternal.h similarity index 100% rename from src/pvr/channels/PVRChannelGroupInternal.h rename to xbmc/pvr/channels/PVRChannelGroupInternal.h diff --git a/src/pvr/channels/PVRChannelGroups.cpp b/xbmc/pvr/channels/PVRChannelGroups.cpp similarity index 100% rename from src/pvr/channels/PVRChannelGroups.cpp rename to xbmc/pvr/channels/PVRChannelGroups.cpp diff --git a/src/pvr/channels/PVRChannelGroups.h b/xbmc/pvr/channels/PVRChannelGroups.h similarity index 100% rename from src/pvr/channels/PVRChannelGroups.h rename to xbmc/pvr/channels/PVRChannelGroups.h diff --git a/src/pvr/channels/PVRChannelGroupsContainer.cpp b/xbmc/pvr/channels/PVRChannelGroupsContainer.cpp similarity index 100% rename from src/pvr/channels/PVRChannelGroupsContainer.cpp rename to xbmc/pvr/channels/PVRChannelGroupsContainer.cpp diff --git a/src/pvr/channels/PVRChannelGroupsContainer.h b/xbmc/pvr/channels/PVRChannelGroupsContainer.h similarity index 100% rename from src/pvr/channels/PVRChannelGroupsContainer.h rename to xbmc/pvr/channels/PVRChannelGroupsContainer.h diff --git a/src/pvr/dialogs/GUIDialogPVRChannelManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRChannelManager.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRChannelManager.h b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRChannelManager.h rename to xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h diff --git a/src/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRChannelsOSD.h b/xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRChannelsOSD.h rename to xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h diff --git a/src/pvr/dialogs/GUIDialogPVRCutterOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRCutterOSD.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRCutterOSD.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRCutterOSD.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRCutterOSD.h b/xbmc/pvr/dialogs/GUIDialogPVRCutterOSD.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRCutterOSD.h rename to xbmc/pvr/dialogs/GUIDialogPVRCutterOSD.h diff --git a/src/pvr/dialogs/GUIDialogPVRDirectorOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRDirectorOSD.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRDirectorOSD.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRDirectorOSD.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRDirectorOSD.h b/xbmc/pvr/dialogs/GUIDialogPVRDirectorOSD.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRDirectorOSD.h rename to xbmc/pvr/dialogs/GUIDialogPVRDirectorOSD.h diff --git a/src/pvr/dialogs/GUIDialogPVRGroupManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRGroupManager.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRGroupManager.h b/xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRGroupManager.h rename to xbmc/pvr/dialogs/GUIDialogPVRGroupManager.h diff --git a/src/pvr/dialogs/GUIDialogPVRGuideInfo.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRGuideInfo.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRGuideInfo.h b/xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRGuideInfo.h rename to xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.h diff --git a/src/pvr/dialogs/GUIDialogPVRGuideOSD.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRGuideOSD.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRGuideOSD.h b/xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRGuideOSD.h rename to xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.h diff --git a/src/pvr/dialogs/GUIDialogPVRGuideSearch.cpp b/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRGuideSearch.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRGuideSearch.h b/xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRGuideSearch.h rename to xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.h diff --git a/src/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp b/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRRecordingInfo.h b/xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRRecordingInfo.h rename to xbmc/pvr/dialogs/GUIDialogPVRRecordingInfo.h diff --git a/src/pvr/dialogs/GUIDialogPVRTimerSettings.cpp b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRTimerSettings.cpp rename to xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp diff --git a/src/pvr/dialogs/GUIDialogPVRTimerSettings.h b/xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h similarity index 100% rename from src/pvr/dialogs/GUIDialogPVRTimerSettings.h rename to xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.h diff --git a/src/pvr/dialogs/Makefile b/xbmc/pvr/dialogs/Makefile similarity index 100% rename from src/pvr/dialogs/Makefile rename to xbmc/pvr/dialogs/Makefile diff --git a/src/pvr/recordings/Makefile b/xbmc/pvr/recordings/Makefile similarity index 100% rename from src/pvr/recordings/Makefile rename to xbmc/pvr/recordings/Makefile diff --git a/src/pvr/recordings/PVRRecording.cpp b/xbmc/pvr/recordings/PVRRecording.cpp similarity index 100% rename from src/pvr/recordings/PVRRecording.cpp rename to xbmc/pvr/recordings/PVRRecording.cpp diff --git a/src/pvr/recordings/PVRRecording.h b/xbmc/pvr/recordings/PVRRecording.h similarity index 100% rename from src/pvr/recordings/PVRRecording.h rename to xbmc/pvr/recordings/PVRRecording.h diff --git a/src/pvr/recordings/PVRRecordings.cpp b/xbmc/pvr/recordings/PVRRecordings.cpp similarity index 100% rename from src/pvr/recordings/PVRRecordings.cpp rename to xbmc/pvr/recordings/PVRRecordings.cpp diff --git a/src/pvr/recordings/PVRRecordings.h b/xbmc/pvr/recordings/PVRRecordings.h similarity index 100% rename from src/pvr/recordings/PVRRecordings.h rename to xbmc/pvr/recordings/PVRRecordings.h diff --git a/src/pvr/timers/Makefile b/xbmc/pvr/timers/Makefile similarity index 100% rename from src/pvr/timers/Makefile rename to xbmc/pvr/timers/Makefile diff --git a/src/pvr/timers/PVRTimerInfoTag.cpp b/xbmc/pvr/timers/PVRTimerInfoTag.cpp similarity index 100% rename from src/pvr/timers/PVRTimerInfoTag.cpp rename to xbmc/pvr/timers/PVRTimerInfoTag.cpp diff --git a/src/pvr/timers/PVRTimerInfoTag.h b/xbmc/pvr/timers/PVRTimerInfoTag.h similarity index 100% rename from src/pvr/timers/PVRTimerInfoTag.h rename to xbmc/pvr/timers/PVRTimerInfoTag.h diff --git a/src/pvr/timers/PVRTimers.cpp b/xbmc/pvr/timers/PVRTimers.cpp similarity index 100% rename from src/pvr/timers/PVRTimers.cpp rename to xbmc/pvr/timers/PVRTimers.cpp diff --git a/src/pvr/timers/PVRTimers.h b/xbmc/pvr/timers/PVRTimers.h similarity index 100% rename from src/pvr/timers/PVRTimers.h rename to xbmc/pvr/timers/PVRTimers.h diff --git a/src/pvr/windows/GUIViewStatePVR.cpp b/xbmc/pvr/windows/GUIViewStatePVR.cpp similarity index 100% rename from src/pvr/windows/GUIViewStatePVR.cpp rename to xbmc/pvr/windows/GUIViewStatePVR.cpp diff --git a/src/pvr/windows/GUIViewStatePVR.h b/xbmc/pvr/windows/GUIViewStatePVR.h similarity index 100% rename from src/pvr/windows/GUIViewStatePVR.h rename to xbmc/pvr/windows/GUIViewStatePVR.h diff --git a/src/pvr/windows/GUIWindowPVRBase.cpp b/xbmc/pvr/windows/GUIWindowPVRBase.cpp similarity index 100% rename from src/pvr/windows/GUIWindowPVRBase.cpp rename to xbmc/pvr/windows/GUIWindowPVRBase.cpp diff --git a/src/pvr/windows/GUIWindowPVRBase.h b/xbmc/pvr/windows/GUIWindowPVRBase.h similarity index 100% rename from src/pvr/windows/GUIWindowPVRBase.h rename to xbmc/pvr/windows/GUIWindowPVRBase.h diff --git a/src/pvr/windows/GUIWindowPVRChannels.cpp b/xbmc/pvr/windows/GUIWindowPVRChannels.cpp similarity index 100% rename from src/pvr/windows/GUIWindowPVRChannels.cpp rename to xbmc/pvr/windows/GUIWindowPVRChannels.cpp diff --git a/src/pvr/windows/GUIWindowPVRChannels.h b/xbmc/pvr/windows/GUIWindowPVRChannels.h similarity index 100% rename from src/pvr/windows/GUIWindowPVRChannels.h rename to xbmc/pvr/windows/GUIWindowPVRChannels.h diff --git a/src/pvr/windows/GUIWindowPVRGuide.cpp b/xbmc/pvr/windows/GUIWindowPVRGuide.cpp similarity index 100% rename from src/pvr/windows/GUIWindowPVRGuide.cpp rename to xbmc/pvr/windows/GUIWindowPVRGuide.cpp diff --git a/src/pvr/windows/GUIWindowPVRGuide.h b/xbmc/pvr/windows/GUIWindowPVRGuide.h similarity index 100% rename from src/pvr/windows/GUIWindowPVRGuide.h rename to xbmc/pvr/windows/GUIWindowPVRGuide.h diff --git a/src/pvr/windows/GUIWindowPVRRecordings.cpp b/xbmc/pvr/windows/GUIWindowPVRRecordings.cpp similarity index 100% rename from src/pvr/windows/GUIWindowPVRRecordings.cpp rename to xbmc/pvr/windows/GUIWindowPVRRecordings.cpp diff --git a/src/pvr/windows/GUIWindowPVRRecordings.h b/xbmc/pvr/windows/GUIWindowPVRRecordings.h similarity index 100% rename from src/pvr/windows/GUIWindowPVRRecordings.h rename to xbmc/pvr/windows/GUIWindowPVRRecordings.h diff --git a/src/pvr/windows/GUIWindowPVRSearch.cpp b/xbmc/pvr/windows/GUIWindowPVRSearch.cpp similarity index 100% rename from src/pvr/windows/GUIWindowPVRSearch.cpp rename to xbmc/pvr/windows/GUIWindowPVRSearch.cpp diff --git a/src/pvr/windows/GUIWindowPVRSearch.h b/xbmc/pvr/windows/GUIWindowPVRSearch.h similarity index 100% rename from src/pvr/windows/GUIWindowPVRSearch.h rename to xbmc/pvr/windows/GUIWindowPVRSearch.h diff --git a/src/pvr/windows/GUIWindowPVRTimers.cpp b/xbmc/pvr/windows/GUIWindowPVRTimers.cpp similarity index 100% rename from src/pvr/windows/GUIWindowPVRTimers.cpp rename to xbmc/pvr/windows/GUIWindowPVRTimers.cpp diff --git a/src/pvr/windows/GUIWindowPVRTimers.h b/xbmc/pvr/windows/GUIWindowPVRTimers.h similarity index 100% rename from src/pvr/windows/GUIWindowPVRTimers.h rename to xbmc/pvr/windows/GUIWindowPVRTimers.h diff --git a/src/pvr/windows/Makefile b/xbmc/pvr/windows/Makefile similarity index 100% rename from src/pvr/windows/Makefile rename to xbmc/pvr/windows/Makefile diff --git a/src/rendering/Makefile b/xbmc/rendering/Makefile similarity index 100% rename from src/rendering/Makefile rename to xbmc/rendering/Makefile diff --git a/src/rendering/RenderSystem.cpp b/xbmc/rendering/RenderSystem.cpp similarity index 100% rename from src/rendering/RenderSystem.cpp rename to xbmc/rendering/RenderSystem.cpp diff --git a/src/rendering/RenderSystem.h b/xbmc/rendering/RenderSystem.h similarity index 100% rename from src/rendering/RenderSystem.h rename to xbmc/rendering/RenderSystem.h diff --git a/src/rendering/dx/GUIWindowTestPatternDX.cpp b/xbmc/rendering/dx/GUIWindowTestPatternDX.cpp similarity index 100% rename from src/rendering/dx/GUIWindowTestPatternDX.cpp rename to xbmc/rendering/dx/GUIWindowTestPatternDX.cpp diff --git a/src/rendering/dx/GUIWindowTestPatternDX.h b/xbmc/rendering/dx/GUIWindowTestPatternDX.h similarity index 100% rename from src/rendering/dx/GUIWindowTestPatternDX.h rename to xbmc/rendering/dx/GUIWindowTestPatternDX.h diff --git a/src/rendering/dx/RenderSystemDX.cpp b/xbmc/rendering/dx/RenderSystemDX.cpp similarity index 100% rename from src/rendering/dx/RenderSystemDX.cpp rename to xbmc/rendering/dx/RenderSystemDX.cpp diff --git a/src/rendering/dx/RenderSystemDX.h b/xbmc/rendering/dx/RenderSystemDX.h similarity index 100% rename from src/rendering/dx/RenderSystemDX.h rename to xbmc/rendering/dx/RenderSystemDX.h diff --git a/src/rendering/gl/GUIWindowTestPatternGL.cpp b/xbmc/rendering/gl/GUIWindowTestPatternGL.cpp similarity index 100% rename from src/rendering/gl/GUIWindowTestPatternGL.cpp rename to xbmc/rendering/gl/GUIWindowTestPatternGL.cpp diff --git a/src/rendering/gl/GUIWindowTestPatternGL.h b/xbmc/rendering/gl/GUIWindowTestPatternGL.h similarity index 100% rename from src/rendering/gl/GUIWindowTestPatternGL.h rename to xbmc/rendering/gl/GUIWindowTestPatternGL.h diff --git a/src/rendering/gl/Makefile b/xbmc/rendering/gl/Makefile similarity index 100% rename from src/rendering/gl/Makefile rename to xbmc/rendering/gl/Makefile diff --git a/src/rendering/gl/RenderSystemGL.cpp b/xbmc/rendering/gl/RenderSystemGL.cpp similarity index 100% rename from src/rendering/gl/RenderSystemGL.cpp rename to xbmc/rendering/gl/RenderSystemGL.cpp diff --git a/src/rendering/gl/RenderSystemGL.h b/xbmc/rendering/gl/RenderSystemGL.h similarity index 100% rename from src/rendering/gl/RenderSystemGL.h rename to xbmc/rendering/gl/RenderSystemGL.h diff --git a/src/rendering/gles/Makefile b/xbmc/rendering/gles/Makefile similarity index 100% rename from src/rendering/gles/Makefile rename to xbmc/rendering/gles/Makefile diff --git a/src/rendering/gles/RenderSystemGLES.cpp b/xbmc/rendering/gles/RenderSystemGLES.cpp similarity index 100% rename from src/rendering/gles/RenderSystemGLES.cpp rename to xbmc/rendering/gles/RenderSystemGLES.cpp diff --git a/src/rendering/gles/RenderSystemGLES.h b/xbmc/rendering/gles/RenderSystemGLES.h similarity index 100% rename from src/rendering/gles/RenderSystemGLES.h rename to xbmc/rendering/gles/RenderSystemGLES.h diff --git a/src/screensavers/rsxs-0.9/AUTHORS b/xbmc/screensavers/rsxs-0.9/AUTHORS similarity index 100% rename from src/screensavers/rsxs-0.9/AUTHORS rename to xbmc/screensavers/rsxs-0.9/AUTHORS diff --git a/src/screensavers/rsxs-0.9/COPYING b/xbmc/screensavers/rsxs-0.9/COPYING similarity index 100% rename from src/screensavers/rsxs-0.9/COPYING rename to xbmc/screensavers/rsxs-0.9/COPYING diff --git a/src/screensavers/rsxs-0.9/ChangeLog b/xbmc/screensavers/rsxs-0.9/ChangeLog similarity index 100% rename from src/screensavers/rsxs-0.9/ChangeLog rename to xbmc/screensavers/rsxs-0.9/ChangeLog diff --git a/src/screensavers/rsxs-0.9/Makefile.am b/xbmc/screensavers/rsxs-0.9/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/Makefile.am rename to xbmc/screensavers/rsxs-0.9/Makefile.am diff --git a/src/screensavers/rsxs-0.9/NEWS b/xbmc/screensavers/rsxs-0.9/NEWS similarity index 100% rename from src/screensavers/rsxs-0.9/NEWS rename to xbmc/screensavers/rsxs-0.9/NEWS diff --git a/src/screensavers/rsxs-0.9/README b/xbmc/screensavers/rsxs-0.9/README similarity index 100% rename from src/screensavers/rsxs-0.9/README rename to xbmc/screensavers/rsxs-0.9/README diff --git a/src/screensavers/rsxs-0.9/README.xbmc b/xbmc/screensavers/rsxs-0.9/README.xbmc similarity index 100% rename from src/screensavers/rsxs-0.9/README.xbmc rename to xbmc/screensavers/rsxs-0.9/README.xbmc diff --git a/src/screensavers/rsxs-0.9/THANKS b/xbmc/screensavers/rsxs-0.9/THANKS similarity index 100% rename from src/screensavers/rsxs-0.9/THANKS rename to xbmc/screensavers/rsxs-0.9/THANKS diff --git a/src/screensavers/rsxs-0.9/acinclude.m4 b/xbmc/screensavers/rsxs-0.9/acinclude.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/acinclude.m4 rename to xbmc/screensavers/rsxs-0.9/acinclude.m4 diff --git a/src/screensavers/rsxs-0.9/config/Makefile.am b/xbmc/screensavers/rsxs-0.9/config/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/config/Makefile.am rename to xbmc/screensavers/rsxs-0.9/config/Makefile.am diff --git a/src/screensavers/rsxs-0.9/config/rs-cyclone.xml b/xbmc/screensavers/rsxs-0.9/config/rs-cyclone.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-cyclone.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-cyclone.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-euphoria.xml b/xbmc/screensavers/rsxs-0.9/config/rs-euphoria.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-euphoria.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-euphoria.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-fieldlines.xml b/xbmc/screensavers/rsxs-0.9/config/rs-fieldlines.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-fieldlines.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-fieldlines.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-flocks.xml b/xbmc/screensavers/rsxs-0.9/config/rs-flocks.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-flocks.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-flocks.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-flux.xml b/xbmc/screensavers/rsxs-0.9/config/rs-flux.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-flux.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-flux.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-helios.xml b/xbmc/screensavers/rsxs-0.9/config/rs-helios.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-helios.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-helios.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-hyperspace.xml b/xbmc/screensavers/rsxs-0.9/config/rs-hyperspace.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-hyperspace.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-hyperspace.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-lattice.xml b/xbmc/screensavers/rsxs-0.9/config/rs-lattice.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-lattice.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-lattice.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-plasma.xml b/xbmc/screensavers/rsxs-0.9/config/rs-plasma.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-plasma.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-plasma.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-skyrocket.xml b/xbmc/screensavers/rsxs-0.9/config/rs-skyrocket.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-skyrocket.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-skyrocket.xml diff --git a/src/screensavers/rsxs-0.9/config/rs-solarwinds.xml b/xbmc/screensavers/rsxs-0.9/config/rs-solarwinds.xml similarity index 100% rename from src/screensavers/rsxs-0.9/config/rs-solarwinds.xml rename to xbmc/screensavers/rsxs-0.9/config/rs-solarwinds.xml diff --git a/src/screensavers/rsxs-0.9/configure.ac b/xbmc/screensavers/rsxs-0.9/configure.ac similarity index 100% rename from src/screensavers/rsxs-0.9/configure.ac rename to xbmc/screensavers/rsxs-0.9/configure.ac diff --git a/src/screensavers/rsxs-0.9/lib/Makefile.am b/xbmc/screensavers/rsxs-0.9/lib/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/lib/Makefile.am rename to xbmc/screensavers/rsxs-0.9/lib/Makefile.am diff --git a/src/screensavers/rsxs-0.9/lib/alloca.c b/xbmc/screensavers/rsxs-0.9/lib/alloca.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/alloca.c rename to xbmc/screensavers/rsxs-0.9/lib/alloca.c diff --git a/src/screensavers/rsxs-0.9/lib/alloca_.h b/xbmc/screensavers/rsxs-0.9/lib/alloca_.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/alloca_.h rename to xbmc/screensavers/rsxs-0.9/lib/alloca_.h diff --git a/src/screensavers/rsxs-0.9/lib/argp-ba.c b/xbmc/screensavers/rsxs-0.9/lib/argp-ba.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-ba.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-ba.c diff --git a/src/screensavers/rsxs-0.9/lib/argp-eexst.c b/xbmc/screensavers/rsxs-0.9/lib/argp-eexst.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-eexst.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-eexst.c diff --git a/src/screensavers/rsxs-0.9/lib/argp-fmtstream.c b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-fmtstream.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.c diff --git a/src/screensavers/rsxs-0.9/lib/argp-fmtstream.h b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-fmtstream.h rename to xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h diff --git a/src/screensavers/rsxs-0.9/lib/argp-fs-xinl.c b/xbmc/screensavers/rsxs-0.9/lib/argp-fs-xinl.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-fs-xinl.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-fs-xinl.c diff --git a/src/screensavers/rsxs-0.9/lib/argp-help.c b/xbmc/screensavers/rsxs-0.9/lib/argp-help.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-help.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-help.c diff --git a/src/screensavers/rsxs-0.9/lib/argp-namefrob.h b/xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-namefrob.h rename to xbmc/screensavers/rsxs-0.9/lib/argp-namefrob.h diff --git a/src/screensavers/rsxs-0.9/lib/argp-parse.c b/xbmc/screensavers/rsxs-0.9/lib/argp-parse.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-parse.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-parse.c diff --git a/src/screensavers/rsxs-0.9/lib/argp-pin.c b/xbmc/screensavers/rsxs-0.9/lib/argp-pin.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-pin.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-pin.c diff --git a/src/screensavers/rsxs-0.9/lib/argp-pv.c b/xbmc/screensavers/rsxs-0.9/lib/argp-pv.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-pv.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-pv.c diff --git a/src/screensavers/rsxs-0.9/lib/argp-pvh.c b/xbmc/screensavers/rsxs-0.9/lib/argp-pvh.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-pvh.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-pvh.c diff --git a/src/screensavers/rsxs-0.9/lib/argp-xinl.c b/xbmc/screensavers/rsxs-0.9/lib/argp-xinl.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp-xinl.c rename to xbmc/screensavers/rsxs-0.9/lib/argp-xinl.c diff --git a/src/screensavers/rsxs-0.9/lib/argp.h b/xbmc/screensavers/rsxs-0.9/lib/argp.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argp.h rename to xbmc/screensavers/rsxs-0.9/lib/argp.h diff --git a/src/screensavers/rsxs-0.9/lib/argz.c b/xbmc/screensavers/rsxs-0.9/lib/argz.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argz.c rename to xbmc/screensavers/rsxs-0.9/lib/argz.c diff --git a/src/screensavers/rsxs-0.9/lib/argz_.h b/xbmc/screensavers/rsxs-0.9/lib/argz_.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/argz_.h rename to xbmc/screensavers/rsxs-0.9/lib/argz_.h diff --git a/src/screensavers/rsxs-0.9/lib/asnprintf.c b/xbmc/screensavers/rsxs-0.9/lib/asnprintf.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/asnprintf.c rename to xbmc/screensavers/rsxs-0.9/lib/asnprintf.c diff --git a/src/screensavers/rsxs-0.9/lib/basename.c b/xbmc/screensavers/rsxs-0.9/lib/basename.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/basename.c rename to xbmc/screensavers/rsxs-0.9/lib/basename.c diff --git a/src/screensavers/rsxs-0.9/lib/dirname.c b/xbmc/screensavers/rsxs-0.9/lib/dirname.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/dirname.c rename to xbmc/screensavers/rsxs-0.9/lib/dirname.c diff --git a/src/screensavers/rsxs-0.9/lib/dirname.h b/xbmc/screensavers/rsxs-0.9/lib/dirname.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/dirname.h rename to xbmc/screensavers/rsxs-0.9/lib/dirname.h diff --git a/src/screensavers/rsxs-0.9/lib/error.c b/xbmc/screensavers/rsxs-0.9/lib/error.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/error.c rename to xbmc/screensavers/rsxs-0.9/lib/error.c diff --git a/src/screensavers/rsxs-0.9/lib/error.h b/xbmc/screensavers/rsxs-0.9/lib/error.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/error.h rename to xbmc/screensavers/rsxs-0.9/lib/error.h diff --git a/src/screensavers/rsxs-0.9/lib/exit.h b/xbmc/screensavers/rsxs-0.9/lib/exit.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/exit.h rename to xbmc/screensavers/rsxs-0.9/lib/exit.h diff --git a/src/screensavers/rsxs-0.9/lib/exitfail.c b/xbmc/screensavers/rsxs-0.9/lib/exitfail.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/exitfail.c rename to xbmc/screensavers/rsxs-0.9/lib/exitfail.c diff --git a/src/screensavers/rsxs-0.9/lib/exitfail.h b/xbmc/screensavers/rsxs-0.9/lib/exitfail.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/exitfail.h rename to xbmc/screensavers/rsxs-0.9/lib/exitfail.h diff --git a/src/screensavers/rsxs-0.9/lib/getopt.c b/xbmc/screensavers/rsxs-0.9/lib/getopt.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/getopt.c rename to xbmc/screensavers/rsxs-0.9/lib/getopt.c diff --git a/src/screensavers/rsxs-0.9/lib/getopt1.c b/xbmc/screensavers/rsxs-0.9/lib/getopt1.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/getopt1.c rename to xbmc/screensavers/rsxs-0.9/lib/getopt1.c diff --git a/src/screensavers/rsxs-0.9/lib/getopt_.h b/xbmc/screensavers/rsxs-0.9/lib/getopt_.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/getopt_.h rename to xbmc/screensavers/rsxs-0.9/lib/getopt_.h diff --git a/src/screensavers/rsxs-0.9/lib/getopt_int.h b/xbmc/screensavers/rsxs-0.9/lib/getopt_int.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/getopt_int.h rename to xbmc/screensavers/rsxs-0.9/lib/getopt_int.h diff --git a/src/screensavers/rsxs-0.9/lib/gettext.h b/xbmc/screensavers/rsxs-0.9/lib/gettext.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/gettext.h rename to xbmc/screensavers/rsxs-0.9/lib/gettext.h diff --git a/src/screensavers/rsxs-0.9/lib/gettimeofday.c b/xbmc/screensavers/rsxs-0.9/lib/gettimeofday.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/gettimeofday.c rename to xbmc/screensavers/rsxs-0.9/lib/gettimeofday.c diff --git a/src/screensavers/rsxs-0.9/lib/mbchar.c b/xbmc/screensavers/rsxs-0.9/lib/mbchar.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/mbchar.c rename to xbmc/screensavers/rsxs-0.9/lib/mbchar.c diff --git a/src/screensavers/rsxs-0.9/lib/mbchar.h b/xbmc/screensavers/rsxs-0.9/lib/mbchar.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/mbchar.h rename to xbmc/screensavers/rsxs-0.9/lib/mbchar.h diff --git a/src/screensavers/rsxs-0.9/lib/mbuiter.h b/xbmc/screensavers/rsxs-0.9/lib/mbuiter.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/mbuiter.h rename to xbmc/screensavers/rsxs-0.9/lib/mbuiter.h diff --git a/src/screensavers/rsxs-0.9/lib/memchr.c b/xbmc/screensavers/rsxs-0.9/lib/memchr.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/memchr.c rename to xbmc/screensavers/rsxs-0.9/lib/memchr.c diff --git a/src/screensavers/rsxs-0.9/lib/mempcpy.c b/xbmc/screensavers/rsxs-0.9/lib/mempcpy.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/mempcpy.c rename to xbmc/screensavers/rsxs-0.9/lib/mempcpy.c diff --git a/src/screensavers/rsxs-0.9/lib/mempcpy.h b/xbmc/screensavers/rsxs-0.9/lib/mempcpy.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/mempcpy.h rename to xbmc/screensavers/rsxs-0.9/lib/mempcpy.h diff --git a/src/screensavers/rsxs-0.9/lib/minmax.h b/xbmc/screensavers/rsxs-0.9/lib/minmax.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/minmax.h rename to xbmc/screensavers/rsxs-0.9/lib/minmax.h diff --git a/src/screensavers/rsxs-0.9/lib/printf-args.c b/xbmc/screensavers/rsxs-0.9/lib/printf-args.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/printf-args.c rename to xbmc/screensavers/rsxs-0.9/lib/printf-args.c diff --git a/src/screensavers/rsxs-0.9/lib/printf-args.h b/xbmc/screensavers/rsxs-0.9/lib/printf-args.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/printf-args.h rename to xbmc/screensavers/rsxs-0.9/lib/printf-args.h diff --git a/src/screensavers/rsxs-0.9/lib/printf-parse.c b/xbmc/screensavers/rsxs-0.9/lib/printf-parse.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/printf-parse.c rename to xbmc/screensavers/rsxs-0.9/lib/printf-parse.c diff --git a/src/screensavers/rsxs-0.9/lib/printf-parse.h b/xbmc/screensavers/rsxs-0.9/lib/printf-parse.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/printf-parse.h rename to xbmc/screensavers/rsxs-0.9/lib/printf-parse.h diff --git a/src/screensavers/rsxs-0.9/lib/size_max.h b/xbmc/screensavers/rsxs-0.9/lib/size_max.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/size_max.h rename to xbmc/screensavers/rsxs-0.9/lib/size_max.h diff --git a/src/screensavers/rsxs-0.9/lib/stdbool_.h b/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/stdbool_.h rename to xbmc/screensavers/rsxs-0.9/lib/stdbool_.h diff --git a/src/screensavers/rsxs-0.9/lib/strcase.h b/xbmc/screensavers/rsxs-0.9/lib/strcase.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strcase.h rename to xbmc/screensavers/rsxs-0.9/lib/strcase.h diff --git a/src/screensavers/rsxs-0.9/lib/strcasecmp.c b/xbmc/screensavers/rsxs-0.9/lib/strcasecmp.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strcasecmp.c rename to xbmc/screensavers/rsxs-0.9/lib/strcasecmp.c diff --git a/src/screensavers/rsxs-0.9/lib/strchrnul.c b/xbmc/screensavers/rsxs-0.9/lib/strchrnul.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strchrnul.c rename to xbmc/screensavers/rsxs-0.9/lib/strchrnul.c diff --git a/src/screensavers/rsxs-0.9/lib/strchrnul.h b/xbmc/screensavers/rsxs-0.9/lib/strchrnul.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strchrnul.h rename to xbmc/screensavers/rsxs-0.9/lib/strchrnul.h diff --git a/src/screensavers/rsxs-0.9/lib/stripslash.c b/xbmc/screensavers/rsxs-0.9/lib/stripslash.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/stripslash.c rename to xbmc/screensavers/rsxs-0.9/lib/stripslash.c diff --git a/src/screensavers/rsxs-0.9/lib/strncasecmp.c b/xbmc/screensavers/rsxs-0.9/lib/strncasecmp.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strncasecmp.c rename to xbmc/screensavers/rsxs-0.9/lib/strncasecmp.c diff --git a/src/screensavers/rsxs-0.9/lib/strndup.c b/xbmc/screensavers/rsxs-0.9/lib/strndup.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strndup.c rename to xbmc/screensavers/rsxs-0.9/lib/strndup.c diff --git a/src/screensavers/rsxs-0.9/lib/strndup.h b/xbmc/screensavers/rsxs-0.9/lib/strndup.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strndup.h rename to xbmc/screensavers/rsxs-0.9/lib/strndup.h diff --git a/src/screensavers/rsxs-0.9/lib/strnlen.c b/xbmc/screensavers/rsxs-0.9/lib/strnlen.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strnlen.c rename to xbmc/screensavers/rsxs-0.9/lib/strnlen.c diff --git a/src/screensavers/rsxs-0.9/lib/strnlen.h b/xbmc/screensavers/rsxs-0.9/lib/strnlen.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strnlen.h rename to xbmc/screensavers/rsxs-0.9/lib/strnlen.h diff --git a/src/screensavers/rsxs-0.9/lib/strnlen1.c b/xbmc/screensavers/rsxs-0.9/lib/strnlen1.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strnlen1.c rename to xbmc/screensavers/rsxs-0.9/lib/strnlen1.c diff --git a/src/screensavers/rsxs-0.9/lib/strnlen1.h b/xbmc/screensavers/rsxs-0.9/lib/strnlen1.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/strnlen1.h rename to xbmc/screensavers/rsxs-0.9/lib/strnlen1.h diff --git a/src/screensavers/rsxs-0.9/lib/sysexit_.h b/xbmc/screensavers/rsxs-0.9/lib/sysexit_.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/sysexit_.h rename to xbmc/screensavers/rsxs-0.9/lib/sysexit_.h diff --git a/src/screensavers/rsxs-0.9/lib/vasnprintf.c b/xbmc/screensavers/rsxs-0.9/lib/vasnprintf.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/vasnprintf.c rename to xbmc/screensavers/rsxs-0.9/lib/vasnprintf.c diff --git a/src/screensavers/rsxs-0.9/lib/vasnprintf.h b/xbmc/screensavers/rsxs-0.9/lib/vasnprintf.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/vasnprintf.h rename to xbmc/screensavers/rsxs-0.9/lib/vasnprintf.h diff --git a/src/screensavers/rsxs-0.9/lib/vsnprintf.c b/xbmc/screensavers/rsxs-0.9/lib/vsnprintf.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/vsnprintf.c rename to xbmc/screensavers/rsxs-0.9/lib/vsnprintf.c diff --git a/src/screensavers/rsxs-0.9/lib/vsnprintf.h b/xbmc/screensavers/rsxs-0.9/lib/vsnprintf.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/vsnprintf.h rename to xbmc/screensavers/rsxs-0.9/lib/vsnprintf.h diff --git a/src/screensavers/rsxs-0.9/lib/wcwidth.h b/xbmc/screensavers/rsxs-0.9/lib/wcwidth.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/wcwidth.h rename to xbmc/screensavers/rsxs-0.9/lib/wcwidth.h diff --git a/src/screensavers/rsxs-0.9/lib/xalloc-die.c b/xbmc/screensavers/rsxs-0.9/lib/xalloc-die.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/xalloc-die.c rename to xbmc/screensavers/rsxs-0.9/lib/xalloc-die.c diff --git a/src/screensavers/rsxs-0.9/lib/xalloc.h b/xbmc/screensavers/rsxs-0.9/lib/xalloc.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/xalloc.h rename to xbmc/screensavers/rsxs-0.9/lib/xalloc.h diff --git a/src/screensavers/rsxs-0.9/lib/xmalloc.c b/xbmc/screensavers/rsxs-0.9/lib/xmalloc.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/xmalloc.c rename to xbmc/screensavers/rsxs-0.9/lib/xmalloc.c diff --git a/src/screensavers/rsxs-0.9/lib/xsize.h b/xbmc/screensavers/rsxs-0.9/lib/xsize.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/xsize.h rename to xbmc/screensavers/rsxs-0.9/lib/xsize.h diff --git a/src/screensavers/rsxs-0.9/lib/xstrndup.c b/xbmc/screensavers/rsxs-0.9/lib/xstrndup.c similarity index 100% rename from src/screensavers/rsxs-0.9/lib/xstrndup.c rename to xbmc/screensavers/rsxs-0.9/lib/xstrndup.c diff --git a/src/screensavers/rsxs-0.9/lib/xstrndup.h b/xbmc/screensavers/rsxs-0.9/lib/xstrndup.h similarity index 100% rename from src/screensavers/rsxs-0.9/lib/xstrndup.h rename to xbmc/screensavers/rsxs-0.9/lib/xstrndup.h diff --git a/src/screensavers/rsxs-0.9/libltdl/Makefile.am b/xbmc/screensavers/rsxs-0.9/libltdl/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/libltdl/Makefile.am rename to xbmc/screensavers/rsxs-0.9/libltdl/Makefile.am diff --git a/src/screensavers/rsxs-0.9/libltdl/ltdl.c b/xbmc/screensavers/rsxs-0.9/libltdl/ltdl.c similarity index 100% rename from src/screensavers/rsxs-0.9/libltdl/ltdl.c rename to xbmc/screensavers/rsxs-0.9/libltdl/ltdl.c diff --git a/src/screensavers/rsxs-0.9/libltdl/ltdl.h b/xbmc/screensavers/rsxs-0.9/libltdl/ltdl.h similarity index 100% rename from src/screensavers/rsxs-0.9/libltdl/ltdl.h rename to xbmc/screensavers/rsxs-0.9/libltdl/ltdl.h diff --git a/src/screensavers/rsxs-0.9/m4/alloca.m4 b/xbmc/screensavers/rsxs-0.9/m4/alloca.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/alloca.m4 rename to xbmc/screensavers/rsxs-0.9/m4/alloca.m4 diff --git a/src/screensavers/rsxs-0.9/m4/argp.m4 b/xbmc/screensavers/rsxs-0.9/m4/argp.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/argp.m4 rename to xbmc/screensavers/rsxs-0.9/m4/argp.m4 diff --git a/src/screensavers/rsxs-0.9/m4/argz.m4 b/xbmc/screensavers/rsxs-0.9/m4/argz.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/argz.m4 rename to xbmc/screensavers/rsxs-0.9/m4/argz.m4 diff --git a/src/screensavers/rsxs-0.9/m4/dirname.m4 b/xbmc/screensavers/rsxs-0.9/m4/dirname.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/dirname.m4 rename to xbmc/screensavers/rsxs-0.9/m4/dirname.m4 diff --git a/src/screensavers/rsxs-0.9/m4/dos.m4 b/xbmc/screensavers/rsxs-0.9/m4/dos.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/dos.m4 rename to xbmc/screensavers/rsxs-0.9/m4/dos.m4 diff --git a/src/screensavers/rsxs-0.9/m4/double-slash-root.m4 b/xbmc/screensavers/rsxs-0.9/m4/double-slash-root.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/double-slash-root.m4 rename to xbmc/screensavers/rsxs-0.9/m4/double-slash-root.m4 diff --git a/src/screensavers/rsxs-0.9/m4/eoverflow.m4 b/xbmc/screensavers/rsxs-0.9/m4/eoverflow.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/eoverflow.m4 rename to xbmc/screensavers/rsxs-0.9/m4/eoverflow.m4 diff --git a/src/screensavers/rsxs-0.9/m4/error.m4 b/xbmc/screensavers/rsxs-0.9/m4/error.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/error.m4 rename to xbmc/screensavers/rsxs-0.9/m4/error.m4 diff --git a/src/screensavers/rsxs-0.9/m4/exitfail.m4 b/xbmc/screensavers/rsxs-0.9/m4/exitfail.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/exitfail.m4 rename to xbmc/screensavers/rsxs-0.9/m4/exitfail.m4 diff --git a/src/screensavers/rsxs-0.9/m4/extensions.m4 b/xbmc/screensavers/rsxs-0.9/m4/extensions.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/extensions.m4 rename to xbmc/screensavers/rsxs-0.9/m4/extensions.m4 diff --git a/src/screensavers/rsxs-0.9/m4/getopt.m4 b/xbmc/screensavers/rsxs-0.9/m4/getopt.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/getopt.m4 rename to xbmc/screensavers/rsxs-0.9/m4/getopt.m4 diff --git a/src/screensavers/rsxs-0.9/m4/gettimeofday.m4 b/xbmc/screensavers/rsxs-0.9/m4/gettimeofday.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/gettimeofday.m4 rename to xbmc/screensavers/rsxs-0.9/m4/gettimeofday.m4 diff --git a/src/screensavers/rsxs-0.9/m4/gnulib-comp.m4 b/xbmc/screensavers/rsxs-0.9/m4/gnulib-comp.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/gnulib-comp.m4 rename to xbmc/screensavers/rsxs-0.9/m4/gnulib-comp.m4 diff --git a/src/screensavers/rsxs-0.9/m4/intmax_t.m4 b/xbmc/screensavers/rsxs-0.9/m4/intmax_t.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/intmax_t.m4 rename to xbmc/screensavers/rsxs-0.9/m4/intmax_t.m4 diff --git a/src/screensavers/rsxs-0.9/m4/inttypes_h.m4 b/xbmc/screensavers/rsxs-0.9/m4/inttypes_h.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/inttypes_h.m4 rename to xbmc/screensavers/rsxs-0.9/m4/inttypes_h.m4 diff --git a/src/screensavers/rsxs-0.9/m4/longdouble.m4 b/xbmc/screensavers/rsxs-0.9/m4/longdouble.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/longdouble.m4 rename to xbmc/screensavers/rsxs-0.9/m4/longdouble.m4 diff --git a/src/screensavers/rsxs-0.9/m4/longlong.m4 b/xbmc/screensavers/rsxs-0.9/m4/longlong.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/longlong.m4 rename to xbmc/screensavers/rsxs-0.9/m4/longlong.m4 diff --git a/src/screensavers/rsxs-0.9/m4/mbchar.m4 b/xbmc/screensavers/rsxs-0.9/m4/mbchar.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/mbchar.m4 rename to xbmc/screensavers/rsxs-0.9/m4/mbchar.m4 diff --git a/src/screensavers/rsxs-0.9/m4/mbiter.m4 b/xbmc/screensavers/rsxs-0.9/m4/mbiter.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/mbiter.m4 rename to xbmc/screensavers/rsxs-0.9/m4/mbiter.m4 diff --git a/src/screensavers/rsxs-0.9/m4/mbrtowc.m4 b/xbmc/screensavers/rsxs-0.9/m4/mbrtowc.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/mbrtowc.m4 rename to xbmc/screensavers/rsxs-0.9/m4/mbrtowc.m4 diff --git a/src/screensavers/rsxs-0.9/m4/memchr.m4 b/xbmc/screensavers/rsxs-0.9/m4/memchr.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/memchr.m4 rename to xbmc/screensavers/rsxs-0.9/m4/memchr.m4 diff --git a/src/screensavers/rsxs-0.9/m4/mempcpy.m4 b/xbmc/screensavers/rsxs-0.9/m4/mempcpy.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/mempcpy.m4 rename to xbmc/screensavers/rsxs-0.9/m4/mempcpy.m4 diff --git a/src/screensavers/rsxs-0.9/m4/minmax.m4 b/xbmc/screensavers/rsxs-0.9/m4/minmax.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/minmax.m4 rename to xbmc/screensavers/rsxs-0.9/m4/minmax.m4 diff --git a/src/screensavers/rsxs-0.9/m4/onceonly_2_57.m4 b/xbmc/screensavers/rsxs-0.9/m4/onceonly_2_57.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/onceonly_2_57.m4 rename to xbmc/screensavers/rsxs-0.9/m4/onceonly_2_57.m4 diff --git a/src/screensavers/rsxs-0.9/m4/restrict.m4 b/xbmc/screensavers/rsxs-0.9/m4/restrict.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/restrict.m4 rename to xbmc/screensavers/rsxs-0.9/m4/restrict.m4 diff --git a/src/screensavers/rsxs-0.9/m4/signed.m4 b/xbmc/screensavers/rsxs-0.9/m4/signed.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/signed.m4 rename to xbmc/screensavers/rsxs-0.9/m4/signed.m4 diff --git a/src/screensavers/rsxs-0.9/m4/size_max.m4 b/xbmc/screensavers/rsxs-0.9/m4/size_max.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/size_max.m4 rename to xbmc/screensavers/rsxs-0.9/m4/size_max.m4 diff --git a/src/screensavers/rsxs-0.9/m4/stdbool.m4 b/xbmc/screensavers/rsxs-0.9/m4/stdbool.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/stdbool.m4 rename to xbmc/screensavers/rsxs-0.9/m4/stdbool.m4 diff --git a/src/screensavers/rsxs-0.9/m4/stdint_h.m4 b/xbmc/screensavers/rsxs-0.9/m4/stdint_h.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/stdint_h.m4 rename to xbmc/screensavers/rsxs-0.9/m4/stdint_h.m4 diff --git a/src/screensavers/rsxs-0.9/m4/strcase.m4 b/xbmc/screensavers/rsxs-0.9/m4/strcase.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/strcase.m4 rename to xbmc/screensavers/rsxs-0.9/m4/strcase.m4 diff --git a/src/screensavers/rsxs-0.9/m4/strchrnul.m4 b/xbmc/screensavers/rsxs-0.9/m4/strchrnul.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/strchrnul.m4 rename to xbmc/screensavers/rsxs-0.9/m4/strchrnul.m4 diff --git a/src/screensavers/rsxs-0.9/m4/strndup.m4 b/xbmc/screensavers/rsxs-0.9/m4/strndup.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/strndup.m4 rename to xbmc/screensavers/rsxs-0.9/m4/strndup.m4 diff --git a/src/screensavers/rsxs-0.9/m4/strnlen.m4 b/xbmc/screensavers/rsxs-0.9/m4/strnlen.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/strnlen.m4 rename to xbmc/screensavers/rsxs-0.9/m4/strnlen.m4 diff --git a/src/screensavers/rsxs-0.9/m4/sysexits.m4 b/xbmc/screensavers/rsxs-0.9/m4/sysexits.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/sysexits.m4 rename to xbmc/screensavers/rsxs-0.9/m4/sysexits.m4 diff --git a/src/screensavers/rsxs-0.9/m4/unistd_h.m4 b/xbmc/screensavers/rsxs-0.9/m4/unistd_h.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/unistd_h.m4 rename to xbmc/screensavers/rsxs-0.9/m4/unistd_h.m4 diff --git a/src/screensavers/rsxs-0.9/m4/vasnprintf.m4 b/xbmc/screensavers/rsxs-0.9/m4/vasnprintf.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/vasnprintf.m4 rename to xbmc/screensavers/rsxs-0.9/m4/vasnprintf.m4 diff --git a/src/screensavers/rsxs-0.9/m4/vsnprintf.m4 b/xbmc/screensavers/rsxs-0.9/m4/vsnprintf.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/vsnprintf.m4 rename to xbmc/screensavers/rsxs-0.9/m4/vsnprintf.m4 diff --git a/src/screensavers/rsxs-0.9/m4/wchar_t.m4 b/xbmc/screensavers/rsxs-0.9/m4/wchar_t.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/wchar_t.m4 rename to xbmc/screensavers/rsxs-0.9/m4/wchar_t.m4 diff --git a/src/screensavers/rsxs-0.9/m4/wcwidth.m4 b/xbmc/screensavers/rsxs-0.9/m4/wcwidth.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/wcwidth.m4 rename to xbmc/screensavers/rsxs-0.9/m4/wcwidth.m4 diff --git a/src/screensavers/rsxs-0.9/m4/wint_t.m4 b/xbmc/screensavers/rsxs-0.9/m4/wint_t.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/wint_t.m4 rename to xbmc/screensavers/rsxs-0.9/m4/wint_t.m4 diff --git a/src/screensavers/rsxs-0.9/m4/xalloc.m4 b/xbmc/screensavers/rsxs-0.9/m4/xalloc.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/xalloc.m4 rename to xbmc/screensavers/rsxs-0.9/m4/xalloc.m4 diff --git a/src/screensavers/rsxs-0.9/m4/xsize.m4 b/xbmc/screensavers/rsxs-0.9/m4/xsize.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/xsize.m4 rename to xbmc/screensavers/rsxs-0.9/m4/xsize.m4 diff --git a/src/screensavers/rsxs-0.9/m4/xstrndup.m4 b/xbmc/screensavers/rsxs-0.9/m4/xstrndup.m4 similarity index 100% rename from src/screensavers/rsxs-0.9/m4/xstrndup.m4 rename to xbmc/screensavers/rsxs-0.9/m4/xstrndup.m4 diff --git a/src/screensavers/rsxs-0.9/rsxs.spec.in b/xbmc/screensavers/rsxs-0.9/rsxs.spec.in similarity index 100% rename from src/screensavers/rsxs-0.9/rsxs.spec.in rename to xbmc/screensavers/rsxs-0.9/rsxs.spec.in diff --git a/src/screensavers/rsxs-0.9/scripts/install.awk b/xbmc/screensavers/rsxs-0.9/scripts/install.awk similarity index 100% rename from src/screensavers/rsxs-0.9/scripts/install.awk rename to xbmc/screensavers/rsxs-0.9/scripts/install.awk diff --git a/src/screensavers/rsxs-0.9/scripts/uninstall.awk b/xbmc/screensavers/rsxs-0.9/scripts/uninstall.awk similarity index 100% rename from src/screensavers/rsxs-0.9/scripts/uninstall.awk rename to xbmc/screensavers/rsxs-0.9/scripts/uninstall.awk diff --git a/src/screensavers/rsxs-0.9/scripts/verify.awk b/xbmc/screensavers/rsxs-0.9/scripts/verify.awk similarity index 100% rename from src/screensavers/rsxs-0.9/scripts/verify.awk rename to xbmc/screensavers/rsxs-0.9/scripts/verify.awk diff --git a/src/screensavers/rsxs-0.9/src/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/Makefile.common b/xbmc/screensavers/rsxs-0.9/src/Makefile.common similarity index 100% rename from src/screensavers/rsxs-0.9/src/Makefile.common rename to xbmc/screensavers/rsxs-0.9/src/Makefile.common diff --git a/src/screensavers/rsxs-0.9/src/color.cc b/xbmc/screensavers/rsxs-0.9/src/color.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/color.cc rename to xbmc/screensavers/rsxs-0.9/src/color.cc diff --git a/src/screensavers/rsxs-0.9/src/color.hh b/xbmc/screensavers/rsxs-0.9/src/color.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/color.hh rename to xbmc/screensavers/rsxs-0.9/src/color.hh diff --git a/src/screensavers/rsxs-0.9/src/common.cc b/xbmc/screensavers/rsxs-0.9/src/common.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/common.cc rename to xbmc/screensavers/rsxs-0.9/src/common.cc diff --git a/src/screensavers/rsxs-0.9/src/common.hh b/xbmc/screensavers/rsxs-0.9/src/common.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/common.hh rename to xbmc/screensavers/rsxs-0.9/src/common.hh diff --git a/src/screensavers/rsxs-0.9/src/cyclone/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/cyclone/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/cyclone/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/cyclone/blend.cc b/xbmc/screensavers/rsxs-0.9/src/cyclone/blend.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/cyclone/blend.cc rename to xbmc/screensavers/rsxs-0.9/src/cyclone/blend.cc diff --git a/src/screensavers/rsxs-0.9/src/cyclone/blend.hh b/xbmc/screensavers/rsxs-0.9/src/cyclone/blend.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/cyclone/blend.hh rename to xbmc/screensavers/rsxs-0.9/src/cyclone/blend.hh diff --git a/src/screensavers/rsxs-0.9/src/cyclone/cyclone.cc b/xbmc/screensavers/rsxs-0.9/src/cyclone/cyclone.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/cyclone/cyclone.cc rename to xbmc/screensavers/rsxs-0.9/src/cyclone/cyclone.cc diff --git a/src/screensavers/rsxs-0.9/src/cyclone/cyclone.hh b/xbmc/screensavers/rsxs-0.9/src/cyclone/cyclone.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/cyclone/cyclone.hh rename to xbmc/screensavers/rsxs-0.9/src/cyclone/cyclone.hh diff --git a/src/screensavers/rsxs-0.9/src/cyclone/particle.cc b/xbmc/screensavers/rsxs-0.9/src/cyclone/particle.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/cyclone/particle.cc rename to xbmc/screensavers/rsxs-0.9/src/cyclone/particle.cc diff --git a/src/screensavers/rsxs-0.9/src/cyclone/particle.hh b/xbmc/screensavers/rsxs-0.9/src/cyclone/particle.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/cyclone/particle.hh rename to xbmc/screensavers/rsxs-0.9/src/cyclone/particle.hh diff --git a/src/screensavers/rsxs-0.9/src/dlopen.hh b/xbmc/screensavers/rsxs-0.9/src/dlopen.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/dlopen.hh rename to xbmc/screensavers/rsxs-0.9/src/dlopen.hh diff --git a/src/screensavers/rsxs-0.9/src/euphoria/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/euphoria/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/euphoria/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/euphoria/euphoria.cc b/xbmc/screensavers/rsxs-0.9/src/euphoria/euphoria.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/euphoria/euphoria.cc rename to xbmc/screensavers/rsxs-0.9/src/euphoria/euphoria.cc diff --git a/src/screensavers/rsxs-0.9/src/euphoria/euphoria.hh b/xbmc/screensavers/rsxs-0.9/src/euphoria/euphoria.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/euphoria/euphoria.hh rename to xbmc/screensavers/rsxs-0.9/src/euphoria/euphoria.hh diff --git a/src/screensavers/rsxs-0.9/src/euphoria/lines.png b/xbmc/screensavers/rsxs-0.9/src/euphoria/lines.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/euphoria/lines.png rename to xbmc/screensavers/rsxs-0.9/src/euphoria/lines.png diff --git a/src/screensavers/rsxs-0.9/src/euphoria/plasma.png b/xbmc/screensavers/rsxs-0.9/src/euphoria/plasma.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/euphoria/plasma.png rename to xbmc/screensavers/rsxs-0.9/src/euphoria/plasma.png diff --git a/src/screensavers/rsxs-0.9/src/euphoria/stringy.png b/xbmc/screensavers/rsxs-0.9/src/euphoria/stringy.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/euphoria/stringy.png rename to xbmc/screensavers/rsxs-0.9/src/euphoria/stringy.png diff --git a/src/screensavers/rsxs-0.9/src/euphoria/wisp.cc b/xbmc/screensavers/rsxs-0.9/src/euphoria/wisp.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/euphoria/wisp.cc rename to xbmc/screensavers/rsxs-0.9/src/euphoria/wisp.cc diff --git a/src/screensavers/rsxs-0.9/src/euphoria/wisp.hh b/xbmc/screensavers/rsxs-0.9/src/euphoria/wisp.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/euphoria/wisp.hh rename to xbmc/screensavers/rsxs-0.9/src/euphoria/wisp.hh diff --git a/src/screensavers/rsxs-0.9/src/fieldlines/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/fieldlines/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/fieldlines/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/fieldlines/fieldlines.cc b/xbmc/screensavers/rsxs-0.9/src/fieldlines/fieldlines.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/fieldlines/fieldlines.cc rename to xbmc/screensavers/rsxs-0.9/src/fieldlines/fieldlines.cc diff --git a/src/screensavers/rsxs-0.9/src/fieldlines/fieldlines.hh b/xbmc/screensavers/rsxs-0.9/src/fieldlines/fieldlines.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/fieldlines/fieldlines.hh rename to xbmc/screensavers/rsxs-0.9/src/fieldlines/fieldlines.hh diff --git a/src/screensavers/rsxs-0.9/src/fieldlines/ion.hh b/xbmc/screensavers/rsxs-0.9/src/fieldlines/ion.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/fieldlines/ion.hh rename to xbmc/screensavers/rsxs-0.9/src/fieldlines/ion.hh diff --git a/src/screensavers/rsxs-0.9/src/flocks/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/flocks/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/flocks/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/flocks/bug.cc b/xbmc/screensavers/rsxs-0.9/src/flocks/bug.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/flocks/bug.cc rename to xbmc/screensavers/rsxs-0.9/src/flocks/bug.cc diff --git a/src/screensavers/rsxs-0.9/src/flocks/bug.hh b/xbmc/screensavers/rsxs-0.9/src/flocks/bug.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/flocks/bug.hh rename to xbmc/screensavers/rsxs-0.9/src/flocks/bug.hh diff --git a/src/screensavers/rsxs-0.9/src/flocks/flocks.cc b/xbmc/screensavers/rsxs-0.9/src/flocks/flocks.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/flocks/flocks.cc rename to xbmc/screensavers/rsxs-0.9/src/flocks/flocks.cc diff --git a/src/screensavers/rsxs-0.9/src/flocks/flocks.hh b/xbmc/screensavers/rsxs-0.9/src/flocks/flocks.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/flocks/flocks.hh rename to xbmc/screensavers/rsxs-0.9/src/flocks/flocks.hh diff --git a/src/screensavers/rsxs-0.9/src/flux/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/flux/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/flux/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/flux/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/flux/flux.cc b/xbmc/screensavers/rsxs-0.9/src/flux/flux.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/flux/flux.cc rename to xbmc/screensavers/rsxs-0.9/src/flux/flux.cc diff --git a/src/screensavers/rsxs-0.9/src/flux/flux.hh b/xbmc/screensavers/rsxs-0.9/src/flux/flux.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/flux/flux.hh rename to xbmc/screensavers/rsxs-0.9/src/flux/flux.hh diff --git a/src/screensavers/rsxs-0.9/src/flux/trail.cc b/xbmc/screensavers/rsxs-0.9/src/flux/trail.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/flux/trail.cc rename to xbmc/screensavers/rsxs-0.9/src/flux/trail.cc diff --git a/src/screensavers/rsxs-0.9/src/flux/trail.hh b/xbmc/screensavers/rsxs-0.9/src/flux/trail.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/flux/trail.hh rename to xbmc/screensavers/rsxs-0.9/src/flux/trail.hh diff --git a/src/screensavers/rsxs-0.9/src/hack.hh b/xbmc/screensavers/rsxs-0.9/src/hack.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hack.hh rename to xbmc/screensavers/rsxs-0.9/src/hack.hh diff --git a/src/screensavers/rsxs-0.9/src/helios/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/helios/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/helios/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/helios/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/helios/helios.cc b/xbmc/screensavers/rsxs-0.9/src/helios/helios.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/helios/helios.cc rename to xbmc/screensavers/rsxs-0.9/src/helios/helios.cc diff --git a/src/screensavers/rsxs-0.9/src/helios/helios.hh b/xbmc/screensavers/rsxs-0.9/src/helios/helios.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/helios/helios.hh rename to xbmc/screensavers/rsxs-0.9/src/helios/helios.hh diff --git a/src/screensavers/rsxs-0.9/src/helios/particle.cc b/xbmc/screensavers/rsxs-0.9/src/helios/particle.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/helios/particle.cc rename to xbmc/screensavers/rsxs-0.9/src/helios/particle.cc diff --git a/src/screensavers/rsxs-0.9/src/helios/particle.hh b/xbmc/screensavers/rsxs-0.9/src/helios/particle.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/helios/particle.hh rename to xbmc/screensavers/rsxs-0.9/src/helios/particle.hh diff --git a/src/screensavers/rsxs-0.9/src/helios/sphere.hh b/xbmc/screensavers/rsxs-0.9/src/helios/sphere.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/helios/sphere.hh rename to xbmc/screensavers/rsxs-0.9/src/helios/sphere.hh diff --git a/src/screensavers/rsxs-0.9/src/helios/spheremap.png b/xbmc/screensavers/rsxs-0.9/src/helios/spheremap.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/helios/spheremap.png rename to xbmc/screensavers/rsxs-0.9/src/helios/spheremap.png diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/caustic.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/caustic.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/caustic.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/caustic.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/caustic.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/caustic.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/caustic.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/caustic.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/cubemaps.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/cubemaps.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/cubemaps.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/cubemaps.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/cubemaps.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/cubemaps.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/cubemaps.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/cubemaps.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/extensions.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/extensions.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/extensions.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/extensions.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/extensions.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/extensions.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/extensions.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/extensions.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/flares.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/flares.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/flares.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/flares.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/flares.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/flares.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/flares.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/flares.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/goo.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/goo.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/goo.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/goo.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/goo.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/goo.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/goo.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/goo.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/hyperspace.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/hyperspace.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/hyperspace.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/hyperspace.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/hyperspace.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/hyperspace.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/hyperspace.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/hyperspace.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/nebula.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/nebula.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/nebula.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/nebula.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/nebula.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/nebula.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/nebula.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/nebula.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/nebula.png b/xbmc/screensavers/rsxs-0.9/src/hyperspace/nebula.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/nebula.png rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/nebula.png diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/particle.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/particle.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/particle.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/particle.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/particle.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/particle.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/particle.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/particle.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/shaders.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/shaders.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/shaders.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/shaders.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/shaders.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/shaders.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/shaders.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/shaders.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/spline.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/spline.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/spline.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/spline.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/spline.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/spline.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/spline.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/spline.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/starburst.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/starburst.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/starburst.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/starburst.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/starburst.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/starburst.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/starburst.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/starburst.hh diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/tunnel.cc b/xbmc/screensavers/rsxs-0.9/src/hyperspace/tunnel.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/tunnel.cc rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/tunnel.cc diff --git a/src/screensavers/rsxs-0.9/src/hyperspace/tunnel.hh b/xbmc/screensavers/rsxs-0.9/src/hyperspace/tunnel.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/hyperspace/tunnel.hh rename to xbmc/screensavers/rsxs-0.9/src/hyperspace/tunnel.hh diff --git a/src/screensavers/rsxs-0.9/src/implicit.cc b/xbmc/screensavers/rsxs-0.9/src/implicit.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/implicit.cc rename to xbmc/screensavers/rsxs-0.9/src/implicit.cc diff --git a/src/screensavers/rsxs-0.9/src/implicit.hh b/xbmc/screensavers/rsxs-0.9/src/implicit.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/implicit.hh rename to xbmc/screensavers/rsxs-0.9/src/implicit.hh diff --git a/src/screensavers/rsxs-0.9/src/lattice/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/lattice/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/lattice/brass.png b/xbmc/screensavers/rsxs-0.9/src/lattice/brass.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/brass.png rename to xbmc/screensavers/rsxs-0.9/src/lattice/brass.png diff --git a/src/screensavers/rsxs-0.9/src/lattice/camera.hh b/xbmc/screensavers/rsxs-0.9/src/lattice/camera.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/camera.hh rename to xbmc/screensavers/rsxs-0.9/src/lattice/camera.hh diff --git a/src/screensavers/rsxs-0.9/src/lattice/chrome.png b/xbmc/screensavers/rsxs-0.9/src/lattice/chrome.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/chrome.png rename to xbmc/screensavers/rsxs-0.9/src/lattice/chrome.png diff --git a/src/screensavers/rsxs-0.9/src/lattice/circuits.png b/xbmc/screensavers/rsxs-0.9/src/lattice/circuits.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/circuits.png rename to xbmc/screensavers/rsxs-0.9/src/lattice/circuits.png diff --git a/src/screensavers/rsxs-0.9/src/lattice/crystal.png b/xbmc/screensavers/rsxs-0.9/src/lattice/crystal.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/crystal.png rename to xbmc/screensavers/rsxs-0.9/src/lattice/crystal.png diff --git a/src/screensavers/rsxs-0.9/src/lattice/doughnuts.png b/xbmc/screensavers/rsxs-0.9/src/lattice/doughnuts.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/doughnuts.png rename to xbmc/screensavers/rsxs-0.9/src/lattice/doughnuts.png diff --git a/src/screensavers/rsxs-0.9/src/lattice/ghostly.png b/xbmc/screensavers/rsxs-0.9/src/lattice/ghostly.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/ghostly.png rename to xbmc/screensavers/rsxs-0.9/src/lattice/ghostly.png diff --git a/src/screensavers/rsxs-0.9/src/lattice/industrial1.png b/xbmc/screensavers/rsxs-0.9/src/lattice/industrial1.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/industrial1.png rename to xbmc/screensavers/rsxs-0.9/src/lattice/industrial1.png diff --git a/src/screensavers/rsxs-0.9/src/lattice/industrial2.png b/xbmc/screensavers/rsxs-0.9/src/lattice/industrial2.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/industrial2.png rename to xbmc/screensavers/rsxs-0.9/src/lattice/industrial2.png diff --git a/src/screensavers/rsxs-0.9/src/lattice/lattice.cc b/xbmc/screensavers/rsxs-0.9/src/lattice/lattice.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/lattice.cc rename to xbmc/screensavers/rsxs-0.9/src/lattice/lattice.cc diff --git a/src/screensavers/rsxs-0.9/src/lattice/lattice.hh b/xbmc/screensavers/rsxs-0.9/src/lattice/lattice.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/lattice.hh rename to xbmc/screensavers/rsxs-0.9/src/lattice/lattice.hh diff --git a/src/screensavers/rsxs-0.9/src/lattice/resources.cc b/xbmc/screensavers/rsxs-0.9/src/lattice/resources.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/resources.cc rename to xbmc/screensavers/rsxs-0.9/src/lattice/resources.cc diff --git a/src/screensavers/rsxs-0.9/src/lattice/resources.hh b/xbmc/screensavers/rsxs-0.9/src/lattice/resources.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/resources.hh rename to xbmc/screensavers/rsxs-0.9/src/lattice/resources.hh diff --git a/src/screensavers/rsxs-0.9/src/lattice/shiny.png b/xbmc/screensavers/rsxs-0.9/src/lattice/shiny.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/lattice/shiny.png rename to xbmc/screensavers/rsxs-0.9/src/lattice/shiny.png diff --git a/src/screensavers/rsxs-0.9/src/oggsound.cc b/xbmc/screensavers/rsxs-0.9/src/oggsound.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/oggsound.cc rename to xbmc/screensavers/rsxs-0.9/src/oggsound.cc diff --git a/src/screensavers/rsxs-0.9/src/oggsound.hh b/xbmc/screensavers/rsxs-0.9/src/oggsound.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/oggsound.hh rename to xbmc/screensavers/rsxs-0.9/src/oggsound.hh diff --git a/src/screensavers/rsxs-0.9/src/plasma/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/plasma/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/plasma/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/plasma/plasma.cc b/xbmc/screensavers/rsxs-0.9/src/plasma/plasma.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/plasma/plasma.cc rename to xbmc/screensavers/rsxs-0.9/src/plasma/plasma.cc diff --git a/src/screensavers/rsxs-0.9/src/plasma/plasma.hh b/xbmc/screensavers/rsxs-0.9/src/plasma/plasma.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/plasma/plasma.hh rename to xbmc/screensavers/rsxs-0.9/src/plasma/plasma.hh diff --git a/src/screensavers/rsxs-0.9/src/pngimage.cc b/xbmc/screensavers/rsxs-0.9/src/pngimage.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/pngimage.cc rename to xbmc/screensavers/rsxs-0.9/src/pngimage.cc diff --git a/src/screensavers/rsxs-0.9/src/pngimage.hh b/xbmc/screensavers/rsxs-0.9/src/pngimage.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/pngimage.hh rename to xbmc/screensavers/rsxs-0.9/src/pngimage.hh diff --git a/src/screensavers/rsxs-0.9/src/resource.hh b/xbmc/screensavers/rsxs-0.9/src/resource.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/resource.hh rename to xbmc/screensavers/rsxs-0.9/src/resource.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/bee.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/bee.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/bee.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/bee.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/bee.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/bee.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/bee.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/bee.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/bigmama.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/bigmama.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/bigmama.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/bigmama.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/bigmama.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/bigmama.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/bigmama.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/bigmama.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/bomb.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/bomb.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/bomb.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/bomb.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/bomb.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/bomb.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/bomb.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/bomb.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/boom1.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/boom1.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/boom1.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/boom1.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/boom2.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/boom2.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/boom2.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/boom2.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/boom3.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/boom3.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/boom3.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/boom3.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/boom4.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/boom4.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/boom4.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/boom4.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/cloud.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/cloud.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/cloud.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/cloud.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/earth-far.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/earth-far.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/earth-far.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/earth-far.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/earth-light.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/earth-light.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/earth-light.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/earth-light.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/earth-near.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/earth-near.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/earth-near.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/earth-near.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/explosion.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/explosion.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/explosion.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/explosion.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/explosion.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/explosion.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/explosion.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/explosion.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/flares.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/flares.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/flares.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/flares.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/flares.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/flares.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/flares.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/flares.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/fountain.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/fountain.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/fountain.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/fountain.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/fountain.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/fountain.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/fountain.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/fountain.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/launch1.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/launch1.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/launch1.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/launch1.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/launch2.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/launch2.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/launch2.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/launch2.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/meteor.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/meteor.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/meteor.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/meteor.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/meteor.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/meteor.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/meteor.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/meteor.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/moon.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/moon.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/moon.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/moon.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/nuke.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/nuke.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/nuke.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/nuke.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/overlay.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/overlay.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/overlay.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/overlay.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/overlay.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/overlay.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/overlay.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/overlay.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/particle.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/particle.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/particle.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/particle.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/popper.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/popper.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/popper.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/popper.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/resources.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/resources.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/resources.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/resources.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/resources.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/resources.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/resources.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/resources.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/rocket.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/rocket.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/rocket.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/rocket.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/rocket.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/rocket.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/rocket.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/rocket.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/shockwave.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/shockwave.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/shockwave.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/shockwave.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/shockwave.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/shockwave.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/shockwave.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/shockwave.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/skyrocket.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/skyrocket.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/skyrocket.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/skyrocket.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/skyrocket.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/skyrocket.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/skyrocket.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/skyrocket.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/smoke.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/smoke.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/smoke.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/smoke.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/smoke1.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke1.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/smoke1.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke1.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/smoke2.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke2.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/smoke2.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke2.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/smoke3.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke3.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/smoke3.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke3.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/smoke4.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke4.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/smoke4.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke4.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/smoke5.png b/xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke5.png similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/smoke5.png rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/smoke5.png diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/spinner.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/spinner.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/spinner.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/spinner.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/spinner.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/spinner.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/spinner.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/spinner.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/star.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/star.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/star.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/star.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/star.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/star.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/star.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/star.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/streamer.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/streamer.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/streamer.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/streamer.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/streamer.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/streamer.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/streamer.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/streamer.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/stretcher.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/stretcher.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/stretcher.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/stretcher.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/stretcher.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/stretcher.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/stretcher.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/stretcher.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/suck.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/suck.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/suck.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/suck.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/sucker.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/sucker.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/sucker.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/sucker.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/sucker.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/sucker.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/sucker.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/sucker.hh diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/whistle.ogg b/xbmc/screensavers/rsxs-0.9/src/skyrocket/whistle.ogg similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/whistle.ogg rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/whistle.ogg diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/world.cc b/xbmc/screensavers/rsxs-0.9/src/skyrocket/world.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/world.cc rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/world.cc diff --git a/src/screensavers/rsxs-0.9/src/skyrocket/world.hh b/xbmc/screensavers/rsxs-0.9/src/skyrocket/world.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/skyrocket/world.hh rename to xbmc/screensavers/rsxs-0.9/src/skyrocket/world.hh diff --git a/src/screensavers/rsxs-0.9/src/solarwinds/Makefile.am b/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.am similarity index 100% rename from src/screensavers/rsxs-0.9/src/solarwinds/Makefile.am rename to xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.am diff --git a/src/screensavers/rsxs-0.9/src/solarwinds/Makefile.xbmc b/xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.xbmc similarity index 100% rename from src/screensavers/rsxs-0.9/src/solarwinds/Makefile.xbmc rename to xbmc/screensavers/rsxs-0.9/src/solarwinds/Makefile.xbmc diff --git a/src/screensavers/rsxs-0.9/src/solarwinds/solarwinds.cc b/xbmc/screensavers/rsxs-0.9/src/solarwinds/solarwinds.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/solarwinds/solarwinds.cc rename to xbmc/screensavers/rsxs-0.9/src/solarwinds/solarwinds.cc diff --git a/src/screensavers/rsxs-0.9/src/solarwinds/solarwinds.hh b/xbmc/screensavers/rsxs-0.9/src/solarwinds/solarwinds.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/solarwinds/solarwinds.hh rename to xbmc/screensavers/rsxs-0.9/src/solarwinds/solarwinds.hh diff --git a/src/screensavers/rsxs-0.9/src/solarwinds/wind.cc b/xbmc/screensavers/rsxs-0.9/src/solarwinds/wind.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/solarwinds/wind.cc rename to xbmc/screensavers/rsxs-0.9/src/solarwinds/wind.cc diff --git a/src/screensavers/rsxs-0.9/src/solarwinds/wind.hh b/xbmc/screensavers/rsxs-0.9/src/solarwinds/wind.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/solarwinds/wind.hh rename to xbmc/screensavers/rsxs-0.9/src/solarwinds/wind.hh diff --git a/src/screensavers/rsxs-0.9/src/sound.cc b/xbmc/screensavers/rsxs-0.9/src/sound.cc similarity index 100% rename from src/screensavers/rsxs-0.9/src/sound.cc rename to xbmc/screensavers/rsxs-0.9/src/sound.cc diff --git a/src/screensavers/rsxs-0.9/src/sound.hh b/xbmc/screensavers/rsxs-0.9/src/sound.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/sound.hh rename to xbmc/screensavers/rsxs-0.9/src/sound.hh diff --git a/src/screensavers/rsxs-0.9/src/vector.hh b/xbmc/screensavers/rsxs-0.9/src/vector.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/vector.hh rename to xbmc/screensavers/rsxs-0.9/src/vector.hh diff --git a/src/screensavers/rsxs-0.9/src/vroot.hh b/xbmc/screensavers/rsxs-0.9/src/vroot.hh similarity index 100% rename from src/screensavers/rsxs-0.9/src/vroot.hh rename to xbmc/screensavers/rsxs-0.9/src/vroot.hh diff --git a/src/screensavers/rsxs-0.9/xbmc/Makefile.in b/xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in similarity index 100% rename from src/screensavers/rsxs-0.9/xbmc/Makefile.in rename to xbmc/screensavers/rsxs-0.9/xbmc/Makefile.in diff --git a/src/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp similarity index 100% rename from src/settings/AdvancedSettings.cpp rename to xbmc/settings/AdvancedSettings.cpp diff --git a/src/settings/AdvancedSettings.h b/xbmc/settings/AdvancedSettings.h similarity index 100% rename from src/settings/AdvancedSettings.h rename to xbmc/settings/AdvancedSettings.h diff --git a/src/settings/DiscSettings.h b/xbmc/settings/DiscSettings.h similarity index 100% rename from src/settings/DiscSettings.h rename to xbmc/settings/DiscSettings.h diff --git a/src/settings/DisplaySettings.cpp b/xbmc/settings/DisplaySettings.cpp similarity index 100% rename from src/settings/DisplaySettings.cpp rename to xbmc/settings/DisplaySettings.cpp diff --git a/src/settings/DisplaySettings.h b/xbmc/settings/DisplaySettings.h similarity index 100% rename from src/settings/DisplaySettings.h rename to xbmc/settings/DisplaySettings.h diff --git a/src/settings/Makefile b/xbmc/settings/Makefile similarity index 100% rename from src/settings/Makefile rename to xbmc/settings/Makefile diff --git a/src/settings/MediaSettings.cpp b/xbmc/settings/MediaSettings.cpp similarity index 100% rename from src/settings/MediaSettings.cpp rename to xbmc/settings/MediaSettings.cpp diff --git a/src/settings/MediaSettings.h b/xbmc/settings/MediaSettings.h similarity index 100% rename from src/settings/MediaSettings.h rename to xbmc/settings/MediaSettings.h diff --git a/src/settings/MediaSourceSettings.cpp b/xbmc/settings/MediaSourceSettings.cpp similarity index 100% rename from src/settings/MediaSourceSettings.cpp rename to xbmc/settings/MediaSourceSettings.cpp diff --git a/src/settings/MediaSourceSettings.h b/xbmc/settings/MediaSourceSettings.h similarity index 100% rename from src/settings/MediaSourceSettings.h rename to xbmc/settings/MediaSourceSettings.h diff --git a/src/settings/SettingAddon.cpp b/xbmc/settings/SettingAddon.cpp similarity index 100% rename from src/settings/SettingAddon.cpp rename to xbmc/settings/SettingAddon.cpp diff --git a/src/settings/SettingAddon.h b/xbmc/settings/SettingAddon.h similarity index 100% rename from src/settings/SettingAddon.h rename to xbmc/settings/SettingAddon.h diff --git a/src/settings/SettingConditions.cpp b/xbmc/settings/SettingConditions.cpp similarity index 100% rename from src/settings/SettingConditions.cpp rename to xbmc/settings/SettingConditions.cpp diff --git a/src/settings/SettingConditions.h b/xbmc/settings/SettingConditions.h similarity index 100% rename from src/settings/SettingConditions.h rename to xbmc/settings/SettingConditions.h diff --git a/src/settings/SettingControl.cpp b/xbmc/settings/SettingControl.cpp similarity index 100% rename from src/settings/SettingControl.cpp rename to xbmc/settings/SettingControl.cpp diff --git a/src/settings/SettingControl.h b/xbmc/settings/SettingControl.h similarity index 100% rename from src/settings/SettingControl.h rename to xbmc/settings/SettingControl.h diff --git a/src/settings/SettingCreator.cpp b/xbmc/settings/SettingCreator.cpp similarity index 100% rename from src/settings/SettingCreator.cpp rename to xbmc/settings/SettingCreator.cpp diff --git a/src/settings/SettingCreator.h b/xbmc/settings/SettingCreator.h similarity index 100% rename from src/settings/SettingCreator.h rename to xbmc/settings/SettingCreator.h diff --git a/src/settings/SettingPath.cpp b/xbmc/settings/SettingPath.cpp similarity index 100% rename from src/settings/SettingPath.cpp rename to xbmc/settings/SettingPath.cpp diff --git a/src/settings/SettingPath.h b/xbmc/settings/SettingPath.h similarity index 100% rename from src/settings/SettingPath.h rename to xbmc/settings/SettingPath.h diff --git a/src/settings/SettingUtils.cpp b/xbmc/settings/SettingUtils.cpp similarity index 100% rename from src/settings/SettingUtils.cpp rename to xbmc/settings/SettingUtils.cpp diff --git a/src/settings/SettingUtils.h b/xbmc/settings/SettingUtils.h similarity index 100% rename from src/settings/SettingUtils.h rename to xbmc/settings/SettingUtils.h diff --git a/src/settings/Settings.cpp b/xbmc/settings/Settings.cpp similarity index 100% rename from src/settings/Settings.cpp rename to xbmc/settings/Settings.cpp diff --git a/src/settings/Settings.h b/xbmc/settings/Settings.h similarity index 100% rename from src/settings/Settings.h rename to xbmc/settings/Settings.h diff --git a/src/settings/SkinSettings.cpp b/xbmc/settings/SkinSettings.cpp similarity index 100% rename from src/settings/SkinSettings.cpp rename to xbmc/settings/SkinSettings.cpp diff --git a/src/settings/SkinSettings.h b/xbmc/settings/SkinSettings.h similarity index 100% rename from src/settings/SkinSettings.h rename to xbmc/settings/SkinSettings.h diff --git a/src/settings/VideoSettings.cpp b/xbmc/settings/VideoSettings.cpp similarity index 100% rename from src/settings/VideoSettings.cpp rename to xbmc/settings/VideoSettings.cpp diff --git a/src/settings/VideoSettings.h b/xbmc/settings/VideoSettings.h similarity index 100% rename from src/settings/VideoSettings.h rename to xbmc/settings/VideoSettings.h diff --git a/src/settings/dialogs/GUIDialogContentSettings.cpp b/xbmc/settings/dialogs/GUIDialogContentSettings.cpp similarity index 100% rename from src/settings/dialogs/GUIDialogContentSettings.cpp rename to xbmc/settings/dialogs/GUIDialogContentSettings.cpp diff --git a/src/settings/dialogs/GUIDialogContentSettings.h b/xbmc/settings/dialogs/GUIDialogContentSettings.h similarity index 100% rename from src/settings/dialogs/GUIDialogContentSettings.h rename to xbmc/settings/dialogs/GUIDialogContentSettings.h diff --git a/src/settings/dialogs/GUIDialogSettingsBase.cpp b/xbmc/settings/dialogs/GUIDialogSettingsBase.cpp similarity index 100% rename from src/settings/dialogs/GUIDialogSettingsBase.cpp rename to xbmc/settings/dialogs/GUIDialogSettingsBase.cpp diff --git a/src/settings/dialogs/GUIDialogSettingsBase.h b/xbmc/settings/dialogs/GUIDialogSettingsBase.h similarity index 100% rename from src/settings/dialogs/GUIDialogSettingsBase.h rename to xbmc/settings/dialogs/GUIDialogSettingsBase.h diff --git a/src/settings/dialogs/GUIDialogSettingsManagerBase.cpp b/xbmc/settings/dialogs/GUIDialogSettingsManagerBase.cpp similarity index 100% rename from src/settings/dialogs/GUIDialogSettingsManagerBase.cpp rename to xbmc/settings/dialogs/GUIDialogSettingsManagerBase.cpp diff --git a/src/settings/dialogs/GUIDialogSettingsManagerBase.h b/xbmc/settings/dialogs/GUIDialogSettingsManagerBase.h similarity index 100% rename from src/settings/dialogs/GUIDialogSettingsManagerBase.h rename to xbmc/settings/dialogs/GUIDialogSettingsManagerBase.h diff --git a/src/settings/dialogs/GUIDialogSettingsManualBase.cpp b/xbmc/settings/dialogs/GUIDialogSettingsManualBase.cpp similarity index 100% rename from src/settings/dialogs/GUIDialogSettingsManualBase.cpp rename to xbmc/settings/dialogs/GUIDialogSettingsManualBase.cpp diff --git a/src/settings/dialogs/GUIDialogSettingsManualBase.h b/xbmc/settings/dialogs/GUIDialogSettingsManualBase.h similarity index 100% rename from src/settings/dialogs/GUIDialogSettingsManualBase.h rename to xbmc/settings/dialogs/GUIDialogSettingsManualBase.h diff --git a/src/settings/dialogs/Makefile b/xbmc/settings/dialogs/Makefile similarity index 100% rename from src/settings/dialogs/Makefile rename to xbmc/settings/dialogs/Makefile diff --git a/src/settings/lib/ISetting.cpp b/xbmc/settings/lib/ISetting.cpp similarity index 100% rename from src/settings/lib/ISetting.cpp rename to xbmc/settings/lib/ISetting.cpp diff --git a/src/settings/lib/ISetting.h b/xbmc/settings/lib/ISetting.h similarity index 100% rename from src/settings/lib/ISetting.h rename to xbmc/settings/lib/ISetting.h diff --git a/src/settings/lib/ISettingCallback.h b/xbmc/settings/lib/ISettingCallback.h similarity index 100% rename from src/settings/lib/ISettingCallback.h rename to xbmc/settings/lib/ISettingCallback.h diff --git a/src/settings/lib/ISettingControl.cpp b/xbmc/settings/lib/ISettingControl.cpp similarity index 100% rename from src/settings/lib/ISettingControl.cpp rename to xbmc/settings/lib/ISettingControl.cpp diff --git a/src/settings/lib/ISettingControl.h b/xbmc/settings/lib/ISettingControl.h similarity index 100% rename from src/settings/lib/ISettingControl.h rename to xbmc/settings/lib/ISettingControl.h diff --git a/src/settings/lib/ISettingControlCreator.h b/xbmc/settings/lib/ISettingControlCreator.h similarity index 100% rename from src/settings/lib/ISettingControlCreator.h rename to xbmc/settings/lib/ISettingControlCreator.h diff --git a/src/settings/lib/ISettingCreator.h b/xbmc/settings/lib/ISettingCreator.h similarity index 100% rename from src/settings/lib/ISettingCreator.h rename to xbmc/settings/lib/ISettingCreator.h diff --git a/src/settings/lib/ISettingsHandler.h b/xbmc/settings/lib/ISettingsHandler.h similarity index 100% rename from src/settings/lib/ISettingsHandler.h rename to xbmc/settings/lib/ISettingsHandler.h diff --git a/src/settings/lib/ISubSettings.h b/xbmc/settings/lib/ISubSettings.h similarity index 100% rename from src/settings/lib/ISubSettings.h rename to xbmc/settings/lib/ISubSettings.h diff --git a/src/settings/lib/Makefile b/xbmc/settings/lib/Makefile similarity index 100% rename from src/settings/lib/Makefile rename to xbmc/settings/lib/Makefile diff --git a/src/settings/lib/Setting.cpp b/xbmc/settings/lib/Setting.cpp similarity index 100% rename from src/settings/lib/Setting.cpp rename to xbmc/settings/lib/Setting.cpp diff --git a/src/settings/lib/Setting.h b/xbmc/settings/lib/Setting.h similarity index 100% rename from src/settings/lib/Setting.h rename to xbmc/settings/lib/Setting.h diff --git a/src/settings/lib/SettingCategoryAccess.cpp b/xbmc/settings/lib/SettingCategoryAccess.cpp similarity index 100% rename from src/settings/lib/SettingCategoryAccess.cpp rename to xbmc/settings/lib/SettingCategoryAccess.cpp diff --git a/src/settings/lib/SettingCategoryAccess.h b/xbmc/settings/lib/SettingCategoryAccess.h similarity index 100% rename from src/settings/lib/SettingCategoryAccess.h rename to xbmc/settings/lib/SettingCategoryAccess.h diff --git a/src/settings/lib/SettingConditions.cpp b/xbmc/settings/lib/SettingConditions.cpp similarity index 100% rename from src/settings/lib/SettingConditions.cpp rename to xbmc/settings/lib/SettingConditions.cpp diff --git a/src/settings/lib/SettingConditions.h b/xbmc/settings/lib/SettingConditions.h similarity index 100% rename from src/settings/lib/SettingConditions.h rename to xbmc/settings/lib/SettingConditions.h diff --git a/src/settings/lib/SettingDefinitions.h b/xbmc/settings/lib/SettingDefinitions.h similarity index 100% rename from src/settings/lib/SettingDefinitions.h rename to xbmc/settings/lib/SettingDefinitions.h diff --git a/src/settings/lib/SettingDependency.cpp b/xbmc/settings/lib/SettingDependency.cpp similarity index 100% rename from src/settings/lib/SettingDependency.cpp rename to xbmc/settings/lib/SettingDependency.cpp diff --git a/src/settings/lib/SettingDependency.h b/xbmc/settings/lib/SettingDependency.h similarity index 100% rename from src/settings/lib/SettingDependency.h rename to xbmc/settings/lib/SettingDependency.h diff --git a/src/settings/lib/SettingRequirement.cpp b/xbmc/settings/lib/SettingRequirement.cpp similarity index 100% rename from src/settings/lib/SettingRequirement.cpp rename to xbmc/settings/lib/SettingRequirement.cpp diff --git a/src/settings/lib/SettingRequirement.h b/xbmc/settings/lib/SettingRequirement.h similarity index 100% rename from src/settings/lib/SettingRequirement.h rename to xbmc/settings/lib/SettingRequirement.h diff --git a/src/settings/lib/SettingSection.cpp b/xbmc/settings/lib/SettingSection.cpp similarity index 100% rename from src/settings/lib/SettingSection.cpp rename to xbmc/settings/lib/SettingSection.cpp diff --git a/src/settings/lib/SettingSection.h b/xbmc/settings/lib/SettingSection.h similarity index 100% rename from src/settings/lib/SettingSection.h rename to xbmc/settings/lib/SettingSection.h diff --git a/src/settings/lib/SettingUpdate.cpp b/xbmc/settings/lib/SettingUpdate.cpp similarity index 100% rename from src/settings/lib/SettingUpdate.cpp rename to xbmc/settings/lib/SettingUpdate.cpp diff --git a/src/settings/lib/SettingUpdate.h b/xbmc/settings/lib/SettingUpdate.h similarity index 100% rename from src/settings/lib/SettingUpdate.h rename to xbmc/settings/lib/SettingUpdate.h diff --git a/src/settings/lib/SettingsManager.cpp b/xbmc/settings/lib/SettingsManager.cpp similarity index 100% rename from src/settings/lib/SettingsManager.cpp rename to xbmc/settings/lib/SettingsManager.cpp diff --git a/src/settings/lib/SettingsManager.h b/xbmc/settings/lib/SettingsManager.h similarity index 100% rename from src/settings/lib/SettingsManager.h rename to xbmc/settings/lib/SettingsManager.h diff --git a/src/settings/windows/GUIControlSettings.cpp b/xbmc/settings/windows/GUIControlSettings.cpp similarity index 100% rename from src/settings/windows/GUIControlSettings.cpp rename to xbmc/settings/windows/GUIControlSettings.cpp diff --git a/src/settings/windows/GUIControlSettings.h b/xbmc/settings/windows/GUIControlSettings.h similarity index 100% rename from src/settings/windows/GUIControlSettings.h rename to xbmc/settings/windows/GUIControlSettings.h diff --git a/src/settings/windows/GUIWindowSettings.cpp b/xbmc/settings/windows/GUIWindowSettings.cpp similarity index 100% rename from src/settings/windows/GUIWindowSettings.cpp rename to xbmc/settings/windows/GUIWindowSettings.cpp diff --git a/src/settings/windows/GUIWindowSettings.h b/xbmc/settings/windows/GUIWindowSettings.h similarity index 100% rename from src/settings/windows/GUIWindowSettings.h rename to xbmc/settings/windows/GUIWindowSettings.h diff --git a/src/settings/windows/GUIWindowSettingsCategory.cpp b/xbmc/settings/windows/GUIWindowSettingsCategory.cpp similarity index 100% rename from src/settings/windows/GUIWindowSettingsCategory.cpp rename to xbmc/settings/windows/GUIWindowSettingsCategory.cpp diff --git a/src/settings/windows/GUIWindowSettingsCategory.h b/xbmc/settings/windows/GUIWindowSettingsCategory.h similarity index 100% rename from src/settings/windows/GUIWindowSettingsCategory.h rename to xbmc/settings/windows/GUIWindowSettingsCategory.h diff --git a/src/settings/windows/GUIWindowSettingsScreenCalibration.cpp b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp similarity index 100% rename from src/settings/windows/GUIWindowSettingsScreenCalibration.cpp rename to xbmc/settings/windows/GUIWindowSettingsScreenCalibration.cpp diff --git a/src/settings/windows/GUIWindowSettingsScreenCalibration.h b/xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h similarity index 100% rename from src/settings/windows/GUIWindowSettingsScreenCalibration.h rename to xbmc/settings/windows/GUIWindowSettingsScreenCalibration.h diff --git a/src/settings/windows/GUIWindowTestPattern.cpp b/xbmc/settings/windows/GUIWindowTestPattern.cpp similarity index 100% rename from src/settings/windows/GUIWindowTestPattern.cpp rename to xbmc/settings/windows/GUIWindowTestPattern.cpp diff --git a/src/settings/windows/GUIWindowTestPattern.h b/xbmc/settings/windows/GUIWindowTestPattern.h similarity index 100% rename from src/settings/windows/GUIWindowTestPattern.h rename to xbmc/settings/windows/GUIWindowTestPattern.h diff --git a/src/settings/windows/Makefile b/xbmc/settings/windows/Makefile similarity index 100% rename from src/settings/windows/Makefile rename to xbmc/settings/windows/Makefile diff --git a/src/storage/AutorunMediaJob.cpp b/xbmc/storage/AutorunMediaJob.cpp similarity index 100% rename from src/storage/AutorunMediaJob.cpp rename to xbmc/storage/AutorunMediaJob.cpp diff --git a/src/storage/AutorunMediaJob.h b/xbmc/storage/AutorunMediaJob.h similarity index 100% rename from src/storage/AutorunMediaJob.h rename to xbmc/storage/AutorunMediaJob.h diff --git a/src/storage/DetectDVDType.cpp b/xbmc/storage/DetectDVDType.cpp similarity index 100% rename from src/storage/DetectDVDType.cpp rename to xbmc/storage/DetectDVDType.cpp diff --git a/src/storage/DetectDVDType.h b/xbmc/storage/DetectDVDType.h similarity index 100% rename from src/storage/DetectDVDType.h rename to xbmc/storage/DetectDVDType.h diff --git a/src/storage/IStorageProvider.h b/xbmc/storage/IStorageProvider.h similarity index 100% rename from src/storage/IStorageProvider.h rename to xbmc/storage/IStorageProvider.h diff --git a/src/storage/IoSupport.cpp b/xbmc/storage/IoSupport.cpp similarity index 100% rename from src/storage/IoSupport.cpp rename to xbmc/storage/IoSupport.cpp diff --git a/src/storage/IoSupport.h b/xbmc/storage/IoSupport.h similarity index 100% rename from src/storage/IoSupport.h rename to xbmc/storage/IoSupport.h diff --git a/src/storage/Makefile b/xbmc/storage/Makefile similarity index 100% rename from src/storage/Makefile rename to xbmc/storage/Makefile diff --git a/src/storage/MediaManager.cpp b/xbmc/storage/MediaManager.cpp similarity index 100% rename from src/storage/MediaManager.cpp rename to xbmc/storage/MediaManager.cpp diff --git a/src/storage/MediaManager.h b/xbmc/storage/MediaManager.h similarity index 100% rename from src/storage/MediaManager.h rename to xbmc/storage/MediaManager.h diff --git a/src/storage/android/AndroidStorageProvider.cpp b/xbmc/storage/android/AndroidStorageProvider.cpp similarity index 100% rename from src/storage/android/AndroidStorageProvider.cpp rename to xbmc/storage/android/AndroidStorageProvider.cpp diff --git a/src/storage/android/AndroidStorageProvider.h b/xbmc/storage/android/AndroidStorageProvider.h similarity index 100% rename from src/storage/android/AndroidStorageProvider.h rename to xbmc/storage/android/AndroidStorageProvider.h diff --git a/src/storage/android/Makefile b/xbmc/storage/android/Makefile similarity index 100% rename from src/storage/android/Makefile rename to xbmc/storage/android/Makefile diff --git a/src/storage/cdioSupport.cpp b/xbmc/storage/cdioSupport.cpp similarity index 100% rename from src/storage/cdioSupport.cpp rename to xbmc/storage/cdioSupport.cpp diff --git a/src/storage/cdioSupport.h b/xbmc/storage/cdioSupport.h similarity index 100% rename from src/storage/cdioSupport.h rename to xbmc/storage/cdioSupport.h diff --git a/src/storage/linux/DeviceKitDisksProvider.cpp b/xbmc/storage/linux/DeviceKitDisksProvider.cpp similarity index 100% rename from src/storage/linux/DeviceKitDisksProvider.cpp rename to xbmc/storage/linux/DeviceKitDisksProvider.cpp diff --git a/src/storage/linux/DeviceKitDisksProvider.h b/xbmc/storage/linux/DeviceKitDisksProvider.h similarity index 100% rename from src/storage/linux/DeviceKitDisksProvider.h rename to xbmc/storage/linux/DeviceKitDisksProvider.h diff --git a/src/storage/linux/LinuxStorageProvider.h b/xbmc/storage/linux/LinuxStorageProvider.h similarity index 100% rename from src/storage/linux/LinuxStorageProvider.h rename to xbmc/storage/linux/LinuxStorageProvider.h diff --git a/src/storage/linux/Makefile b/xbmc/storage/linux/Makefile similarity index 100% rename from src/storage/linux/Makefile rename to xbmc/storage/linux/Makefile diff --git a/src/storage/linux/UDevProvider.cpp b/xbmc/storage/linux/UDevProvider.cpp similarity index 100% rename from src/storage/linux/UDevProvider.cpp rename to xbmc/storage/linux/UDevProvider.cpp diff --git a/src/storage/linux/UDevProvider.h b/xbmc/storage/linux/UDevProvider.h similarity index 100% rename from src/storage/linux/UDevProvider.h rename to xbmc/storage/linux/UDevProvider.h diff --git a/src/storage/linux/UDisksProvider.cpp b/xbmc/storage/linux/UDisksProvider.cpp similarity index 100% rename from src/storage/linux/UDisksProvider.cpp rename to xbmc/storage/linux/UDisksProvider.cpp diff --git a/src/storage/linux/UDisksProvider.h b/xbmc/storage/linux/UDisksProvider.h similarity index 100% rename from src/storage/linux/UDisksProvider.h rename to xbmc/storage/linux/UDisksProvider.h diff --git a/src/storage/osx/DarwinStorageProvider.cpp b/xbmc/storage/osx/DarwinStorageProvider.cpp similarity index 100% rename from src/storage/osx/DarwinStorageProvider.cpp rename to xbmc/storage/osx/DarwinStorageProvider.cpp diff --git a/src/storage/osx/DarwinStorageProvider.h b/xbmc/storage/osx/DarwinStorageProvider.h similarity index 100% rename from src/storage/osx/DarwinStorageProvider.h rename to xbmc/storage/osx/DarwinStorageProvider.h diff --git a/src/storage/osx/Makefile b/xbmc/storage/osx/Makefile similarity index 100% rename from src/storage/osx/Makefile rename to xbmc/storage/osx/Makefile diff --git a/src/storage/windows/Win32StorageProvider.cpp b/xbmc/storage/windows/Win32StorageProvider.cpp similarity index 100% rename from src/storage/windows/Win32StorageProvider.cpp rename to xbmc/storage/windows/Win32StorageProvider.cpp diff --git a/src/storage/windows/Win32StorageProvider.h b/xbmc/storage/windows/Win32StorageProvider.h similarity index 100% rename from src/storage/windows/Win32StorageProvider.h rename to xbmc/storage/windows/Win32StorageProvider.h diff --git a/src/system.h b/xbmc/system.h similarity index 100% rename from src/system.h rename to xbmc/system.h diff --git a/src/system_gl.h b/xbmc/system_gl.h similarity index 100% rename from src/system_gl.h rename to xbmc/system_gl.h diff --git a/src/test/Makefile b/xbmc/test/Makefile similarity index 100% rename from src/test/Makefile rename to xbmc/test/Makefile diff --git a/src/test/TestBasicEnvironment.cpp b/xbmc/test/TestBasicEnvironment.cpp similarity index 100% rename from src/test/TestBasicEnvironment.cpp rename to xbmc/test/TestBasicEnvironment.cpp diff --git a/src/test/TestBasicEnvironment.h b/xbmc/test/TestBasicEnvironment.h similarity index 100% rename from src/test/TestBasicEnvironment.h rename to xbmc/test/TestBasicEnvironment.h diff --git a/src/test/TestFileItem.cpp b/xbmc/test/TestFileItem.cpp similarity index 100% rename from src/test/TestFileItem.cpp rename to xbmc/test/TestFileItem.cpp diff --git a/src/test/TestTextureUtils.cpp b/xbmc/test/TestTextureUtils.cpp similarity index 100% rename from src/test/TestTextureUtils.cpp rename to xbmc/test/TestTextureUtils.cpp diff --git a/src/test/TestURL.cpp b/xbmc/test/TestURL.cpp similarity index 100% rename from src/test/TestURL.cpp rename to xbmc/test/TestURL.cpp diff --git a/src/test/TestUtils.cpp b/xbmc/test/TestUtils.cpp similarity index 100% rename from src/test/TestUtils.cpp rename to xbmc/test/TestUtils.cpp diff --git a/src/test/TestUtils.h b/xbmc/test/TestUtils.h similarity index 100% rename from src/test/TestUtils.h rename to xbmc/test/TestUtils.h diff --git a/src/test/xbmc-test.cpp b/xbmc/test/xbmc-test.cpp similarity index 100% rename from src/test/xbmc-test.cpp rename to xbmc/test/xbmc-test.cpp diff --git a/src/threads/Atomics.cpp b/xbmc/threads/Atomics.cpp similarity index 100% rename from src/threads/Atomics.cpp rename to xbmc/threads/Atomics.cpp diff --git a/src/threads/Atomics.h b/xbmc/threads/Atomics.h similarity index 100% rename from src/threads/Atomics.h rename to xbmc/threads/Atomics.h diff --git a/src/threads/Condition.h b/xbmc/threads/Condition.h similarity index 100% rename from src/threads/Condition.h rename to xbmc/threads/Condition.h diff --git a/src/threads/CriticalSection.h b/xbmc/threads/CriticalSection.h similarity index 100% rename from src/threads/CriticalSection.h rename to xbmc/threads/CriticalSection.h diff --git a/src/threads/Event.cpp b/xbmc/threads/Event.cpp similarity index 100% rename from src/threads/Event.cpp rename to xbmc/threads/Event.cpp diff --git a/src/threads/Event.h b/xbmc/threads/Event.h similarity index 100% rename from src/threads/Event.h rename to xbmc/threads/Event.h diff --git a/src/threads/Helpers.h b/xbmc/threads/Helpers.h similarity index 100% rename from src/threads/Helpers.h rename to xbmc/threads/Helpers.h diff --git a/src/threads/LockFree.cpp b/xbmc/threads/LockFree.cpp similarity index 100% rename from src/threads/LockFree.cpp rename to xbmc/threads/LockFree.cpp diff --git a/src/threads/LockFree.h b/xbmc/threads/LockFree.h similarity index 100% rename from src/threads/LockFree.h rename to xbmc/threads/LockFree.h diff --git a/src/threads/Lockables.h b/xbmc/threads/Lockables.h similarity index 100% rename from src/threads/Lockables.h rename to xbmc/threads/Lockables.h diff --git a/src/threads/Makefile b/xbmc/threads/Makefile similarity index 100% rename from src/threads/Makefile rename to xbmc/threads/Makefile diff --git a/src/threads/SharedSection.h b/xbmc/threads/SharedSection.h similarity index 100% rename from src/threads/SharedSection.h rename to xbmc/threads/SharedSection.h diff --git a/src/threads/SingleLock.h b/xbmc/threads/SingleLock.h similarity index 100% rename from src/threads/SingleLock.h rename to xbmc/threads/SingleLock.h diff --git a/src/threads/SystemClock.cpp b/xbmc/threads/SystemClock.cpp similarity index 100% rename from src/threads/SystemClock.cpp rename to xbmc/threads/SystemClock.cpp diff --git a/src/threads/SystemClock.h b/xbmc/threads/SystemClock.h similarity index 100% rename from src/threads/SystemClock.h rename to xbmc/threads/SystemClock.h diff --git a/src/threads/Thread.cpp b/xbmc/threads/Thread.cpp similarity index 100% rename from src/threads/Thread.cpp rename to xbmc/threads/Thread.cpp diff --git a/src/threads/Thread.h b/xbmc/threads/Thread.h similarity index 100% rename from src/threads/Thread.h rename to xbmc/threads/Thread.h diff --git a/src/threads/ThreadImpl.h b/xbmc/threads/ThreadImpl.h similarity index 100% rename from src/threads/ThreadImpl.h rename to xbmc/threads/ThreadImpl.h diff --git a/src/threads/ThreadLocal.h b/xbmc/threads/ThreadLocal.h similarity index 100% rename from src/threads/ThreadLocal.h rename to xbmc/threads/ThreadLocal.h diff --git a/src/threads/Timer.cpp b/xbmc/threads/Timer.cpp similarity index 100% rename from src/threads/Timer.cpp rename to xbmc/threads/Timer.cpp diff --git a/src/threads/Timer.h b/xbmc/threads/Timer.h similarity index 100% rename from src/threads/Timer.h rename to xbmc/threads/Timer.h diff --git a/src/threads/platform/Condition.h b/xbmc/threads/platform/Condition.h similarity index 100% rename from src/threads/platform/Condition.h rename to xbmc/threads/platform/Condition.h diff --git a/src/threads/platform/CriticalSection.h b/xbmc/threads/platform/CriticalSection.h similarity index 100% rename from src/threads/platform/CriticalSection.h rename to xbmc/threads/platform/CriticalSection.h diff --git a/src/threads/platform/Implementation.cpp b/xbmc/threads/platform/Implementation.cpp similarity index 100% rename from src/threads/platform/Implementation.cpp rename to xbmc/threads/platform/Implementation.cpp diff --git a/src/threads/platform/README.platform b/xbmc/threads/platform/README.platform similarity index 100% rename from src/threads/platform/README.platform rename to xbmc/threads/platform/README.platform diff --git a/src/threads/platform/ThreadImpl.cpp b/xbmc/threads/platform/ThreadImpl.cpp similarity index 100% rename from src/threads/platform/ThreadImpl.cpp rename to xbmc/threads/platform/ThreadImpl.cpp diff --git a/src/threads/platform/ThreadImpl.h b/xbmc/threads/platform/ThreadImpl.h similarity index 100% rename from src/threads/platform/ThreadImpl.h rename to xbmc/threads/platform/ThreadImpl.h diff --git a/src/threads/platform/ThreadLocal.h b/xbmc/threads/platform/ThreadLocal.h similarity index 100% rename from src/threads/platform/ThreadLocal.h rename to xbmc/threads/platform/ThreadLocal.h diff --git a/src/threads/platform/darwin/ThreadSchedImpl.cpp b/xbmc/threads/platform/darwin/ThreadSchedImpl.cpp similarity index 100% rename from src/threads/platform/darwin/ThreadSchedImpl.cpp rename to xbmc/threads/platform/darwin/ThreadSchedImpl.cpp diff --git a/src/threads/platform/linux/ThreadSchedImpl.cpp b/xbmc/threads/platform/linux/ThreadSchedImpl.cpp similarity index 100% rename from src/threads/platform/linux/ThreadSchedImpl.cpp rename to xbmc/threads/platform/linux/ThreadSchedImpl.cpp diff --git a/src/threads/platform/pthreads/Condition.h b/xbmc/threads/platform/pthreads/Condition.h similarity index 100% rename from src/threads/platform/pthreads/Condition.h rename to xbmc/threads/platform/pthreads/Condition.h diff --git a/src/threads/platform/pthreads/CriticalSection.h b/xbmc/threads/platform/pthreads/CriticalSection.h similarity index 100% rename from src/threads/platform/pthreads/CriticalSection.h rename to xbmc/threads/platform/pthreads/CriticalSection.h diff --git a/src/threads/platform/pthreads/Implementation.cpp b/xbmc/threads/platform/pthreads/Implementation.cpp similarity index 100% rename from src/threads/platform/pthreads/Implementation.cpp rename to xbmc/threads/platform/pthreads/Implementation.cpp diff --git a/src/threads/platform/pthreads/ThreadImpl.cpp b/xbmc/threads/platform/pthreads/ThreadImpl.cpp similarity index 100% rename from src/threads/platform/pthreads/ThreadImpl.cpp rename to xbmc/threads/platform/pthreads/ThreadImpl.cpp diff --git a/src/threads/platform/pthreads/ThreadImpl.h b/xbmc/threads/platform/pthreads/ThreadImpl.h similarity index 100% rename from src/threads/platform/pthreads/ThreadImpl.h rename to xbmc/threads/platform/pthreads/ThreadImpl.h diff --git a/src/threads/platform/pthreads/ThreadLocal.h b/xbmc/threads/platform/pthreads/ThreadLocal.h similarity index 100% rename from src/threads/platform/pthreads/ThreadLocal.h rename to xbmc/threads/platform/pthreads/ThreadLocal.h diff --git a/src/threads/platform/win/Condition.h b/xbmc/threads/platform/win/Condition.h similarity index 100% rename from src/threads/platform/win/Condition.h rename to xbmc/threads/platform/win/Condition.h diff --git a/src/threads/platform/win/CriticalSection.h b/xbmc/threads/platform/win/CriticalSection.h similarity index 100% rename from src/threads/platform/win/CriticalSection.h rename to xbmc/threads/platform/win/CriticalSection.h diff --git a/src/threads/platform/win/ThreadImpl.cpp b/xbmc/threads/platform/win/ThreadImpl.cpp similarity index 100% rename from src/threads/platform/win/ThreadImpl.cpp rename to xbmc/threads/platform/win/ThreadImpl.cpp diff --git a/src/threads/platform/win/ThreadImpl.h b/xbmc/threads/platform/win/ThreadImpl.h similarity index 100% rename from src/threads/platform/win/ThreadImpl.h rename to xbmc/threads/platform/win/ThreadImpl.h diff --git a/src/threads/platform/win/ThreadLocal.h b/xbmc/threads/platform/win/ThreadLocal.h similarity index 100% rename from src/threads/platform/win/ThreadLocal.h rename to xbmc/threads/platform/win/ThreadLocal.h diff --git a/src/threads/platform/win/Win32Exception.cpp b/xbmc/threads/platform/win/Win32Exception.cpp similarity index 100% rename from src/threads/platform/win/Win32Exception.cpp rename to xbmc/threads/platform/win/Win32Exception.cpp diff --git a/src/threads/platform/win/Win32Exception.h b/xbmc/threads/platform/win/Win32Exception.h similarity index 100% rename from src/threads/platform/win/Win32Exception.h rename to xbmc/threads/platform/win/Win32Exception.h diff --git a/src/threads/test/Makefile b/xbmc/threads/test/Makefile similarity index 100% rename from src/threads/test/Makefile rename to xbmc/threads/test/Makefile diff --git a/src/threads/test/TestAtomics.cpp b/xbmc/threads/test/TestAtomics.cpp similarity index 100% rename from src/threads/test/TestAtomics.cpp rename to xbmc/threads/test/TestAtomics.cpp diff --git a/src/threads/test/TestEvent.cpp b/xbmc/threads/test/TestEvent.cpp similarity index 100% rename from src/threads/test/TestEvent.cpp rename to xbmc/threads/test/TestEvent.cpp diff --git a/src/threads/test/TestHelpers.h b/xbmc/threads/test/TestHelpers.h similarity index 100% rename from src/threads/test/TestHelpers.h rename to xbmc/threads/test/TestHelpers.h diff --git a/src/threads/test/TestSharedSection.cpp b/xbmc/threads/test/TestSharedSection.cpp similarity index 100% rename from src/threads/test/TestSharedSection.cpp rename to xbmc/threads/test/TestSharedSection.cpp diff --git a/src/threads/test/TestThreadLocal.cpp b/xbmc/threads/test/TestThreadLocal.cpp similarity index 100% rename from src/threads/test/TestThreadLocal.cpp rename to xbmc/threads/test/TestThreadLocal.cpp diff --git a/src/utils/AMLUtils.cpp b/xbmc/utils/AMLUtils.cpp similarity index 100% rename from src/utils/AMLUtils.cpp rename to xbmc/utils/AMLUtils.cpp diff --git a/src/utils/AMLUtils.h b/xbmc/utils/AMLUtils.h similarity index 100% rename from src/utils/AMLUtils.h rename to xbmc/utils/AMLUtils.h diff --git a/src/utils/ActorProtocol.cpp b/xbmc/utils/ActorProtocol.cpp similarity index 100% rename from src/utils/ActorProtocol.cpp rename to xbmc/utils/ActorProtocol.cpp diff --git a/src/utils/ActorProtocol.h b/xbmc/utils/ActorProtocol.h similarity index 100% rename from src/utils/ActorProtocol.h rename to xbmc/utils/ActorProtocol.h diff --git a/src/utils/AlarmClock.cpp b/xbmc/utils/AlarmClock.cpp similarity index 100% rename from src/utils/AlarmClock.cpp rename to xbmc/utils/AlarmClock.cpp diff --git a/src/utils/AlarmClock.h b/xbmc/utils/AlarmClock.h similarity index 100% rename from src/utils/AlarmClock.h rename to xbmc/utils/AlarmClock.h diff --git a/src/utils/AliasShortcutUtils.cpp b/xbmc/utils/AliasShortcutUtils.cpp similarity index 100% rename from src/utils/AliasShortcutUtils.cpp rename to xbmc/utils/AliasShortcutUtils.cpp diff --git a/src/utils/AliasShortcutUtils.h b/xbmc/utils/AliasShortcutUtils.h similarity index 100% rename from src/utils/AliasShortcutUtils.h rename to xbmc/utils/AliasShortcutUtils.h diff --git a/src/utils/Archive.cpp b/xbmc/utils/Archive.cpp similarity index 100% rename from src/utils/Archive.cpp rename to xbmc/utils/Archive.cpp diff --git a/src/utils/Archive.h b/xbmc/utils/Archive.h similarity index 100% rename from src/utils/Archive.h rename to xbmc/utils/Archive.h diff --git a/src/utils/AsyncFileCopy.cpp b/xbmc/utils/AsyncFileCopy.cpp similarity index 100% rename from src/utils/AsyncFileCopy.cpp rename to xbmc/utils/AsyncFileCopy.cpp diff --git a/src/utils/AsyncFileCopy.h b/xbmc/utils/AsyncFileCopy.h similarity index 100% rename from src/utils/AsyncFileCopy.h rename to xbmc/utils/AsyncFileCopy.h diff --git a/src/utils/AutoPtrHandle.cpp b/xbmc/utils/AutoPtrHandle.cpp similarity index 100% rename from src/utils/AutoPtrHandle.cpp rename to xbmc/utils/AutoPtrHandle.cpp diff --git a/src/utils/AutoPtrHandle.h b/xbmc/utils/AutoPtrHandle.h similarity index 100% rename from src/utils/AutoPtrHandle.h rename to xbmc/utils/AutoPtrHandle.h diff --git a/src/utils/Base64.cpp b/xbmc/utils/Base64.cpp similarity index 100% rename from src/utils/Base64.cpp rename to xbmc/utils/Base64.cpp diff --git a/src/utils/Base64.h b/xbmc/utils/Base64.h similarity index 100% rename from src/utils/Base64.h rename to xbmc/utils/Base64.h diff --git a/src/utils/BitstreamConverter.cpp b/xbmc/utils/BitstreamConverter.cpp similarity index 100% rename from src/utils/BitstreamConverter.cpp rename to xbmc/utils/BitstreamConverter.cpp diff --git a/src/utils/BitstreamConverter.h b/xbmc/utils/BitstreamConverter.h similarity index 100% rename from src/utils/BitstreamConverter.h rename to xbmc/utils/BitstreamConverter.h diff --git a/src/utils/BitstreamStats.cpp b/xbmc/utils/BitstreamStats.cpp similarity index 100% rename from src/utils/BitstreamStats.cpp rename to xbmc/utils/BitstreamStats.cpp diff --git a/src/utils/BitstreamStats.h b/xbmc/utils/BitstreamStats.h similarity index 100% rename from src/utils/BitstreamStats.h rename to xbmc/utils/BitstreamStats.h diff --git a/src/utils/BooleanLogic.cpp b/xbmc/utils/BooleanLogic.cpp similarity index 100% rename from src/utils/BooleanLogic.cpp rename to xbmc/utils/BooleanLogic.cpp diff --git a/src/utils/BooleanLogic.h b/xbmc/utils/BooleanLogic.h similarity index 100% rename from src/utils/BooleanLogic.h rename to xbmc/utils/BooleanLogic.h diff --git a/src/utils/CPUInfo.cpp b/xbmc/utils/CPUInfo.cpp similarity index 100% rename from src/utils/CPUInfo.cpp rename to xbmc/utils/CPUInfo.cpp diff --git a/src/utils/CPUInfo.h b/xbmc/utils/CPUInfo.h similarity index 100% rename from src/utils/CPUInfo.h rename to xbmc/utils/CPUInfo.h diff --git a/src/utils/CharsetConverter.cpp b/xbmc/utils/CharsetConverter.cpp similarity index 100% rename from src/utils/CharsetConverter.cpp rename to xbmc/utils/CharsetConverter.cpp diff --git a/src/utils/CharsetConverter.h b/xbmc/utils/CharsetConverter.h similarity index 100% rename from src/utils/CharsetConverter.h rename to xbmc/utils/CharsetConverter.h diff --git a/src/utils/CharsetDetection.cpp b/xbmc/utils/CharsetDetection.cpp similarity index 100% rename from src/utils/CharsetDetection.cpp rename to xbmc/utils/CharsetDetection.cpp diff --git a/src/utils/CharsetDetection.h b/xbmc/utils/CharsetDetection.h similarity index 100% rename from src/utils/CharsetDetection.h rename to xbmc/utils/CharsetDetection.h diff --git a/src/utils/Crc32.cpp b/xbmc/utils/Crc32.cpp similarity index 100% rename from src/utils/Crc32.cpp rename to xbmc/utils/Crc32.cpp diff --git a/src/utils/Crc32.h b/xbmc/utils/Crc32.h similarity index 100% rename from src/utils/Crc32.h rename to xbmc/utils/Crc32.h diff --git a/src/utils/CryptThreading.cpp b/xbmc/utils/CryptThreading.cpp similarity index 100% rename from src/utils/CryptThreading.cpp rename to xbmc/utils/CryptThreading.cpp diff --git a/src/utils/CryptThreading.h b/xbmc/utils/CryptThreading.h similarity index 100% rename from src/utils/CryptThreading.h rename to xbmc/utils/CryptThreading.h diff --git a/src/utils/DatabaseUtils.cpp b/xbmc/utils/DatabaseUtils.cpp similarity index 100% rename from src/utils/DatabaseUtils.cpp rename to xbmc/utils/DatabaseUtils.cpp diff --git a/src/utils/DatabaseUtils.h b/xbmc/utils/DatabaseUtils.h similarity index 100% rename from src/utils/DatabaseUtils.h rename to xbmc/utils/DatabaseUtils.h diff --git a/src/utils/EdenVideoArtUpdater.cpp b/xbmc/utils/EdenVideoArtUpdater.cpp similarity index 100% rename from src/utils/EdenVideoArtUpdater.cpp rename to xbmc/utils/EdenVideoArtUpdater.cpp diff --git a/src/utils/EdenVideoArtUpdater.h b/xbmc/utils/EdenVideoArtUpdater.h similarity index 100% rename from src/utils/EdenVideoArtUpdater.h rename to xbmc/utils/EdenVideoArtUpdater.h diff --git a/src/utils/EndianSwap.cpp b/xbmc/utils/EndianSwap.cpp similarity index 100% rename from src/utils/EndianSwap.cpp rename to xbmc/utils/EndianSwap.cpp diff --git a/src/utils/EndianSwap.h b/xbmc/utils/EndianSwap.h similarity index 100% rename from src/utils/EndianSwap.h rename to xbmc/utils/EndianSwap.h diff --git a/src/utils/Environment.cpp b/xbmc/utils/Environment.cpp similarity index 100% rename from src/utils/Environment.cpp rename to xbmc/utils/Environment.cpp diff --git a/src/utils/Environment.h b/xbmc/utils/Environment.h similarity index 100% rename from src/utils/Environment.h rename to xbmc/utils/Environment.h diff --git a/src/utils/Fanart.cpp b/xbmc/utils/Fanart.cpp similarity index 100% rename from src/utils/Fanart.cpp rename to xbmc/utils/Fanart.cpp diff --git a/src/utils/Fanart.h b/xbmc/utils/Fanart.h similarity index 100% rename from src/utils/Fanart.h rename to xbmc/utils/Fanart.h diff --git a/src/utils/FileOperationJob.cpp b/xbmc/utils/FileOperationJob.cpp similarity index 100% rename from src/utils/FileOperationJob.cpp rename to xbmc/utils/FileOperationJob.cpp diff --git a/src/utils/FileOperationJob.h b/xbmc/utils/FileOperationJob.h similarity index 100% rename from src/utils/FileOperationJob.h rename to xbmc/utils/FileOperationJob.h diff --git a/src/utils/FileUtils.cpp b/xbmc/utils/FileUtils.cpp similarity index 100% rename from src/utils/FileUtils.cpp rename to xbmc/utils/FileUtils.cpp diff --git a/src/utils/FileUtils.h b/xbmc/utils/FileUtils.h similarity index 100% rename from src/utils/FileUtils.h rename to xbmc/utils/FileUtils.h diff --git a/src/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp similarity index 100% rename from src/utils/GLUtils.cpp rename to xbmc/utils/GLUtils.cpp diff --git a/src/utils/GLUtils.h b/xbmc/utils/GLUtils.h similarity index 100% rename from src/utils/GLUtils.h rename to xbmc/utils/GLUtils.h diff --git a/src/utils/GlobalsHandling.h b/xbmc/utils/GlobalsHandling.h similarity index 100% rename from src/utils/GlobalsHandling.h rename to xbmc/utils/GlobalsHandling.h diff --git a/src/utils/GroupUtils.cpp b/xbmc/utils/GroupUtils.cpp similarity index 100% rename from src/utils/GroupUtils.cpp rename to xbmc/utils/GroupUtils.cpp diff --git a/src/utils/GroupUtils.h b/xbmc/utils/GroupUtils.h similarity index 100% rename from src/utils/GroupUtils.h rename to xbmc/utils/GroupUtils.h diff --git a/src/utils/HTMLTable.cpp b/xbmc/utils/HTMLTable.cpp similarity index 100% rename from src/utils/HTMLTable.cpp rename to xbmc/utils/HTMLTable.cpp diff --git a/src/utils/HTMLTable.h b/xbmc/utils/HTMLTable.h similarity index 100% rename from src/utils/HTMLTable.h rename to xbmc/utils/HTMLTable.h diff --git a/src/utils/HTMLUtil.cpp b/xbmc/utils/HTMLUtil.cpp similarity index 100% rename from src/utils/HTMLUtil.cpp rename to xbmc/utils/HTMLUtil.cpp diff --git a/src/utils/HTMLUtil.h b/xbmc/utils/HTMLUtil.h similarity index 100% rename from src/utils/HTMLUtil.h rename to xbmc/utils/HTMLUtil.h diff --git a/src/utils/HttpHeader.cpp b/xbmc/utils/HttpHeader.cpp similarity index 100% rename from src/utils/HttpHeader.cpp rename to xbmc/utils/HttpHeader.cpp diff --git a/src/utils/HttpHeader.h b/xbmc/utils/HttpHeader.h similarity index 100% rename from src/utils/HttpHeader.h rename to xbmc/utils/HttpHeader.h diff --git a/src/utils/HttpParser.cpp b/xbmc/utils/HttpParser.cpp similarity index 100% rename from src/utils/HttpParser.cpp rename to xbmc/utils/HttpParser.cpp diff --git a/src/utils/HttpParser.h b/xbmc/utils/HttpParser.h similarity index 100% rename from src/utils/HttpParser.h rename to xbmc/utils/HttpParser.h diff --git a/src/utils/HttpResponse.cpp b/xbmc/utils/HttpResponse.cpp similarity index 100% rename from src/utils/HttpResponse.cpp rename to xbmc/utils/HttpResponse.cpp diff --git a/src/utils/HttpResponse.h b/xbmc/utils/HttpResponse.h similarity index 100% rename from src/utils/HttpResponse.h rename to xbmc/utils/HttpResponse.h diff --git a/src/utils/IArchivable.h b/xbmc/utils/IArchivable.h similarity index 100% rename from src/utils/IArchivable.h rename to xbmc/utils/IArchivable.h diff --git a/src/utils/IRssObserver.h b/xbmc/utils/IRssObserver.h similarity index 100% rename from src/utils/IRssObserver.h rename to xbmc/utils/IRssObserver.h diff --git a/src/utils/ISerializable.h b/xbmc/utils/ISerializable.h similarity index 100% rename from src/utils/ISerializable.h rename to xbmc/utils/ISerializable.h diff --git a/src/utils/ISortable.h b/xbmc/utils/ISortable.h similarity index 100% rename from src/utils/ISortable.h rename to xbmc/utils/ISortable.h diff --git a/src/utils/IXmlDeserializable.h b/xbmc/utils/IXmlDeserializable.h similarity index 100% rename from src/utils/IXmlDeserializable.h rename to xbmc/utils/IXmlDeserializable.h diff --git a/src/utils/InfoLoader.cpp b/xbmc/utils/InfoLoader.cpp similarity index 100% rename from src/utils/InfoLoader.cpp rename to xbmc/utils/InfoLoader.cpp diff --git a/src/utils/InfoLoader.h b/xbmc/utils/InfoLoader.h similarity index 100% rename from src/utils/InfoLoader.h rename to xbmc/utils/InfoLoader.h diff --git a/src/utils/JSONVariantParser.cpp b/xbmc/utils/JSONVariantParser.cpp similarity index 100% rename from src/utils/JSONVariantParser.cpp rename to xbmc/utils/JSONVariantParser.cpp diff --git a/src/utils/JSONVariantParser.h b/xbmc/utils/JSONVariantParser.h similarity index 100% rename from src/utils/JSONVariantParser.h rename to xbmc/utils/JSONVariantParser.h diff --git a/src/utils/JSONVariantWriter.cpp b/xbmc/utils/JSONVariantWriter.cpp similarity index 100% rename from src/utils/JSONVariantWriter.cpp rename to xbmc/utils/JSONVariantWriter.cpp diff --git a/src/utils/JSONVariantWriter.h b/xbmc/utils/JSONVariantWriter.h similarity index 100% rename from src/utils/JSONVariantWriter.h rename to xbmc/utils/JSONVariantWriter.h diff --git a/src/utils/Job.h b/xbmc/utils/Job.h similarity index 100% rename from src/utils/Job.h rename to xbmc/utils/Job.h diff --git a/src/utils/JobManager.cpp b/xbmc/utils/JobManager.cpp similarity index 100% rename from src/utils/JobManager.cpp rename to xbmc/utils/JobManager.cpp diff --git a/src/utils/JobManager.h b/xbmc/utils/JobManager.h similarity index 100% rename from src/utils/JobManager.h rename to xbmc/utils/JobManager.h diff --git a/src/utils/LabelFormatter.cpp b/xbmc/utils/LabelFormatter.cpp similarity index 100% rename from src/utils/LabelFormatter.cpp rename to xbmc/utils/LabelFormatter.cpp diff --git a/src/utils/LabelFormatter.h b/xbmc/utils/LabelFormatter.h similarity index 100% rename from src/utils/LabelFormatter.h rename to xbmc/utils/LabelFormatter.h diff --git a/src/utils/LangCodeExpander.cpp b/xbmc/utils/LangCodeExpander.cpp similarity index 100% rename from src/utils/LangCodeExpander.cpp rename to xbmc/utils/LangCodeExpander.cpp diff --git a/src/utils/LangCodeExpander.h b/xbmc/utils/LangCodeExpander.h similarity index 100% rename from src/utils/LangCodeExpander.h rename to xbmc/utils/LangCodeExpander.h diff --git a/src/utils/LegacyPathTranslation.cpp b/xbmc/utils/LegacyPathTranslation.cpp similarity index 100% rename from src/utils/LegacyPathTranslation.cpp rename to xbmc/utils/LegacyPathTranslation.cpp diff --git a/src/utils/LegacyPathTranslation.h b/xbmc/utils/LegacyPathTranslation.h similarity index 100% rename from src/utils/LegacyPathTranslation.h rename to xbmc/utils/LegacyPathTranslation.h diff --git a/src/utils/Makefile.in b/xbmc/utils/Makefile.in similarity index 100% rename from src/utils/Makefile.in rename to xbmc/utils/Makefile.in diff --git a/src/utils/MarkWatchedJob.cpp b/xbmc/utils/MarkWatchedJob.cpp similarity index 100% rename from src/utils/MarkWatchedJob.cpp rename to xbmc/utils/MarkWatchedJob.cpp diff --git a/src/utils/MarkWatchedJob.h b/xbmc/utils/MarkWatchedJob.h similarity index 100% rename from src/utils/MarkWatchedJob.h rename to xbmc/utils/MarkWatchedJob.h diff --git a/src/utils/MathUtils.h b/xbmc/utils/MathUtils.h similarity index 100% rename from src/utils/MathUtils.h rename to xbmc/utils/MathUtils.h diff --git a/src/utils/Mime.cpp b/xbmc/utils/Mime.cpp similarity index 100% rename from src/utils/Mime.cpp rename to xbmc/utils/Mime.cpp diff --git a/src/utils/Mime.h b/xbmc/utils/Mime.h similarity index 100% rename from src/utils/Mime.h rename to xbmc/utils/Mime.h diff --git a/src/utils/Observer.cpp b/xbmc/utils/Observer.cpp similarity index 100% rename from src/utils/Observer.cpp rename to xbmc/utils/Observer.cpp diff --git a/src/utils/Observer.h b/xbmc/utils/Observer.h similarity index 100% rename from src/utils/Observer.h rename to xbmc/utils/Observer.h diff --git a/src/utils/POUtils.cpp b/xbmc/utils/POUtils.cpp similarity index 100% rename from src/utils/POUtils.cpp rename to xbmc/utils/POUtils.cpp diff --git a/src/utils/POUtils.h b/xbmc/utils/POUtils.h similarity index 100% rename from src/utils/POUtils.h rename to xbmc/utils/POUtils.h diff --git a/src/utils/PerformanceSample.cpp b/xbmc/utils/PerformanceSample.cpp similarity index 100% rename from src/utils/PerformanceSample.cpp rename to xbmc/utils/PerformanceSample.cpp diff --git a/src/utils/PerformanceSample.h b/xbmc/utils/PerformanceSample.h similarity index 100% rename from src/utils/PerformanceSample.h rename to xbmc/utils/PerformanceSample.h diff --git a/src/utils/PerformanceStats.cpp b/xbmc/utils/PerformanceStats.cpp similarity index 100% rename from src/utils/PerformanceStats.cpp rename to xbmc/utils/PerformanceStats.cpp diff --git a/src/utils/PerformanceStats.h b/xbmc/utils/PerformanceStats.h similarity index 100% rename from src/utils/PerformanceStats.h rename to xbmc/utils/PerformanceStats.h diff --git a/src/utils/RecentlyAddedJob.cpp b/xbmc/utils/RecentlyAddedJob.cpp similarity index 100% rename from src/utils/RecentlyAddedJob.cpp rename to xbmc/utils/RecentlyAddedJob.cpp diff --git a/src/utils/RecentlyAddedJob.h b/xbmc/utils/RecentlyAddedJob.h similarity index 100% rename from src/utils/RecentlyAddedJob.h rename to xbmc/utils/RecentlyAddedJob.h diff --git a/src/utils/RegExp.cpp b/xbmc/utils/RegExp.cpp similarity index 100% rename from src/utils/RegExp.cpp rename to xbmc/utils/RegExp.cpp diff --git a/src/utils/RegExp.h b/xbmc/utils/RegExp.h similarity index 100% rename from src/utils/RegExp.h rename to xbmc/utils/RegExp.h diff --git a/src/utils/RingBuffer.cpp b/xbmc/utils/RingBuffer.cpp similarity index 100% rename from src/utils/RingBuffer.cpp rename to xbmc/utils/RingBuffer.cpp diff --git a/src/utils/RingBuffer.h b/xbmc/utils/RingBuffer.h similarity index 100% rename from src/utils/RingBuffer.h rename to xbmc/utils/RingBuffer.h diff --git a/src/utils/RssManager.cpp b/xbmc/utils/RssManager.cpp similarity index 100% rename from src/utils/RssManager.cpp rename to xbmc/utils/RssManager.cpp diff --git a/src/utils/RssManager.h b/xbmc/utils/RssManager.h similarity index 100% rename from src/utils/RssManager.h rename to xbmc/utils/RssManager.h diff --git a/src/utils/RssReader.cpp b/xbmc/utils/RssReader.cpp similarity index 100% rename from src/utils/RssReader.cpp rename to xbmc/utils/RssReader.cpp diff --git a/src/utils/RssReader.h b/xbmc/utils/RssReader.h similarity index 100% rename from src/utils/RssReader.h rename to xbmc/utils/RssReader.h diff --git a/src/utils/SaveFileStateJob.cpp b/xbmc/utils/SaveFileStateJob.cpp similarity index 100% rename from src/utils/SaveFileStateJob.cpp rename to xbmc/utils/SaveFileStateJob.cpp diff --git a/src/utils/SaveFileStateJob.h b/xbmc/utils/SaveFileStateJob.h similarity index 100% rename from src/utils/SaveFileStateJob.h rename to xbmc/utils/SaveFileStateJob.h diff --git a/src/utils/ScraperParser.cpp b/xbmc/utils/ScraperParser.cpp similarity index 100% rename from src/utils/ScraperParser.cpp rename to xbmc/utils/ScraperParser.cpp diff --git a/src/utils/ScraperParser.h b/xbmc/utils/ScraperParser.h similarity index 100% rename from src/utils/ScraperParser.h rename to xbmc/utils/ScraperParser.h diff --git a/src/utils/ScraperUrl.cpp b/xbmc/utils/ScraperUrl.cpp similarity index 100% rename from src/utils/ScraperUrl.cpp rename to xbmc/utils/ScraperUrl.cpp diff --git a/src/utils/ScraperUrl.h b/xbmc/utils/ScraperUrl.h similarity index 100% rename from src/utils/ScraperUrl.h rename to xbmc/utils/ScraperUrl.h diff --git a/src/utils/Screenshot.cpp b/xbmc/utils/Screenshot.cpp similarity index 100% rename from src/utils/Screenshot.cpp rename to xbmc/utils/Screenshot.cpp diff --git a/src/utils/Screenshot.h b/xbmc/utils/Screenshot.h similarity index 100% rename from src/utils/Screenshot.h rename to xbmc/utils/Screenshot.h diff --git a/src/utils/SeekHandler.cpp b/xbmc/utils/SeekHandler.cpp similarity index 100% rename from src/utils/SeekHandler.cpp rename to xbmc/utils/SeekHandler.cpp diff --git a/src/utils/SeekHandler.h b/xbmc/utils/SeekHandler.h similarity index 100% rename from src/utils/SeekHandler.h rename to xbmc/utils/SeekHandler.h diff --git a/src/utils/SortUtils.cpp b/xbmc/utils/SortUtils.cpp similarity index 100% rename from src/utils/SortUtils.cpp rename to xbmc/utils/SortUtils.cpp diff --git a/src/utils/SortUtils.h b/xbmc/utils/SortUtils.h similarity index 100% rename from src/utils/SortUtils.h rename to xbmc/utils/SortUtils.h diff --git a/src/utils/Splash.cpp b/xbmc/utils/Splash.cpp similarity index 100% rename from src/utils/Splash.cpp rename to xbmc/utils/Splash.cpp diff --git a/src/utils/Splash.h b/xbmc/utils/Splash.h similarity index 100% rename from src/utils/Splash.h rename to xbmc/utils/Splash.h diff --git a/src/utils/StdString.h b/xbmc/utils/StdString.h similarity index 100% rename from src/utils/StdString.h rename to xbmc/utils/StdString.h diff --git a/src/utils/Stopwatch.cpp b/xbmc/utils/Stopwatch.cpp similarity index 100% rename from src/utils/Stopwatch.cpp rename to xbmc/utils/Stopwatch.cpp diff --git a/src/utils/Stopwatch.h b/xbmc/utils/Stopwatch.h similarity index 100% rename from src/utils/Stopwatch.h rename to xbmc/utils/Stopwatch.h diff --git a/src/utils/StreamDetails.cpp b/xbmc/utils/StreamDetails.cpp similarity index 100% rename from src/utils/StreamDetails.cpp rename to xbmc/utils/StreamDetails.cpp diff --git a/src/utils/StreamDetails.h b/xbmc/utils/StreamDetails.h similarity index 100% rename from src/utils/StreamDetails.h rename to xbmc/utils/StreamDetails.h diff --git a/src/utils/StreamUtils.cpp b/xbmc/utils/StreamUtils.cpp similarity index 100% rename from src/utils/StreamUtils.cpp rename to xbmc/utils/StreamUtils.cpp diff --git a/src/utils/StreamUtils.h b/xbmc/utils/StreamUtils.h similarity index 100% rename from src/utils/StreamUtils.h rename to xbmc/utils/StreamUtils.h diff --git a/src/utils/StringUtils.cpp b/xbmc/utils/StringUtils.cpp similarity index 100% rename from src/utils/StringUtils.cpp rename to xbmc/utils/StringUtils.cpp diff --git a/src/utils/StringUtils.h b/xbmc/utils/StringUtils.h similarity index 100% rename from src/utils/StringUtils.h rename to xbmc/utils/StringUtils.h diff --git a/src/utils/StringValidation.cpp b/xbmc/utils/StringValidation.cpp similarity index 100% rename from src/utils/StringValidation.cpp rename to xbmc/utils/StringValidation.cpp diff --git a/src/utils/StringValidation.h b/xbmc/utils/StringValidation.h similarity index 100% rename from src/utils/StringValidation.h rename to xbmc/utils/StringValidation.h diff --git a/src/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp similarity index 100% rename from src/utils/SystemInfo.cpp rename to xbmc/utils/SystemInfo.cpp diff --git a/src/utils/SystemInfo.h b/xbmc/utils/SystemInfo.h similarity index 100% rename from src/utils/SystemInfo.h rename to xbmc/utils/SystemInfo.h diff --git a/src/utils/TextSearch.cpp b/xbmc/utils/TextSearch.cpp similarity index 100% rename from src/utils/TextSearch.cpp rename to xbmc/utils/TextSearch.cpp diff --git a/src/utils/TextSearch.h b/xbmc/utils/TextSearch.h similarity index 100% rename from src/utils/TextSearch.h rename to xbmc/utils/TextSearch.h diff --git a/src/utils/TimeSmoother.cpp b/xbmc/utils/TimeSmoother.cpp similarity index 100% rename from src/utils/TimeSmoother.cpp rename to xbmc/utils/TimeSmoother.cpp diff --git a/src/utils/TimeSmoother.h b/xbmc/utils/TimeSmoother.h similarity index 100% rename from src/utils/TimeSmoother.h rename to xbmc/utils/TimeSmoother.h diff --git a/src/utils/TimeUtils.cpp b/xbmc/utils/TimeUtils.cpp similarity index 100% rename from src/utils/TimeUtils.cpp rename to xbmc/utils/TimeUtils.cpp diff --git a/src/utils/TimeUtils.h b/xbmc/utils/TimeUtils.h similarity index 100% rename from src/utils/TimeUtils.h rename to xbmc/utils/TimeUtils.h diff --git a/src/utils/TuxBoxUtil.cpp b/xbmc/utils/TuxBoxUtil.cpp similarity index 100% rename from src/utils/TuxBoxUtil.cpp rename to xbmc/utils/TuxBoxUtil.cpp diff --git a/src/utils/TuxBoxUtil.h b/xbmc/utils/TuxBoxUtil.h similarity index 100% rename from src/utils/TuxBoxUtil.h rename to xbmc/utils/TuxBoxUtil.h diff --git a/src/utils/URIUtils.cpp b/xbmc/utils/URIUtils.cpp similarity index 100% rename from src/utils/URIUtils.cpp rename to xbmc/utils/URIUtils.cpp diff --git a/src/utils/URIUtils.h b/xbmc/utils/URIUtils.h similarity index 100% rename from src/utils/URIUtils.h rename to xbmc/utils/URIUtils.h diff --git a/src/utils/UrlOptions.cpp b/xbmc/utils/UrlOptions.cpp similarity index 100% rename from src/utils/UrlOptions.cpp rename to xbmc/utils/UrlOptions.cpp diff --git a/src/utils/UrlOptions.h b/xbmc/utils/UrlOptions.h similarity index 100% rename from src/utils/UrlOptions.h rename to xbmc/utils/UrlOptions.h diff --git a/src/utils/Utf8Utils.cpp b/xbmc/utils/Utf8Utils.cpp similarity index 100% rename from src/utils/Utf8Utils.cpp rename to xbmc/utils/Utf8Utils.cpp diff --git a/src/utils/Utf8Utils.h b/xbmc/utils/Utf8Utils.h similarity index 100% rename from src/utils/Utf8Utils.h rename to xbmc/utils/Utf8Utils.h diff --git a/src/utils/Variant.cpp b/xbmc/utils/Variant.cpp similarity index 100% rename from src/utils/Variant.cpp rename to xbmc/utils/Variant.cpp diff --git a/src/utils/Variant.h b/xbmc/utils/Variant.h similarity index 100% rename from src/utils/Variant.h rename to xbmc/utils/Variant.h diff --git a/src/utils/Vector.cpp b/xbmc/utils/Vector.cpp similarity index 100% rename from src/utils/Vector.cpp rename to xbmc/utils/Vector.cpp diff --git a/src/utils/Vector.h b/xbmc/utils/Vector.h similarity index 100% rename from src/utils/Vector.h rename to xbmc/utils/Vector.h diff --git a/src/utils/Weather.cpp b/xbmc/utils/Weather.cpp similarity index 100% rename from src/utils/Weather.cpp rename to xbmc/utils/Weather.cpp diff --git a/src/utils/Weather.h b/xbmc/utils/Weather.h similarity index 100% rename from src/utils/Weather.h rename to xbmc/utils/Weather.h diff --git a/src/utils/WindowsShortcut.cpp b/xbmc/utils/WindowsShortcut.cpp similarity index 100% rename from src/utils/WindowsShortcut.cpp rename to xbmc/utils/WindowsShortcut.cpp diff --git a/src/utils/WindowsShortcut.h b/xbmc/utils/WindowsShortcut.h similarity index 100% rename from src/utils/WindowsShortcut.h rename to xbmc/utils/WindowsShortcut.h diff --git a/src/utils/XBMCTinyXML.cpp b/xbmc/utils/XBMCTinyXML.cpp similarity index 100% rename from src/utils/XBMCTinyXML.cpp rename to xbmc/utils/XBMCTinyXML.cpp diff --git a/src/utils/XBMCTinyXML.h b/xbmc/utils/XBMCTinyXML.h similarity index 100% rename from src/utils/XBMCTinyXML.h rename to xbmc/utils/XBMCTinyXML.h diff --git a/src/utils/XMLUtils.cpp b/xbmc/utils/XMLUtils.cpp similarity index 100% rename from src/utils/XMLUtils.cpp rename to xbmc/utils/XMLUtils.cpp diff --git a/src/utils/XMLUtils.h b/xbmc/utils/XMLUtils.h similarity index 100% rename from src/utils/XMLUtils.h rename to xbmc/utils/XMLUtils.h diff --git a/src/utils/XSLTUtils.cpp b/xbmc/utils/XSLTUtils.cpp similarity index 100% rename from src/utils/XSLTUtils.cpp rename to xbmc/utils/XSLTUtils.cpp diff --git a/src/utils/XSLTUtils.h b/xbmc/utils/XSLTUtils.h similarity index 100% rename from src/utils/XSLTUtils.h rename to xbmc/utils/XSLTUtils.h diff --git a/src/utils/auto_buffer.cpp b/xbmc/utils/auto_buffer.cpp similarity index 100% rename from src/utils/auto_buffer.cpp rename to xbmc/utils/auto_buffer.cpp diff --git a/src/utils/auto_buffer.h b/xbmc/utils/auto_buffer.h similarity index 100% rename from src/utils/auto_buffer.h rename to xbmc/utils/auto_buffer.h diff --git a/src/utils/fastmemcpy-arm.S b/xbmc/utils/fastmemcpy-arm.S similarity index 100% rename from src/utils/fastmemcpy-arm.S rename to xbmc/utils/fastmemcpy-arm.S diff --git a/src/utils/fastmemcpy.c b/xbmc/utils/fastmemcpy.c similarity index 100% rename from src/utils/fastmemcpy.c rename to xbmc/utils/fastmemcpy.c diff --git a/src/utils/fastmemcpy.h b/xbmc/utils/fastmemcpy.h similarity index 100% rename from src/utils/fastmemcpy.h rename to xbmc/utils/fastmemcpy.h diff --git a/src/utils/fft.cpp b/xbmc/utils/fft.cpp similarity index 100% rename from src/utils/fft.cpp rename to xbmc/utils/fft.cpp diff --git a/src/utils/fft.h b/xbmc/utils/fft.h similarity index 100% rename from src/utils/fft.h rename to xbmc/utils/fft.h diff --git a/src/utils/fstrcmp.c b/xbmc/utils/fstrcmp.c similarity index 100% rename from src/utils/fstrcmp.c rename to xbmc/utils/fstrcmp.c diff --git a/src/utils/fstrcmp.h b/xbmc/utils/fstrcmp.h similarity index 100% rename from src/utils/fstrcmp.h rename to xbmc/utils/fstrcmp.h diff --git a/src/utils/log.cpp b/xbmc/utils/log.cpp similarity index 100% rename from src/utils/log.cpp rename to xbmc/utils/log.cpp diff --git a/src/utils/log.h b/xbmc/utils/log.h similarity index 100% rename from src/utils/log.h rename to xbmc/utils/log.h diff --git a/src/utils/md5.cpp b/xbmc/utils/md5.cpp similarity index 100% rename from src/utils/md5.cpp rename to xbmc/utils/md5.cpp diff --git a/src/utils/md5.h b/xbmc/utils/md5.h similarity index 100% rename from src/utils/md5.h rename to xbmc/utils/md5.h diff --git a/src/utils/params_check_macros.h b/xbmc/utils/params_check_macros.h similarity index 100% rename from src/utils/params_check_macros.h rename to xbmc/utils/params_check_macros.h diff --git a/src/utils/posix/PosixInterfaceForCLog.cpp b/xbmc/utils/posix/PosixInterfaceForCLog.cpp similarity index 100% rename from src/utils/posix/PosixInterfaceForCLog.cpp rename to xbmc/utils/posix/PosixInterfaceForCLog.cpp diff --git a/src/utils/posix/PosixInterfaceForCLog.h b/xbmc/utils/posix/PosixInterfaceForCLog.h similarity index 100% rename from src/utils/posix/PosixInterfaceForCLog.h rename to xbmc/utils/posix/PosixInterfaceForCLog.h diff --git a/src/utils/test/CXBMCTinyXML-test.xml b/xbmc/utils/test/CXBMCTinyXML-test.xml similarity index 100% rename from src/utils/test/CXBMCTinyXML-test.xml rename to xbmc/utils/test/CXBMCTinyXML-test.xml diff --git a/src/utils/test/Makefile b/xbmc/utils/test/Makefile similarity index 100% rename from src/utils/test/Makefile rename to xbmc/utils/test/Makefile diff --git a/src/utils/test/TestAlarmClock.cpp b/xbmc/utils/test/TestAlarmClock.cpp similarity index 100% rename from src/utils/test/TestAlarmClock.cpp rename to xbmc/utils/test/TestAlarmClock.cpp diff --git a/src/utils/test/TestAliasShortcutUtils.cpp b/xbmc/utils/test/TestAliasShortcutUtils.cpp similarity index 100% rename from src/utils/test/TestAliasShortcutUtils.cpp rename to xbmc/utils/test/TestAliasShortcutUtils.cpp diff --git a/src/utils/test/TestArchive.cpp b/xbmc/utils/test/TestArchive.cpp similarity index 100% rename from src/utils/test/TestArchive.cpp rename to xbmc/utils/test/TestArchive.cpp diff --git a/src/utils/test/TestAsyncFileCopy.cpp b/xbmc/utils/test/TestAsyncFileCopy.cpp similarity index 100% rename from src/utils/test/TestAsyncFileCopy.cpp rename to xbmc/utils/test/TestAsyncFileCopy.cpp diff --git a/src/utils/test/TestBase64.cpp b/xbmc/utils/test/TestBase64.cpp similarity index 100% rename from src/utils/test/TestBase64.cpp rename to xbmc/utils/test/TestBase64.cpp diff --git a/src/utils/test/TestBitstreamStats.cpp b/xbmc/utils/test/TestBitstreamStats.cpp similarity index 100% rename from src/utils/test/TestBitstreamStats.cpp rename to xbmc/utils/test/TestBitstreamStats.cpp diff --git a/src/utils/test/TestCPUInfo.cpp b/xbmc/utils/test/TestCPUInfo.cpp similarity index 100% rename from src/utils/test/TestCPUInfo.cpp rename to xbmc/utils/test/TestCPUInfo.cpp diff --git a/src/utils/test/TestCharsetConverter.cpp b/xbmc/utils/test/TestCharsetConverter.cpp similarity index 100% rename from src/utils/test/TestCharsetConverter.cpp rename to xbmc/utils/test/TestCharsetConverter.cpp diff --git a/src/utils/test/TestCrc32.cpp b/xbmc/utils/test/TestCrc32.cpp similarity index 100% rename from src/utils/test/TestCrc32.cpp rename to xbmc/utils/test/TestCrc32.cpp diff --git a/src/utils/test/TestCryptThreading.cpp b/xbmc/utils/test/TestCryptThreading.cpp similarity index 100% rename from src/utils/test/TestCryptThreading.cpp rename to xbmc/utils/test/TestCryptThreading.cpp diff --git a/src/utils/test/TestDatabaseUtils.cpp b/xbmc/utils/test/TestDatabaseUtils.cpp similarity index 100% rename from src/utils/test/TestDatabaseUtils.cpp rename to xbmc/utils/test/TestDatabaseUtils.cpp diff --git a/src/utils/test/TestEndianSwap.cpp b/xbmc/utils/test/TestEndianSwap.cpp similarity index 100% rename from src/utils/test/TestEndianSwap.cpp rename to xbmc/utils/test/TestEndianSwap.cpp diff --git a/src/utils/test/TestFileOperationJob.cpp b/xbmc/utils/test/TestFileOperationJob.cpp similarity index 100% rename from src/utils/test/TestFileOperationJob.cpp rename to xbmc/utils/test/TestFileOperationJob.cpp diff --git a/src/utils/test/TestFileUtils.cpp b/xbmc/utils/test/TestFileUtils.cpp similarity index 100% rename from src/utils/test/TestFileUtils.cpp rename to xbmc/utils/test/TestFileUtils.cpp diff --git a/src/utils/test/TestGlobalsHandling.cpp b/xbmc/utils/test/TestGlobalsHandling.cpp similarity index 100% rename from src/utils/test/TestGlobalsHandling.cpp rename to xbmc/utils/test/TestGlobalsHandling.cpp diff --git a/src/utils/test/TestGlobalsHandlingPattern1.h b/xbmc/utils/test/TestGlobalsHandlingPattern1.h similarity index 100% rename from src/utils/test/TestGlobalsHandlingPattern1.h rename to xbmc/utils/test/TestGlobalsHandlingPattern1.h diff --git a/src/utils/test/TestHTMLTable.cpp b/xbmc/utils/test/TestHTMLTable.cpp similarity index 100% rename from src/utils/test/TestHTMLTable.cpp rename to xbmc/utils/test/TestHTMLTable.cpp diff --git a/src/utils/test/TestHTMLUtil.cpp b/xbmc/utils/test/TestHTMLUtil.cpp similarity index 100% rename from src/utils/test/TestHTMLUtil.cpp rename to xbmc/utils/test/TestHTMLUtil.cpp diff --git a/src/utils/test/TestHttpHeader.cpp b/xbmc/utils/test/TestHttpHeader.cpp similarity index 100% rename from src/utils/test/TestHttpHeader.cpp rename to xbmc/utils/test/TestHttpHeader.cpp diff --git a/src/utils/test/TestHttpParser.cpp b/xbmc/utils/test/TestHttpParser.cpp similarity index 100% rename from src/utils/test/TestHttpParser.cpp rename to xbmc/utils/test/TestHttpParser.cpp diff --git a/src/utils/test/TestHttpResponse.cpp b/xbmc/utils/test/TestHttpResponse.cpp similarity index 100% rename from src/utils/test/TestHttpResponse.cpp rename to xbmc/utils/test/TestHttpResponse.cpp diff --git a/src/utils/test/TestJSONVariantParser.cpp b/xbmc/utils/test/TestJSONVariantParser.cpp similarity index 100% rename from src/utils/test/TestJSONVariantParser.cpp rename to xbmc/utils/test/TestJSONVariantParser.cpp diff --git a/src/utils/test/TestJSONVariantWriter.cpp b/xbmc/utils/test/TestJSONVariantWriter.cpp similarity index 100% rename from src/utils/test/TestJSONVariantWriter.cpp rename to xbmc/utils/test/TestJSONVariantWriter.cpp diff --git a/src/utils/test/TestJobManager.cpp b/xbmc/utils/test/TestJobManager.cpp similarity index 100% rename from src/utils/test/TestJobManager.cpp rename to xbmc/utils/test/TestJobManager.cpp diff --git a/src/utils/test/TestLabelFormatter.cpp b/xbmc/utils/test/TestLabelFormatter.cpp similarity index 100% rename from src/utils/test/TestLabelFormatter.cpp rename to xbmc/utils/test/TestLabelFormatter.cpp diff --git a/src/utils/test/TestLangCodeExpander.cpp b/xbmc/utils/test/TestLangCodeExpander.cpp similarity index 100% rename from src/utils/test/TestLangCodeExpander.cpp rename to xbmc/utils/test/TestLangCodeExpander.cpp diff --git a/src/utils/test/TestMathUtils.cpp b/xbmc/utils/test/TestMathUtils.cpp similarity index 100% rename from src/utils/test/TestMathUtils.cpp rename to xbmc/utils/test/TestMathUtils.cpp diff --git a/src/utils/test/TestMime.cpp b/xbmc/utils/test/TestMime.cpp similarity index 100% rename from src/utils/test/TestMime.cpp rename to xbmc/utils/test/TestMime.cpp diff --git a/src/utils/test/TestPOUtils.cpp b/xbmc/utils/test/TestPOUtils.cpp similarity index 100% rename from src/utils/test/TestPOUtils.cpp rename to xbmc/utils/test/TestPOUtils.cpp diff --git a/src/utils/test/TestPerformanceSample.cpp b/xbmc/utils/test/TestPerformanceSample.cpp similarity index 100% rename from src/utils/test/TestPerformanceSample.cpp rename to xbmc/utils/test/TestPerformanceSample.cpp diff --git a/src/utils/test/TestRegExp.cpp b/xbmc/utils/test/TestRegExp.cpp similarity index 100% rename from src/utils/test/TestRegExp.cpp rename to xbmc/utils/test/TestRegExp.cpp diff --git a/src/utils/test/TestRingBuffer.cpp b/xbmc/utils/test/TestRingBuffer.cpp similarity index 100% rename from src/utils/test/TestRingBuffer.cpp rename to xbmc/utils/test/TestRingBuffer.cpp diff --git a/src/utils/test/TestScraperParser.cpp b/xbmc/utils/test/TestScraperParser.cpp similarity index 100% rename from src/utils/test/TestScraperParser.cpp rename to xbmc/utils/test/TestScraperParser.cpp diff --git a/src/utils/test/TestScraperUrl.cpp b/xbmc/utils/test/TestScraperUrl.cpp similarity index 100% rename from src/utils/test/TestScraperUrl.cpp rename to xbmc/utils/test/TestScraperUrl.cpp diff --git a/src/utils/test/TestSortUtils.cpp b/xbmc/utils/test/TestSortUtils.cpp similarity index 100% rename from src/utils/test/TestSortUtils.cpp rename to xbmc/utils/test/TestSortUtils.cpp diff --git a/src/utils/test/TestStdString.cpp b/xbmc/utils/test/TestStdString.cpp similarity index 100% rename from src/utils/test/TestStdString.cpp rename to xbmc/utils/test/TestStdString.cpp diff --git a/src/utils/test/TestStopwatch.cpp b/xbmc/utils/test/TestStopwatch.cpp similarity index 100% rename from src/utils/test/TestStopwatch.cpp rename to xbmc/utils/test/TestStopwatch.cpp diff --git a/src/utils/test/TestStreamDetails.cpp b/xbmc/utils/test/TestStreamDetails.cpp similarity index 100% rename from src/utils/test/TestStreamDetails.cpp rename to xbmc/utils/test/TestStreamDetails.cpp diff --git a/src/utils/test/TestStreamUtils.cpp b/xbmc/utils/test/TestStreamUtils.cpp similarity index 100% rename from src/utils/test/TestStreamUtils.cpp rename to xbmc/utils/test/TestStreamUtils.cpp diff --git a/src/utils/test/TestStringUtils.cpp b/xbmc/utils/test/TestStringUtils.cpp similarity index 100% rename from src/utils/test/TestStringUtils.cpp rename to xbmc/utils/test/TestStringUtils.cpp diff --git a/src/utils/test/TestSystemInfo.cpp b/xbmc/utils/test/TestSystemInfo.cpp similarity index 100% rename from src/utils/test/TestSystemInfo.cpp rename to xbmc/utils/test/TestSystemInfo.cpp diff --git a/src/utils/test/TestTimeSmoother.cpp b/xbmc/utils/test/TestTimeSmoother.cpp similarity index 100% rename from src/utils/test/TestTimeSmoother.cpp rename to xbmc/utils/test/TestTimeSmoother.cpp diff --git a/src/utils/test/TestTimeUtils.cpp b/xbmc/utils/test/TestTimeUtils.cpp similarity index 100% rename from src/utils/test/TestTimeUtils.cpp rename to xbmc/utils/test/TestTimeUtils.cpp diff --git a/src/utils/test/TestURIUtils.cpp b/xbmc/utils/test/TestURIUtils.cpp similarity index 100% rename from src/utils/test/TestURIUtils.cpp rename to xbmc/utils/test/TestURIUtils.cpp diff --git a/src/utils/test/TestUrlOptions.cpp b/xbmc/utils/test/TestUrlOptions.cpp similarity index 100% rename from src/utils/test/TestUrlOptions.cpp rename to xbmc/utils/test/TestUrlOptions.cpp diff --git a/src/utils/test/TestVariant.cpp b/xbmc/utils/test/TestVariant.cpp similarity index 100% rename from src/utils/test/TestVariant.cpp rename to xbmc/utils/test/TestVariant.cpp diff --git a/src/utils/test/TestXBMCTinyXML.cpp b/xbmc/utils/test/TestXBMCTinyXML.cpp similarity index 100% rename from src/utils/test/TestXBMCTinyXML.cpp rename to xbmc/utils/test/TestXBMCTinyXML.cpp diff --git a/src/utils/test/TestXMLUtils.cpp b/xbmc/utils/test/TestXMLUtils.cpp similarity index 100% rename from src/utils/test/TestXMLUtils.cpp rename to xbmc/utils/test/TestXMLUtils.cpp diff --git a/src/utils/test/Testfastmemcpy.cpp b/xbmc/utils/test/Testfastmemcpy.cpp similarity index 100% rename from src/utils/test/Testfastmemcpy.cpp rename to xbmc/utils/test/Testfastmemcpy.cpp diff --git a/src/utils/test/Testfft.cpp b/xbmc/utils/test/Testfft.cpp similarity index 100% rename from src/utils/test/Testfft.cpp rename to xbmc/utils/test/Testfft.cpp diff --git a/src/utils/test/Testfstrcmp.cpp b/xbmc/utils/test/Testfstrcmp.cpp similarity index 100% rename from src/utils/test/Testfstrcmp.cpp rename to xbmc/utils/test/Testfstrcmp.cpp diff --git a/src/utils/test/Testlog.cpp b/xbmc/utils/test/Testlog.cpp similarity index 100% rename from src/utils/test/Testlog.cpp rename to xbmc/utils/test/Testlog.cpp diff --git a/src/utils/test/Testmd5.cpp b/xbmc/utils/test/Testmd5.cpp similarity index 100% rename from src/utils/test/Testmd5.cpp rename to xbmc/utils/test/Testmd5.cpp diff --git a/src/utils/uXstrings.h b/xbmc/utils/uXstrings.h similarity index 100% rename from src/utils/uXstrings.h rename to xbmc/utils/uXstrings.h diff --git a/src/utils/win32/Win32InterfaceForCLog.cpp b/xbmc/utils/win32/Win32InterfaceForCLog.cpp similarity index 100% rename from src/utils/win32/Win32InterfaceForCLog.cpp rename to xbmc/utils/win32/Win32InterfaceForCLog.cpp diff --git a/src/utils/win32/Win32InterfaceForCLog.h b/xbmc/utils/win32/Win32InterfaceForCLog.h similarity index 100% rename from src/utils/win32/Win32InterfaceForCLog.h rename to xbmc/utils/win32/Win32InterfaceForCLog.h diff --git a/src/utils/win32/Win32Log.cpp b/xbmc/utils/win32/Win32Log.cpp similarity index 100% rename from src/utils/win32/Win32Log.cpp rename to xbmc/utils/win32/Win32Log.cpp diff --git a/src/utils/win32/Win32Log.h b/xbmc/utils/win32/Win32Log.h similarity index 100% rename from src/utils/win32/Win32Log.h rename to xbmc/utils/win32/Win32Log.h diff --git a/src/video/Bookmark.cpp b/xbmc/video/Bookmark.cpp similarity index 100% rename from src/video/Bookmark.cpp rename to xbmc/video/Bookmark.cpp diff --git a/src/video/Bookmark.h b/xbmc/video/Bookmark.h similarity index 100% rename from src/video/Bookmark.h rename to xbmc/video/Bookmark.h diff --git a/src/video/Episode.h b/xbmc/video/Episode.h similarity index 100% rename from src/video/Episode.h rename to xbmc/video/Episode.h diff --git a/src/video/FFmpegVideoDecoder.cpp b/xbmc/video/FFmpegVideoDecoder.cpp similarity index 100% rename from src/video/FFmpegVideoDecoder.cpp rename to xbmc/video/FFmpegVideoDecoder.cpp diff --git a/src/video/FFmpegVideoDecoder.h b/xbmc/video/FFmpegVideoDecoder.h similarity index 100% rename from src/video/FFmpegVideoDecoder.h rename to xbmc/video/FFmpegVideoDecoder.h diff --git a/src/video/GUIViewStateVideo.cpp b/xbmc/video/GUIViewStateVideo.cpp similarity index 100% rename from src/video/GUIViewStateVideo.cpp rename to xbmc/video/GUIViewStateVideo.cpp diff --git a/src/video/GUIViewStateVideo.h b/xbmc/video/GUIViewStateVideo.h similarity index 100% rename from src/video/GUIViewStateVideo.h rename to xbmc/video/GUIViewStateVideo.h diff --git a/src/video/Makefile b/xbmc/video/Makefile similarity index 100% rename from src/video/Makefile rename to xbmc/video/Makefile diff --git a/src/video/PlayerController.cpp b/xbmc/video/PlayerController.cpp similarity index 100% rename from src/video/PlayerController.cpp rename to xbmc/video/PlayerController.cpp diff --git a/src/video/PlayerController.h b/xbmc/video/PlayerController.h similarity index 100% rename from src/video/PlayerController.h rename to xbmc/video/PlayerController.h diff --git a/src/video/Teletext.cpp b/xbmc/video/Teletext.cpp similarity index 100% rename from src/video/Teletext.cpp rename to xbmc/video/Teletext.cpp diff --git a/src/video/Teletext.h b/xbmc/video/Teletext.h similarity index 100% rename from src/video/Teletext.h rename to xbmc/video/Teletext.h diff --git a/src/video/TeletextDefines.h b/xbmc/video/TeletextDefines.h similarity index 100% rename from src/video/TeletextDefines.h rename to xbmc/video/TeletextDefines.h diff --git a/src/video/VideoDatabase.cpp b/xbmc/video/VideoDatabase.cpp similarity index 100% rename from src/video/VideoDatabase.cpp rename to xbmc/video/VideoDatabase.cpp diff --git a/src/video/VideoDatabase.h b/xbmc/video/VideoDatabase.h similarity index 100% rename from src/video/VideoDatabase.h rename to xbmc/video/VideoDatabase.h diff --git a/src/video/VideoDbUrl.cpp b/xbmc/video/VideoDbUrl.cpp similarity index 100% rename from src/video/VideoDbUrl.cpp rename to xbmc/video/VideoDbUrl.cpp diff --git a/src/video/VideoDbUrl.h b/xbmc/video/VideoDbUrl.h similarity index 100% rename from src/video/VideoDbUrl.h rename to xbmc/video/VideoDbUrl.h diff --git a/src/video/VideoInfoDownloader.cpp b/xbmc/video/VideoInfoDownloader.cpp similarity index 100% rename from src/video/VideoInfoDownloader.cpp rename to xbmc/video/VideoInfoDownloader.cpp diff --git a/src/video/VideoInfoDownloader.h b/xbmc/video/VideoInfoDownloader.h similarity index 100% rename from src/video/VideoInfoDownloader.h rename to xbmc/video/VideoInfoDownloader.h diff --git a/src/video/VideoInfoScanner.cpp b/xbmc/video/VideoInfoScanner.cpp similarity index 100% rename from src/video/VideoInfoScanner.cpp rename to xbmc/video/VideoInfoScanner.cpp diff --git a/src/video/VideoInfoScanner.h b/xbmc/video/VideoInfoScanner.h similarity index 100% rename from src/video/VideoInfoScanner.h rename to xbmc/video/VideoInfoScanner.h diff --git a/src/video/VideoInfoTag.cpp b/xbmc/video/VideoInfoTag.cpp similarity index 100% rename from src/video/VideoInfoTag.cpp rename to xbmc/video/VideoInfoTag.cpp diff --git a/src/video/VideoInfoTag.h b/xbmc/video/VideoInfoTag.h similarity index 100% rename from src/video/VideoInfoTag.h rename to xbmc/video/VideoInfoTag.h diff --git a/src/video/VideoReferenceClock.cpp b/xbmc/video/VideoReferenceClock.cpp similarity index 100% rename from src/video/VideoReferenceClock.cpp rename to xbmc/video/VideoReferenceClock.cpp diff --git a/src/video/VideoReferenceClock.h b/xbmc/video/VideoReferenceClock.h similarity index 100% rename from src/video/VideoReferenceClock.h rename to xbmc/video/VideoReferenceClock.h diff --git a/src/video/VideoThumbLoader.cpp b/xbmc/video/VideoThumbLoader.cpp similarity index 100% rename from src/video/VideoThumbLoader.cpp rename to xbmc/video/VideoThumbLoader.cpp diff --git a/src/video/VideoThumbLoader.h b/xbmc/video/VideoThumbLoader.h similarity index 100% rename from src/video/VideoThumbLoader.h rename to xbmc/video/VideoThumbLoader.h diff --git a/src/video/dialogs/GUIDialogAudioSubtitleSettings.cpp b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp similarity index 100% rename from src/video/dialogs/GUIDialogAudioSubtitleSettings.cpp rename to xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp diff --git a/src/video/dialogs/GUIDialogAudioSubtitleSettings.h b/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h similarity index 100% rename from src/video/dialogs/GUIDialogAudioSubtitleSettings.h rename to xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.h diff --git a/src/video/dialogs/GUIDialogFileStacking.cpp b/xbmc/video/dialogs/GUIDialogFileStacking.cpp similarity index 100% rename from src/video/dialogs/GUIDialogFileStacking.cpp rename to xbmc/video/dialogs/GUIDialogFileStacking.cpp diff --git a/src/video/dialogs/GUIDialogFileStacking.h b/xbmc/video/dialogs/GUIDialogFileStacking.h similarity index 100% rename from src/video/dialogs/GUIDialogFileStacking.h rename to xbmc/video/dialogs/GUIDialogFileStacking.h diff --git a/src/video/dialogs/GUIDialogFullScreenInfo.cpp b/xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp similarity index 100% rename from src/video/dialogs/GUIDialogFullScreenInfo.cpp rename to xbmc/video/dialogs/GUIDialogFullScreenInfo.cpp diff --git a/src/video/dialogs/GUIDialogFullScreenInfo.h b/xbmc/video/dialogs/GUIDialogFullScreenInfo.h similarity index 100% rename from src/video/dialogs/GUIDialogFullScreenInfo.h rename to xbmc/video/dialogs/GUIDialogFullScreenInfo.h diff --git a/src/video/dialogs/GUIDialogSubtitles.cpp b/xbmc/video/dialogs/GUIDialogSubtitles.cpp similarity index 100% rename from src/video/dialogs/GUIDialogSubtitles.cpp rename to xbmc/video/dialogs/GUIDialogSubtitles.cpp diff --git a/src/video/dialogs/GUIDialogSubtitles.h b/xbmc/video/dialogs/GUIDialogSubtitles.h similarity index 100% rename from src/video/dialogs/GUIDialogSubtitles.h rename to xbmc/video/dialogs/GUIDialogSubtitles.h diff --git a/src/video/dialogs/GUIDialogTeletext.cpp b/xbmc/video/dialogs/GUIDialogTeletext.cpp similarity index 100% rename from src/video/dialogs/GUIDialogTeletext.cpp rename to xbmc/video/dialogs/GUIDialogTeletext.cpp diff --git a/src/video/dialogs/GUIDialogTeletext.h b/xbmc/video/dialogs/GUIDialogTeletext.h similarity index 100% rename from src/video/dialogs/GUIDialogTeletext.h rename to xbmc/video/dialogs/GUIDialogTeletext.h diff --git a/src/video/dialogs/GUIDialogVideoBookmarks.cpp b/xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp similarity index 100% rename from src/video/dialogs/GUIDialogVideoBookmarks.cpp rename to xbmc/video/dialogs/GUIDialogVideoBookmarks.cpp diff --git a/src/video/dialogs/GUIDialogVideoBookmarks.h b/xbmc/video/dialogs/GUIDialogVideoBookmarks.h similarity index 100% rename from src/video/dialogs/GUIDialogVideoBookmarks.h rename to xbmc/video/dialogs/GUIDialogVideoBookmarks.h diff --git a/src/video/dialogs/GUIDialogVideoInfo.cpp b/xbmc/video/dialogs/GUIDialogVideoInfo.cpp similarity index 100% rename from src/video/dialogs/GUIDialogVideoInfo.cpp rename to xbmc/video/dialogs/GUIDialogVideoInfo.cpp diff --git a/src/video/dialogs/GUIDialogVideoInfo.h b/xbmc/video/dialogs/GUIDialogVideoInfo.h similarity index 100% rename from src/video/dialogs/GUIDialogVideoInfo.h rename to xbmc/video/dialogs/GUIDialogVideoInfo.h diff --git a/src/video/dialogs/GUIDialogVideoOSD.cpp b/xbmc/video/dialogs/GUIDialogVideoOSD.cpp similarity index 100% rename from src/video/dialogs/GUIDialogVideoOSD.cpp rename to xbmc/video/dialogs/GUIDialogVideoOSD.cpp diff --git a/src/video/dialogs/GUIDialogVideoOSD.h b/xbmc/video/dialogs/GUIDialogVideoOSD.h similarity index 100% rename from src/video/dialogs/GUIDialogVideoOSD.h rename to xbmc/video/dialogs/GUIDialogVideoOSD.h diff --git a/src/video/dialogs/GUIDialogVideoOverlay.cpp b/xbmc/video/dialogs/GUIDialogVideoOverlay.cpp similarity index 100% rename from src/video/dialogs/GUIDialogVideoOverlay.cpp rename to xbmc/video/dialogs/GUIDialogVideoOverlay.cpp diff --git a/src/video/dialogs/GUIDialogVideoOverlay.h b/xbmc/video/dialogs/GUIDialogVideoOverlay.h similarity index 100% rename from src/video/dialogs/GUIDialogVideoOverlay.h rename to xbmc/video/dialogs/GUIDialogVideoOverlay.h diff --git a/src/video/dialogs/GUIDialogVideoSettings.cpp b/xbmc/video/dialogs/GUIDialogVideoSettings.cpp similarity index 100% rename from src/video/dialogs/GUIDialogVideoSettings.cpp rename to xbmc/video/dialogs/GUIDialogVideoSettings.cpp diff --git a/src/video/dialogs/GUIDialogVideoSettings.h b/xbmc/video/dialogs/GUIDialogVideoSettings.h similarity index 100% rename from src/video/dialogs/GUIDialogVideoSettings.h rename to xbmc/video/dialogs/GUIDialogVideoSettings.h diff --git a/src/video/dialogs/Makefile b/xbmc/video/dialogs/Makefile similarity index 100% rename from src/video/dialogs/Makefile rename to xbmc/video/dialogs/Makefile diff --git a/src/video/test/Makefile b/xbmc/video/test/Makefile similarity index 100% rename from src/video/test/Makefile rename to xbmc/video/test/Makefile diff --git a/src/video/test/TestVideoInfoScanner.cpp b/xbmc/video/test/TestVideoInfoScanner.cpp similarity index 100% rename from src/video/test/TestVideoInfoScanner.cpp rename to xbmc/video/test/TestVideoInfoScanner.cpp diff --git a/src/video/videosync/Makefile b/xbmc/video/videosync/Makefile similarity index 100% rename from src/video/videosync/Makefile rename to xbmc/video/videosync/Makefile diff --git a/src/video/videosync/VideoSync.h b/xbmc/video/videosync/VideoSync.h similarity index 100% rename from src/video/videosync/VideoSync.h rename to xbmc/video/videosync/VideoSync.h diff --git a/src/video/videosync/VideoSyncCocoa.cpp b/xbmc/video/videosync/VideoSyncCocoa.cpp similarity index 100% rename from src/video/videosync/VideoSyncCocoa.cpp rename to xbmc/video/videosync/VideoSyncCocoa.cpp diff --git a/src/video/videosync/VideoSyncCocoa.h b/xbmc/video/videosync/VideoSyncCocoa.h similarity index 100% rename from src/video/videosync/VideoSyncCocoa.h rename to xbmc/video/videosync/VideoSyncCocoa.h diff --git a/src/video/videosync/VideoSyncD3D.cpp b/xbmc/video/videosync/VideoSyncD3D.cpp similarity index 100% rename from src/video/videosync/VideoSyncD3D.cpp rename to xbmc/video/videosync/VideoSyncD3D.cpp diff --git a/src/video/videosync/VideoSyncD3D.h b/xbmc/video/videosync/VideoSyncD3D.h similarity index 100% rename from src/video/videosync/VideoSyncD3D.h rename to xbmc/video/videosync/VideoSyncD3D.h diff --git a/src/video/videosync/VideoSyncDRM.cpp b/xbmc/video/videosync/VideoSyncDRM.cpp similarity index 100% rename from src/video/videosync/VideoSyncDRM.cpp rename to xbmc/video/videosync/VideoSyncDRM.cpp diff --git a/src/video/videosync/VideoSyncDRM.h b/xbmc/video/videosync/VideoSyncDRM.h similarity index 100% rename from src/video/videosync/VideoSyncDRM.h rename to xbmc/video/videosync/VideoSyncDRM.h diff --git a/src/video/videosync/VideoSyncGLX.cpp b/xbmc/video/videosync/VideoSyncGLX.cpp similarity index 100% rename from src/video/videosync/VideoSyncGLX.cpp rename to xbmc/video/videosync/VideoSyncGLX.cpp diff --git a/src/video/videosync/VideoSyncGLX.h b/xbmc/video/videosync/VideoSyncGLX.h similarity index 100% rename from src/video/videosync/VideoSyncGLX.h rename to xbmc/video/videosync/VideoSyncGLX.h diff --git a/src/video/videosync/VideoSyncPi.cpp b/xbmc/video/videosync/VideoSyncPi.cpp similarity index 100% rename from src/video/videosync/VideoSyncPi.cpp rename to xbmc/video/videosync/VideoSyncPi.cpp diff --git a/src/video/videosync/VideoSyncPi.h b/xbmc/video/videosync/VideoSyncPi.h similarity index 100% rename from src/video/videosync/VideoSyncPi.h rename to xbmc/video/videosync/VideoSyncPi.h diff --git a/src/video/windows/GUIWindowFullScreen.cpp b/xbmc/video/windows/GUIWindowFullScreen.cpp similarity index 100% rename from src/video/windows/GUIWindowFullScreen.cpp rename to xbmc/video/windows/GUIWindowFullScreen.cpp diff --git a/src/video/windows/GUIWindowFullScreen.h b/xbmc/video/windows/GUIWindowFullScreen.h similarity index 100% rename from src/video/windows/GUIWindowFullScreen.h rename to xbmc/video/windows/GUIWindowFullScreen.h diff --git a/src/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp similarity index 100% rename from src/video/windows/GUIWindowVideoBase.cpp rename to xbmc/video/windows/GUIWindowVideoBase.cpp diff --git a/src/video/windows/GUIWindowVideoBase.h b/xbmc/video/windows/GUIWindowVideoBase.h similarity index 100% rename from src/video/windows/GUIWindowVideoBase.h rename to xbmc/video/windows/GUIWindowVideoBase.h diff --git a/src/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp similarity index 100% rename from src/video/windows/GUIWindowVideoNav.cpp rename to xbmc/video/windows/GUIWindowVideoNav.cpp diff --git a/src/video/windows/GUIWindowVideoNav.h b/xbmc/video/windows/GUIWindowVideoNav.h similarity index 100% rename from src/video/windows/GUIWindowVideoNav.h rename to xbmc/video/windows/GUIWindowVideoNav.h diff --git a/src/video/windows/GUIWindowVideoPlaylist.cpp b/xbmc/video/windows/GUIWindowVideoPlaylist.cpp similarity index 100% rename from src/video/windows/GUIWindowVideoPlaylist.cpp rename to xbmc/video/windows/GUIWindowVideoPlaylist.cpp diff --git a/src/video/windows/GUIWindowVideoPlaylist.h b/xbmc/video/windows/GUIWindowVideoPlaylist.h similarity index 100% rename from src/video/windows/GUIWindowVideoPlaylist.h rename to xbmc/video/windows/GUIWindowVideoPlaylist.h diff --git a/src/video/windows/Makefile b/xbmc/video/windows/Makefile similarity index 100% rename from src/video/windows/Makefile rename to xbmc/video/windows/Makefile diff --git a/src/view/GUIViewControl.cpp b/xbmc/view/GUIViewControl.cpp similarity index 100% rename from src/view/GUIViewControl.cpp rename to xbmc/view/GUIViewControl.cpp diff --git a/src/view/GUIViewControl.h b/xbmc/view/GUIViewControl.h similarity index 100% rename from src/view/GUIViewControl.h rename to xbmc/view/GUIViewControl.h diff --git a/src/view/GUIViewState.cpp b/xbmc/view/GUIViewState.cpp similarity index 100% rename from src/view/GUIViewState.cpp rename to xbmc/view/GUIViewState.cpp diff --git a/src/view/GUIViewState.h b/xbmc/view/GUIViewState.h similarity index 100% rename from src/view/GUIViewState.h rename to xbmc/view/GUIViewState.h diff --git a/src/view/Makefile b/xbmc/view/Makefile similarity index 100% rename from src/view/Makefile rename to xbmc/view/Makefile diff --git a/src/view/ViewDatabase.cpp b/xbmc/view/ViewDatabase.cpp similarity index 100% rename from src/view/ViewDatabase.cpp rename to xbmc/view/ViewDatabase.cpp diff --git a/src/view/ViewDatabase.h b/xbmc/view/ViewDatabase.h similarity index 100% rename from src/view/ViewDatabase.h rename to xbmc/view/ViewDatabase.h diff --git a/src/view/ViewState.h b/xbmc/view/ViewState.h similarity index 100% rename from src/view/ViewState.h rename to xbmc/view/ViewState.h diff --git a/src/view/ViewStateSettings.cpp b/xbmc/view/ViewStateSettings.cpp similarity index 100% rename from src/view/ViewStateSettings.cpp rename to xbmc/view/ViewStateSettings.cpp diff --git a/src/view/ViewStateSettings.h b/xbmc/view/ViewStateSettings.h similarity index 100% rename from src/view/ViewStateSettings.h rename to xbmc/view/ViewStateSettings.h diff --git a/src/visualizations/DirectXSpectrum/directx_spectrum.cpp b/xbmc/visualizations/DirectXSpectrum/directx_spectrum.cpp similarity index 100% rename from src/visualizations/DirectXSpectrum/directx_spectrum.cpp rename to xbmc/visualizations/DirectXSpectrum/directx_spectrum.cpp diff --git a/src/visualizations/DirectXSpectrum/directx_spectrum.sln b/xbmc/visualizations/DirectXSpectrum/directx_spectrum.sln similarity index 100% rename from src/visualizations/DirectXSpectrum/directx_spectrum.sln rename to xbmc/visualizations/DirectXSpectrum/directx_spectrum.sln diff --git a/src/visualizations/DirectXSpectrum/directx_spectrum.vcxproj b/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj similarity index 100% rename from src/visualizations/DirectXSpectrum/directx_spectrum.vcxproj rename to xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj diff --git a/src/visualizations/DirectXSpectrum/directx_spectrum.vcxproj.filters b/xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj.filters similarity index 100% rename from src/visualizations/DirectXSpectrum/directx_spectrum.vcxproj.filters rename to xbmc/visualizations/DirectXSpectrum/directx_spectrum.vcxproj.filters diff --git a/src/visualizations/EGLHelpers/Makefile.in b/xbmc/visualizations/EGLHelpers/Makefile.in similarity index 100% rename from src/visualizations/EGLHelpers/Makefile.in rename to xbmc/visualizations/EGLHelpers/Makefile.in diff --git a/src/visualizations/EGLHelpers/VisGUIShader.cpp b/xbmc/visualizations/EGLHelpers/VisGUIShader.cpp similarity index 100% rename from src/visualizations/EGLHelpers/VisGUIShader.cpp rename to xbmc/visualizations/EGLHelpers/VisGUIShader.cpp diff --git a/src/visualizations/EGLHelpers/VisGUIShader.h b/xbmc/visualizations/EGLHelpers/VisGUIShader.h similarity index 100% rename from src/visualizations/EGLHelpers/VisGUIShader.h rename to xbmc/visualizations/EGLHelpers/VisGUIShader.h diff --git a/src/visualizations/EGLHelpers/VisMatrixGLES.cpp b/xbmc/visualizations/EGLHelpers/VisMatrixGLES.cpp similarity index 100% rename from src/visualizations/EGLHelpers/VisMatrixGLES.cpp rename to xbmc/visualizations/EGLHelpers/VisMatrixGLES.cpp diff --git a/src/visualizations/EGLHelpers/VisMatrixGLES.h b/xbmc/visualizations/EGLHelpers/VisMatrixGLES.h similarity index 100% rename from src/visualizations/EGLHelpers/VisMatrixGLES.h rename to xbmc/visualizations/EGLHelpers/VisMatrixGLES.h diff --git a/src/visualizations/EGLHelpers/VisShader.cpp b/xbmc/visualizations/EGLHelpers/VisShader.cpp similarity index 100% rename from src/visualizations/EGLHelpers/VisShader.cpp rename to xbmc/visualizations/EGLHelpers/VisShader.cpp diff --git a/src/visualizations/EGLHelpers/VisShader.h b/xbmc/visualizations/EGLHelpers/VisShader.h similarity index 100% rename from src/visualizations/EGLHelpers/VisShader.h rename to xbmc/visualizations/EGLHelpers/VisShader.h diff --git a/src/visualizations/Goom/Main.cpp b/xbmc/visualizations/Goom/Main.cpp similarity index 100% rename from src/visualizations/Goom/Main.cpp rename to xbmc/visualizations/Goom/Main.cpp diff --git a/src/visualizations/Goom/Makefile.in b/xbmc/visualizations/Goom/Makefile.in similarity index 100% rename from src/visualizations/Goom/Makefile.in rename to xbmc/visualizations/Goom/Makefile.in diff --git a/src/visualizations/Goom/build_xbmc_win32.sh b/xbmc/visualizations/Goom/build_xbmc_win32.sh similarity index 100% rename from src/visualizations/Goom/build_xbmc_win32.sh rename to xbmc/visualizations/Goom/build_xbmc_win32.sh diff --git a/src/visualizations/Goom/goom.patch b/xbmc/visualizations/Goom/goom.patch similarity index 100% rename from src/visualizations/Goom/goom.patch rename to xbmc/visualizations/Goom/goom.patch diff --git a/src/visualizations/Goom/goom2k4-0/AUTHORS b/xbmc/visualizations/Goom/goom2k4-0/AUTHORS similarity index 100% rename from src/visualizations/Goom/goom2k4-0/AUTHORS rename to xbmc/visualizations/Goom/goom2k4-0/AUTHORS diff --git a/src/visualizations/Goom/goom2k4-0/COPYING b/xbmc/visualizations/Goom/goom2k4-0/COPYING similarity index 100% rename from src/visualizations/Goom/goom2k4-0/COPYING rename to xbmc/visualizations/Goom/goom2k4-0/COPYING diff --git a/src/visualizations/Goom/goom2k4-0/ChangeLog b/xbmc/visualizations/Goom/goom2k4-0/ChangeLog similarity index 100% rename from src/visualizations/Goom/goom2k4-0/ChangeLog rename to xbmc/visualizations/Goom/goom2k4-0/ChangeLog diff --git a/src/visualizations/Goom/goom2k4-0/KNOWNBUGS b/xbmc/visualizations/Goom/goom2k4-0/KNOWNBUGS similarity index 100% rename from src/visualizations/Goom/goom2k4-0/KNOWNBUGS rename to xbmc/visualizations/Goom/goom2k4-0/KNOWNBUGS diff --git a/src/visualizations/Goom/goom2k4-0/Makefile.am b/xbmc/visualizations/Goom/goom2k4-0/Makefile.am similarity index 100% rename from src/visualizations/Goom/goom2k4-0/Makefile.am rename to xbmc/visualizations/Goom/goom2k4-0/Makefile.am diff --git a/src/visualizations/Goom/goom2k4-0/NEWS b/xbmc/visualizations/Goom/goom2k4-0/NEWS similarity index 100% rename from src/visualizations/Goom/goom2k4-0/NEWS rename to xbmc/visualizations/Goom/goom2k4-0/NEWS diff --git a/src/visualizations/Goom/goom2k4-0/README b/xbmc/visualizations/Goom/goom2k4-0/README similarity index 100% rename from src/visualizations/Goom/goom2k4-0/README rename to xbmc/visualizations/Goom/goom2k4-0/README diff --git a/src/visualizations/Goom/goom2k4-0/autogen.sh b/xbmc/visualizations/Goom/goom2k4-0/autogen.sh similarity index 100% rename from src/visualizations/Goom/goom2k4-0/autogen.sh rename to xbmc/visualizations/Goom/goom2k4-0/autogen.sh diff --git a/src/visualizations/Goom/goom2k4-0/configure.in b/xbmc/visualizations/Goom/goom2k4-0/configure.in similarity index 100% rename from src/visualizations/Goom/goom2k4-0/configure.in rename to xbmc/visualizations/Goom/goom2k4-0/configure.in diff --git a/src/visualizations/Goom/goom2k4-0/goom2k4.png b/xbmc/visualizations/Goom/goom2k4-0/goom2k4.png similarity index 100% rename from src/visualizations/Goom/goom2k4-0/goom2k4.png rename to xbmc/visualizations/Goom/goom2k4-0/goom2k4.png diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/ABOUT-NLS b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/ABOUT-NLS similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/ABOUT-NLS rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/ABOUT-NLS diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/AUTHORS b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/AUTHORS similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/AUTHORS rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/AUTHORS diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/COPYING b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/COPYING similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/COPYING rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/COPYING diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/ChangeLog b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/ChangeLog similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/ChangeLog rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/ChangeLog diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/INSTALL b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/INSTALL similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/INSTALL rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/INSTALL diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/Makefile.am b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/Makefile.am similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/Makefile.am rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/Makefile.am diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/NEWS b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/NEWS similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/NEWS rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/NEWS diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/README b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/README similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/README rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/README diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/acconfig.h b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/acconfig.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/acconfig.h rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/acconfig.h diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/aclocal.m4 b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/aclocal.m4 similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/aclocal.m4 rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/aclocal.m4 diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/autogen.sh b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/autogen.sh similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/autogen.sh rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/autogen.sh diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/config.h.in b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/config.h.in similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/config.h.in rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/config.h.in diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure.in diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/goom2.glade b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/goom2.glade similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/goom2.glade rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/goom2.glade diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/Makefile.am b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/Makefile.am similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/Makefile.am rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/Makefile.am diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-callbacks.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-callbacks.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-callbacks.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-callbacks.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-callbacks.h b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-callbacks.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-callbacks.h rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-callbacks.h diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-interface.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-interface.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-interface.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-interface.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-interface.h b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-interface.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-interface.h rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-interface.h diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-support.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-support.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-support.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-support.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-support.h b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-support.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-support.h rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/gtk-support.h diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/main.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/main.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/main.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/gtk-gui/main.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/install-sh b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/install-sh similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/install-sh rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/install-sh diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/ChangeLog b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/ChangeLog similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/ChangeLog rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/ChangeLog diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/VERSION b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/VERSION similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/VERSION rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/VERSION diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/bindtextdom.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/bindtextdom.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/bindtextdom.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/bindtextdom.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/cat-compat.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/cat-compat.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/cat-compat.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/cat-compat.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/dcgettext.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/dcgettext.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/dcgettext.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/dcgettext.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/dgettext.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/dgettext.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/dgettext.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/dgettext.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/explodename.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/explodename.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/explodename.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/explodename.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/finddomain.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/finddomain.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/finddomain.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/finddomain.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettext.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettext.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettext.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettext.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettext.h b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettext.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettext.h rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettext.h diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettextP.h b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettextP.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettextP.h rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/gettextP.h diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/hash-string.h b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/hash-string.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/hash-string.h rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/hash-string.h diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/intl-compat.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/intl-compat.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/intl-compat.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/intl-compat.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/l10nflist.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/l10nflist.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/l10nflist.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/l10nflist.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/libgettext.h b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/libgettext.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/libgettext.h rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/libgettext.h diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/linux-msg.sed b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/linux-msg.sed similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/linux-msg.sed rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/linux-msg.sed diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/loadinfo.h b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/loadinfo.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/loadinfo.h rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/loadinfo.h diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/loadmsgcat.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/loadmsgcat.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/loadmsgcat.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/loadmsgcat.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/localealias.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/localealias.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/localealias.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/localealias.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/po2tbl.sed.in b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/po2tbl.sed.in similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/po2tbl.sed.in rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/po2tbl.sed.in diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/textdomain.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/textdomain.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/textdomain.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/textdomain.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/xopen-msg.sed b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/xopen-msg.sed similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/xopen-msg.sed rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/intl/xopen-msg.sed diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/missing b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/missing similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/missing rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/missing diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/mkinstalldirs b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/mkinstalldirs similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/mkinstalldirs rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/mkinstalldirs diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/ChangeLog b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/ChangeLog similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/ChangeLog rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/ChangeLog diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/Makefile.in.in b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/Makefile.in.in similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/Makefile.in.in rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/Makefile.in.in diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/POTFILES.in b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/POTFILES.in similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/POTFILES.in rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/POTFILES.in diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/cat-id-tbl.c b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/cat-id-tbl.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/cat-id-tbl.c rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/cat-id-tbl.c diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/goom2.pot b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/goom2.pot similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/goom2.pot rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/goom2.pot diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/stamp-cat-id b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/stamp-cat-id similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/stamp-cat-id rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/po/stamp-cat-id diff --git a/src/visualizations/Goom/goom2k4-0/gtk-gui-devel/stamp-h.in b/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/stamp-h.in similarity index 100% rename from src/visualizations/Goom/goom2k4-0/gtk-gui-devel/stamp-h.in rename to xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/stamp-h.in diff --git a/src/visualizations/Goom/goom2k4-0/libgoom2.pc.in b/xbmc/visualizations/Goom/goom2k4-0/libgoom2.pc.in similarity index 100% rename from src/visualizations/Goom/goom2k4-0/libgoom2.pc.in rename to xbmc/visualizations/Goom/goom2k4-0/libgoom2.pc.in diff --git a/src/visualizations/Goom/goom2k4-0/m4/sdl.m4 b/xbmc/visualizations/Goom/goom2k4-0/m4/sdl.m4 similarity index 100% rename from src/visualizations/Goom/goom2k4-0/m4/sdl.m4 rename to xbmc/visualizations/Goom/goom2k4-0/m4/sdl.m4 diff --git a/src/visualizations/Goom/goom2k4-0/m4/xmms.m4 b/xbmc/visualizations/Goom/goom2k4-0/m4/xmms.m4 similarity index 100% rename from src/visualizations/Goom/goom2k4-0/m4/xmms.m4 rename to xbmc/visualizations/Goom/goom2k4-0/m4/xmms.m4 diff --git a/src/visualizations/Goom/goom2k4-0/mac/Makefile b/xbmc/visualizations/Goom/goom2k4-0/mac/Makefile similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/Makefile rename to xbmc/visualizations/Goom/goom2k4-0/mac/Makefile diff --git a/src/visualizations/Goom/goom2k4-0/mac/ReadMe.rtf b/xbmc/visualizations/Goom/goom2k4-0/mac/ReadMe.rtf similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/ReadMe.rtf rename to xbmc/visualizations/Goom/goom2k4-0/mac/ReadMe.rtf diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/AppController.h b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/AppController.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/AppController.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/AppController.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/AppController.m b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/AppController.m similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/AppController.m rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/AppController.m diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioDevice.cpp b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioDevice.cpp similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioDevice.cpp rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioDevice.cpp diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioDevice.h b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioDevice.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioDevice.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioDevice.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioHardware.cpp b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioHardware.cpp similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioHardware.cpp rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioHardware.cpp diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioHardware.h b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioHardware.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioHardware.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/CoreAudioHardware.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/InfoPlist.strings b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/InfoPlist.strings similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/InfoPlist.strings rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/InfoPlist.strings diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/classes.nib b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/classes.nib similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/classes.nib rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/classes.nib diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/info.nib b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/info.nib similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/info.nib rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/info.nib diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/keyedobjects.nib b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/keyedobjects.nib similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/keyedobjects.nib rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/English.lproj/MainMenu.nib/keyedobjects.nib diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/French.lproj/Localizable.strings b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/French.lproj/Localizable.strings similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/French.lproj/Localizable.strings rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/French.lproj/Localizable.strings diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/Goom.h b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/Goom.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/Goom.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/Goom.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/Goom.m b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/Goom.m similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/Goom.m rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/Goom.m diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXParam.h b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXParam.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXParam.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXParam.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXParam.m b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXParam.m similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXParam.m rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXParam.m diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXView.h b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXView.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXView.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXView.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXView.m b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXView.m similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXView.m rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/GoomFXView.m diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/MainOpenGLView.h b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/MainOpenGLView.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/MainOpenGLView.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/MainOpenGLView.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/MainOpenGLView.m b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/MainOpenGLView.m similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/MainOpenGLView.m rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/MainOpenGLView.m diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/MyApplication.h b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/MyApplication.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/MyApplication.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/MyApplication.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/MyApplication.m b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/MyApplication.m similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/MyApplication.m rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/MyApplication.m diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/SoundSampler.h b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/SoundSampler.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/SoundSampler.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/SoundSampler.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/SoundSampler.mm b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/SoundSampler.mm similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/SoundSampler.mm rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/SoundSampler.mm diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/iGoom-StandAlone.plist b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/iGoom-StandAlone.plist similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/iGoom-StandAlone.plist rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/iGoom-StandAlone.plist diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/iGoom_Prefix.pch b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/iGoom_Prefix.pch similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/iGoom_Prefix.pch rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/iGoom_Prefix.pch diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/icon.icns b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/icon.icns similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/icon.icns rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/icon.icns diff --git a/src/visualizations/Goom/goom2k4-0/mac/StandAlone/main.m b/xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/main.m similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/StandAlone/main.m rename to xbmc/visualizations/Goom/goom2k4-0/mac/StandAlone/main.m diff --git a/src/visualizations/Goom/goom2k4-0/mac/iGoom.xcode/project.pbxproj b/xbmc/visualizations/Goom/goom2k4-0/mac/iGoom.xcode/project.pbxproj similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iGoom.xcode/project.pbxproj rename to xbmc/visualizations/Goom/goom2k4-0/mac/iGoom.xcode/project.pbxproj diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/About.strings b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/About.strings similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/About.strings rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/About.strings diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/InfoPlist.strings b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/InfoPlist.strings similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/InfoPlist.strings rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/InfoPlist.strings diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/classes.nib b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/classes.nib similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/classes.nib rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/classes.nib diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/info.nib b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/info.nib similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/info.nib rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/info.nib diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/objects.xib b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/objects.xib similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/objects.xib rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/English.lproj/SettingsDialog.nib/objects.xib diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/About.strings b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/About.strings similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/About.strings rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/About.strings diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/InfoPlist.strings b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/InfoPlist.strings similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/InfoPlist.strings rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/InfoPlist.strings diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/classes.nib b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/classes.nib similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/classes.nib rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/classes.nib diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/info.nib b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/info.nib similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/info.nib rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/info.nib diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/objects.xib b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/objects.xib similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/objects.xib rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/French.lproj/SettingsDialog.nib/objects.xib diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/Installer.applescript b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/Installer.applescript similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/Installer.applescript rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/Installer.applescript diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/iGoom-Info.plist b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iGoom-Info.plist similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/iGoom-Info.plist rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iGoom-Info.plist diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/iGoom.c b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iGoom.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/iGoom.c rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iGoom.c diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesAPI.c b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesAPI.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesAPI.c rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesAPI.c diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesAPI.h b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesAPI.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesAPI.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesAPI.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesVisualAPI.h b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesVisualAPI.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesVisualAPI.h rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/iTuneVisualAPI/iTunesVisualAPI.h diff --git a/src/visualizations/Goom/goom2k4-0/mac/iTunes/ppc_doubling.s b/xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/ppc_doubling.s similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mac/iTunes/ppc_doubling.s rename to xbmc/visualizations/Goom/goom2k4-0/mac/iTunes/ppc_doubling.s diff --git a/src/visualizations/Goom/goom2k4-0/mkinstalldirs b/xbmc/visualizations/Goom/goom2k4-0/mkinstalldirs similarity index 100% rename from src/visualizations/Goom/goom2k4-0/mkinstalldirs rename to xbmc/visualizations/Goom/goom2k4-0/mkinstalldirs diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.am b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.am similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.am rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/Makefile.am diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/frame_rate_tester.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/frame_rate_tester.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/frame_rate_tester.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/frame_rate_tester.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/frame_rate_tester.h b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/frame_rate_tester.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/frame_rate_tester.h rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/frame_rate_tester.h diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/gmtimer.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gmtimer.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/gmtimer.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gmtimer.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/gmtimer.h b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gmtimer.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/gmtimer.h rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gmtimer.h diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-callbacks.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-callbacks.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-callbacks.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-callbacks.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-callbacks.h b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-callbacks.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-callbacks.h rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-callbacks.h diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-interface.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-interface.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-interface.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-interface.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-interface.h b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-interface.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-interface.h rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-interface.h diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-support.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-support.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-support.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-support.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-support.h b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-support.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/gtk-support.h rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/gtk-support.h diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler.h b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler.h rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler.h diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler_athlon.s b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler_athlon.s similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler_athlon.s rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/pixeldoubler_athlon.s diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/readme.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/readme.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/readme.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/readme.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/sdl_goom.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/sdl_goom.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/sdl_goom.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/sdl_goom.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/sdl_goom.h b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/sdl_goom.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/sdl_goom.h rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/sdl_goom.h diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/sdl_pixeldoubler.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/sdl_pixeldoubler.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/sdl_pixeldoubler.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/sdl_pixeldoubler.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/sdl_pixeldoubler.h b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/sdl_pixeldoubler.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/sdl_pixeldoubler.h rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/sdl_pixeldoubler.h diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/surface.c b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/surface.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/surface.c rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/surface.c diff --git a/src/visualizations/Goom/goom2k4-0/sdl-goom/surface.h b/xbmc/visualizations/Goom/goom2k4-0/sdl-goom/surface.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/sdl-goom/surface.h rename to xbmc/visualizations/Goom/goom2k4-0/sdl-goom/surface.h diff --git a/src/visualizations/Goom/goom2k4-0/src/DOCODE.TXT b/xbmc/visualizations/Goom/goom2k4-0/src/DOCODE.TXT similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/DOCODE.TXT rename to xbmc/visualizations/Goom/goom2k4-0/src/DOCODE.TXT diff --git a/src/visualizations/Goom/goom2k4-0/src/Makefile.am b/xbmc/visualizations/Goom/goom2k4-0/src/Makefile.am similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/Makefile.am rename to xbmc/visualizations/Goom/goom2k4-0/src/Makefile.am diff --git a/src/visualizations/Goom/goom2k4-0/src/TODO b/xbmc/visualizations/Goom/goom2k4-0/src/TODO similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/TODO rename to xbmc/visualizations/Goom/goom2k4-0/src/TODO diff --git a/src/visualizations/Goom/goom2k4-0/src/config_param.c b/xbmc/visualizations/Goom/goom2k4-0/src/config_param.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/config_param.c rename to xbmc/visualizations/Goom/goom2k4-0/src/config_param.c diff --git a/src/visualizations/Goom/goom2k4-0/src/convolve_fx.c b/xbmc/visualizations/Goom/goom2k4-0/src/convolve_fx.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/convolve_fx.c rename to xbmc/visualizations/Goom/goom2k4-0/src/convolve_fx.c diff --git a/src/visualizations/Goom/goom2k4-0/src/convolve_fx.c.jc b/xbmc/visualizations/Goom/goom2k4-0/src/convolve_fx.c.jc similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/convolve_fx.c.jc rename to xbmc/visualizations/Goom/goom2k4-0/src/convolve_fx.c.jc diff --git a/src/visualizations/Goom/goom2k4-0/src/cpu_info.c b/xbmc/visualizations/Goom/goom2k4-0/src/cpu_info.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/cpu_info.c rename to xbmc/visualizations/Goom/goom2k4-0/src/cpu_info.c diff --git a/src/visualizations/Goom/goom2k4-0/src/cpu_info.h b/xbmc/visualizations/Goom/goom2k4-0/src/cpu_info.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/cpu_info.h rename to xbmc/visualizations/Goom/goom2k4-0/src/cpu_info.h diff --git a/src/visualizations/Goom/goom2k4-0/src/default_script.goom b/xbmc/visualizations/Goom/goom2k4-0/src/default_script.goom similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/default_script.goom rename to xbmc/visualizations/Goom/goom2k4-0/src/default_script.goom diff --git a/src/visualizations/Goom/goom2k4-0/src/default_scripts.h b/xbmc/visualizations/Goom/goom2k4-0/src/default_scripts.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/default_scripts.h rename to xbmc/visualizations/Goom/goom2k4-0/src/default_scripts.h diff --git a/src/visualizations/Goom/goom2k4-0/src/drawmethods.c b/xbmc/visualizations/Goom/goom2k4-0/src/drawmethods.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/drawmethods.c rename to xbmc/visualizations/Goom/goom2k4-0/src/drawmethods.c diff --git a/src/visualizations/Goom/goom2k4-0/src/drawmethods.h b/xbmc/visualizations/Goom/goom2k4-0/src/drawmethods.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/drawmethods.h rename to xbmc/visualizations/Goom/goom2k4-0/src/drawmethods.h diff --git a/src/visualizations/Goom/goom2k4-0/src/empty_script.goom b/xbmc/visualizations/Goom/goom2k4-0/src/empty_script.goom similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/empty_script.goom rename to xbmc/visualizations/Goom/goom2k4-0/src/empty_script.goom diff --git a/src/visualizations/Goom/goom2k4-0/src/filter_test/mmx.h b/xbmc/visualizations/Goom/goom2k4-0/src/filter_test/mmx.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/filter_test/mmx.h rename to xbmc/visualizations/Goom/goom2k4-0/src/filter_test/mmx.h diff --git a/src/visualizations/Goom/goom2k4-0/src/filter_test/px_py_calc.c b/xbmc/visualizations/Goom/goom2k4-0/src/filter_test/px_py_calc.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/filter_test/px_py_calc.c rename to xbmc/visualizations/Goom/goom2k4-0/src/filter_test/px_py_calc.c diff --git a/src/visualizations/Goom/goom2k4-0/src/filter_test/zoom_filter_mmx-v0.c b/xbmc/visualizations/Goom/goom2k4-0/src/filter_test/zoom_filter_mmx-v0.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/filter_test/zoom_filter_mmx-v0.c rename to xbmc/visualizations/Goom/goom2k4-0/src/filter_test/zoom_filter_mmx-v0.c diff --git a/src/visualizations/Goom/goom2k4-0/src/filter_test/zoom_filter_mmx.c b/xbmc/visualizations/Goom/goom2k4-0/src/filter_test/zoom_filter_mmx.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/filter_test/zoom_filter_mmx.c rename to xbmc/visualizations/Goom/goom2k4-0/src/filter_test/zoom_filter_mmx.c diff --git a/src/visualizations/Goom/goom2k4-0/src/filters.c b/xbmc/visualizations/Goom/goom2k4-0/src/filters.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/filters.c rename to xbmc/visualizations/Goom/goom2k4-0/src/filters.c diff --git a/src/visualizations/Goom/goom2k4-0/src/filters_mmx.s b/xbmc/visualizations/Goom/goom2k4-0/src/filters_mmx.s similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/filters_mmx.s rename to xbmc/visualizations/Goom/goom2k4-0/src/filters_mmx.s diff --git a/src/visualizations/Goom/goom2k4-0/src/flying_stars_fx.c b/xbmc/visualizations/Goom/goom2k4-0/src/flying_stars_fx.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/flying_stars_fx.c rename to xbmc/visualizations/Goom/goom2k4-0/src/flying_stars_fx.c diff --git a/src/visualizations/Goom/goom2k4-0/src/gfontlib.c b/xbmc/visualizations/Goom/goom2k4-0/src/gfontlib.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/gfontlib.c rename to xbmc/visualizations/Goom/goom2k4-0/src/gfontlib.c diff --git a/src/visualizations/Goom/goom2k4-0/src/gfontlib.h b/xbmc/visualizations/Goom/goom2k4-0/src/gfontlib.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/gfontlib.h rename to xbmc/visualizations/Goom/goom2k4-0/src/gfontlib.h diff --git a/src/visualizations/Goom/goom2k4-0/src/gfontrle.c b/xbmc/visualizations/Goom/goom2k4-0/src/gfontrle.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/gfontrle.c rename to xbmc/visualizations/Goom/goom2k4-0/src/gfontrle.c diff --git a/src/visualizations/Goom/goom2k4-0/src/gfontrle.h b/xbmc/visualizations/Goom/goom2k4-0/src/gfontrle.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/gfontrle.h rename to xbmc/visualizations/Goom/goom2k4-0/src/gfontrle.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_config.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_config.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_config.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_config.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_config_param.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_config_param.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_config_param.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_config_param.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_core.c b/xbmc/visualizations/Goom/goom2k4-0/src/goom_core.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_core.c rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_core.c diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_filters.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_filters.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_filters.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_filters.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_fx.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_fx.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_fx.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_fx.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_graphic.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_graphic.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_graphic.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_graphic.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_hash.c b/xbmc/visualizations/Goom/goom2k4-0/src/goom_hash.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_hash.c rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_hash.c diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_hash.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_hash.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_hash.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_hash.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_plugin_info.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_plugin_info.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_plugin_info.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_plugin_info.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_tools.c b/xbmc/visualizations/Goom/goom2k4-0/src/goom_tools.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_tools.c rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_tools.c diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_tools.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_tools.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_tools.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_tools.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_typedefs.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_typedefs.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_typedefs.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_typedefs.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goom_visual_fx.h b/xbmc/visualizations/Goom/goom2k4-0/src/goom_visual_fx.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goom_visual_fx.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goom_visual_fx.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl.c b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl.c rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl.c diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl.h b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_hash.c b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_hash.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_hash.c rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_hash.c diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_hash.h b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_hash.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_hash.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_hash.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_heap.c b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_heap.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_heap.c rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_heap.c diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_heap.h b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_heap.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_heap.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_heap.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_lex.c b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_lex.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_lex.c rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_lex.c diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_lex.l b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_lex.l similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_lex.l rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_lex.l diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_private.h b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_private.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_private.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_private.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_yacc.c b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_yacc.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_yacc.c rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_yacc.c diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_yacc.h b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_yacc.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_yacc.h rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_yacc.h diff --git a/src/visualizations/Goom/goom2k4-0/src/goomsl_yacc.y b/xbmc/visualizations/Goom/goom2k4-0/src/goomsl_yacc.y similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/goomsl_yacc.y rename to xbmc/visualizations/Goom/goom2k4-0/src/goomsl_yacc.y diff --git a/src/visualizations/Goom/goom2k4-0/src/graphic.c b/xbmc/visualizations/Goom/goom2k4-0/src/graphic.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/graphic.c rename to xbmc/visualizations/Goom/goom2k4-0/src/graphic.c diff --git a/src/visualizations/Goom/goom2k4-0/src/ifs.c b/xbmc/visualizations/Goom/goom2k4-0/src/ifs.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/ifs.c rename to xbmc/visualizations/Goom/goom2k4-0/src/ifs.c diff --git a/src/visualizations/Goom/goom2k4-0/src/ifs.h b/xbmc/visualizations/Goom/goom2k4-0/src/ifs.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/ifs.h rename to xbmc/visualizations/Goom/goom2k4-0/src/ifs.h diff --git a/src/visualizations/Goom/goom2k4-0/src/jitc_test.c b/xbmc/visualizations/Goom/goom2k4-0/src/jitc_test.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/jitc_test.c rename to xbmc/visualizations/Goom/goom2k4-0/src/jitc_test.c diff --git a/src/visualizations/Goom/goom2k4-0/src/jitc_x86.c b/xbmc/visualizations/Goom/goom2k4-0/src/jitc_x86.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/jitc_x86.c rename to xbmc/visualizations/Goom/goom2k4-0/src/jitc_x86.c diff --git a/src/visualizations/Goom/goom2k4-0/src/jitc_x86.h b/xbmc/visualizations/Goom/goom2k4-0/src/jitc_x86.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/jitc_x86.h rename to xbmc/visualizations/Goom/goom2k4-0/src/jitc_x86.h diff --git a/src/visualizations/Goom/goom2k4-0/src/lines.c b/xbmc/visualizations/Goom/goom2k4-0/src/lines.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/lines.c rename to xbmc/visualizations/Goom/goom2k4-0/src/lines.c diff --git a/src/visualizations/Goom/goom2k4-0/src/lines.h b/xbmc/visualizations/Goom/goom2k4-0/src/lines.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/lines.h rename to xbmc/visualizations/Goom/goom2k4-0/src/lines.h diff --git a/src/visualizations/Goom/goom2k4-0/src/mathtools.c b/xbmc/visualizations/Goom/goom2k4-0/src/mathtools.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/mathtools.c rename to xbmc/visualizations/Goom/goom2k4-0/src/mathtools.c diff --git a/src/visualizations/Goom/goom2k4-0/src/mathtools.h b/xbmc/visualizations/Goom/goom2k4-0/src/mathtools.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/mathtools.h rename to xbmc/visualizations/Goom/goom2k4-0/src/mathtools.h diff --git a/src/visualizations/Goom/goom2k4-0/src/mmx.c b/xbmc/visualizations/Goom/goom2k4-0/src/mmx.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/mmx.c rename to xbmc/visualizations/Goom/goom2k4-0/src/mmx.c diff --git a/src/visualizations/Goom/goom2k4-0/src/mmx.h b/xbmc/visualizations/Goom/goom2k4-0/src/mmx.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/mmx.h rename to xbmc/visualizations/Goom/goom2k4-0/src/mmx.h diff --git a/src/visualizations/Goom/goom2k4-0/src/motif_goom1.h b/xbmc/visualizations/Goom/goom2k4-0/src/motif_goom1.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/motif_goom1.h rename to xbmc/visualizations/Goom/goom2k4-0/src/motif_goom1.h diff --git a/src/visualizations/Goom/goom2k4-0/src/motif_goom2.h b/xbmc/visualizations/Goom/goom2k4-0/src/motif_goom2.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/motif_goom2.h rename to xbmc/visualizations/Goom/goom2k4-0/src/motif_goom2.h diff --git a/src/visualizations/Goom/goom2k4-0/src/plugin_info.c b/xbmc/visualizations/Goom/goom2k4-0/src/plugin_info.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/plugin_info.c rename to xbmc/visualizations/Goom/goom2k4-0/src/plugin_info.c diff --git a/src/visualizations/Goom/goom2k4-0/src/pngload.c b/xbmc/visualizations/Goom/goom2k4-0/src/pngload.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/pngload.c rename to xbmc/visualizations/Goom/goom2k4-0/src/pngload.c diff --git a/src/visualizations/Goom/goom2k4-0/src/powerpc/Copie de ppc_zoom_ultimate.s b/xbmc/visualizations/Goom/goom2k4-0/src/powerpc/Copie de ppc_zoom_ultimate.s similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/powerpc/Copie de ppc_zoom_ultimate.s rename to xbmc/visualizations/Goom/goom2k4-0/src/powerpc/Copie de ppc_zoom_ultimate.s diff --git a/src/visualizations/Goom/goom2k4-0/src/powerpc/ppc_doubling.s b/xbmc/visualizations/Goom/goom2k4-0/src/powerpc/ppc_doubling.s similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/powerpc/ppc_doubling.s rename to xbmc/visualizations/Goom/goom2k4-0/src/powerpc/ppc_doubling.s diff --git a/src/visualizations/Goom/goom2k4-0/src/ppc_drawings.h b/xbmc/visualizations/Goom/goom2k4-0/src/ppc_drawings.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/ppc_drawings.h rename to xbmc/visualizations/Goom/goom2k4-0/src/ppc_drawings.h diff --git a/src/visualizations/Goom/goom2k4-0/src/ppc_drawings.s b/xbmc/visualizations/Goom/goom2k4-0/src/ppc_drawings.s similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/ppc_drawings.s rename to xbmc/visualizations/Goom/goom2k4-0/src/ppc_drawings.s diff --git a/src/visualizations/Goom/goom2k4-0/src/ppc_zoom_ultimate.h b/xbmc/visualizations/Goom/goom2k4-0/src/ppc_zoom_ultimate.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/ppc_zoom_ultimate.h rename to xbmc/visualizations/Goom/goom2k4-0/src/ppc_zoom_ultimate.h diff --git a/src/visualizations/Goom/goom2k4-0/src/ppc_zoom_ultimate.s b/xbmc/visualizations/Goom/goom2k4-0/src/ppc_zoom_ultimate.s similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/ppc_zoom_ultimate.s rename to xbmc/visualizations/Goom/goom2k4-0/src/ppc_zoom_ultimate.s diff --git a/src/visualizations/Goom/goom2k4-0/src/sound_tester.c b/xbmc/visualizations/Goom/goom2k4-0/src/sound_tester.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/sound_tester.c rename to xbmc/visualizations/Goom/goom2k4-0/src/sound_tester.c diff --git a/src/visualizations/Goom/goom2k4-0/src/sound_tester.h b/xbmc/visualizations/Goom/goom2k4-0/src/sound_tester.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/sound_tester.h rename to xbmc/visualizations/Goom/goom2k4-0/src/sound_tester.h diff --git a/src/visualizations/Goom/goom2k4-0/src/surf3d.c b/xbmc/visualizations/Goom/goom2k4-0/src/surf3d.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/surf3d.c rename to xbmc/visualizations/Goom/goom2k4-0/src/surf3d.c diff --git a/src/visualizations/Goom/goom2k4-0/src/surf3d.h b/xbmc/visualizations/Goom/goom2k4-0/src/surf3d.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/surf3d.h rename to xbmc/visualizations/Goom/goom2k4-0/src/surf3d.h diff --git a/src/visualizations/Goom/goom2k4-0/src/surf3d.s b/xbmc/visualizations/Goom/goom2k4-0/src/surf3d.s similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/surf3d.s rename to xbmc/visualizations/Goom/goom2k4-0/src/surf3d.s diff --git a/src/visualizations/Goom/goom2k4-0/src/tentacle3d.c b/xbmc/visualizations/Goom/goom2k4-0/src/tentacle3d.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/tentacle3d.c rename to xbmc/visualizations/Goom/goom2k4-0/src/tentacle3d.c diff --git a/src/visualizations/Goom/goom2k4-0/src/tentacle3d.h b/xbmc/visualizations/Goom/goom2k4-0/src/tentacle3d.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/tentacle3d.h rename to xbmc/visualizations/Goom/goom2k4-0/src/tentacle3d.h diff --git a/src/visualizations/Goom/goom2k4-0/src/v3d.c b/xbmc/visualizations/Goom/goom2k4-0/src/v3d.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/v3d.c rename to xbmc/visualizations/Goom/goom2k4-0/src/v3d.c diff --git a/src/visualizations/Goom/goom2k4-0/src/v3d.h b/xbmc/visualizations/Goom/goom2k4-0/src/v3d.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/v3d.h rename to xbmc/visualizations/Goom/goom2k4-0/src/v3d.h diff --git a/src/visualizations/Goom/goom2k4-0/src/xmmx.c b/xbmc/visualizations/Goom/goom2k4-0/src/xmmx.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/xmmx.c rename to xbmc/visualizations/Goom/goom2k4-0/src/xmmx.c diff --git a/src/visualizations/Goom/goom2k4-0/src/xmmx.h b/xbmc/visualizations/Goom/goom2k4-0/src/xmmx.h similarity index 100% rename from src/visualizations/Goom/goom2k4-0/src/xmmx.h rename to xbmc/visualizations/Goom/goom2k4-0/src/xmmx.h diff --git a/src/visualizations/Goom/goom2k4-0/test/testapp.c b/xbmc/visualizations/Goom/goom2k4-0/test/testapp.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/test/testapp.c rename to xbmc/visualizations/Goom/goom2k4-0/test/testapp.c diff --git a/src/visualizations/Goom/goom2k4-0/tools/Makefile.devel b/xbmc/visualizations/Goom/goom2k4-0/tools/Makefile.devel similarity index 100% rename from src/visualizations/Goom/goom2k4-0/tools/Makefile.devel rename to xbmc/visualizations/Goom/goom2k4-0/tools/Makefile.devel diff --git a/src/visualizations/Goom/goom2k4-0/tools/gfont.c b/xbmc/visualizations/Goom/goom2k4-0/tools/gfont.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/tools/gfont.c rename to xbmc/visualizations/Goom/goom2k4-0/tools/gfont.c diff --git a/src/visualizations/Goom/goom2k4-0/tools/minicompress.c b/xbmc/visualizations/Goom/goom2k4-0/tools/minicompress.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/tools/minicompress.c rename to xbmc/visualizations/Goom/goom2k4-0/tools/minicompress.c diff --git a/src/visualizations/Goom/goom2k4-0/tools/xmms-goom.spec b/xbmc/visualizations/Goom/goom2k4-0/tools/xmms-goom.spec similarity index 100% rename from src/visualizations/Goom/goom2k4-0/tools/xmms-goom.spec rename to xbmc/visualizations/Goom/goom2k4-0/tools/xmms-goom.spec diff --git a/src/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.am b/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.am similarity index 100% rename from src/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.am rename to xbmc/visualizations/Goom/goom2k4-0/xmms-goom/Makefile.am diff --git a/src/visualizations/Goom/goom2k4-0/xmms-goom/xmms_goom.c b/xbmc/visualizations/Goom/goom2k4-0/xmms-goom/xmms_goom.c similarity index 100% rename from src/visualizations/Goom/goom2k4-0/xmms-goom/xmms_goom.c rename to xbmc/visualizations/Goom/goom2k4-0/xmms-goom/xmms_goom.c diff --git a/src/visualizations/Goom/goom_config.h b/xbmc/visualizations/Goom/goom_config.h similarity index 100% rename from src/visualizations/Goom/goom_config.h rename to xbmc/visualizations/Goom/goom_config.h diff --git a/src/visualizations/Goom/visualization.goom/addon.xml b/xbmc/visualizations/Goom/visualization.goom/addon.xml similarity index 100% rename from src/visualizations/Goom/visualization.goom/addon.xml rename to xbmc/visualizations/Goom/visualization.goom/addon.xml diff --git a/src/visualizations/Goom/visualization.goom/icon.png b/xbmc/visualizations/Goom/visualization.goom/icon.png similarity index 100% rename from src/visualizations/Goom/visualization.goom/icon.png rename to xbmc/visualizations/Goom/visualization.goom/icon.png diff --git a/src/visualizations/Milkdrop/MilkdropXBMC.cpp b/xbmc/visualizations/Milkdrop/MilkdropXBMC.cpp similarity index 100% rename from src/visualizations/Milkdrop/MilkdropXBMC.cpp rename to xbmc/visualizations/Milkdrop/MilkdropXBMC.cpp diff --git a/src/visualizations/Milkdrop/Plugin.sln b/xbmc/visualizations/Milkdrop/Plugin.sln similarity index 100% rename from src/visualizations/Milkdrop/Plugin.sln rename to xbmc/visualizations/Milkdrop/Plugin.sln diff --git a/src/visualizations/Milkdrop/Plugin.vcxproj b/xbmc/visualizations/Milkdrop/Plugin.vcxproj similarity index 100% rename from src/visualizations/Milkdrop/Plugin.vcxproj rename to xbmc/visualizations/Milkdrop/Plugin.vcxproj diff --git a/src/visualizations/Milkdrop/Plugin.vcxproj.filters b/xbmc/visualizations/Milkdrop/Plugin.vcxproj.filters similarity index 100% rename from src/visualizations/Milkdrop/Plugin.vcxproj.filters rename to xbmc/visualizations/Milkdrop/Plugin.vcxproj.filters diff --git a/src/visualizations/Milkdrop/XmlDocument.cpp b/xbmc/visualizations/Milkdrop/XmlDocument.cpp similarity index 100% rename from src/visualizations/Milkdrop/XmlDocument.cpp rename to xbmc/visualizations/Milkdrop/XmlDocument.cpp diff --git a/src/visualizations/Milkdrop/XmlDocument.h b/xbmc/visualizations/Milkdrop/XmlDocument.h similarity index 100% rename from src/visualizations/Milkdrop/XmlDocument.h rename to xbmc/visualizations/Milkdrop/XmlDocument.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/LICENSE.TXT b/xbmc/visualizations/Milkdrop/vis_milkdrop/LICENSE.TXT similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/LICENSE.TXT rename to xbmc/visualizations/Milkdrop/vis_milkdrop/LICENSE.TXT diff --git a/src/visualizations/Milkdrop/vis_milkdrop/defines.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/defines.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/defines.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/defines.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/dxcontext.cpp b/xbmc/visualizations/Milkdrop/vis_milkdrop/dxcontext.cpp similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/dxcontext.cpp rename to xbmc/visualizations/Milkdrop/vis_milkdrop/dxcontext.cpp diff --git a/src/visualizations/Milkdrop/vis_milkdrop/dxcontext.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/dxcontext.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/dxcontext.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/dxcontext.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/CAL_TAB.C b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/CAL_TAB.C similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/CAL_TAB.C rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/CAL_TAB.C diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.c b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.c similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.c rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.c diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Compiler.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/Gettok.c b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Gettok.c similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/Gettok.c rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Gettok.c diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/LEX.H b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/LEX.H similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/LEX.H rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/LEX.H diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/LLSAVE.C b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/LLSAVE.C similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/LLSAVE.C rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/LLSAVE.C diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/Lexget.c b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Lexget.c similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/Lexget.c rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Lexget.c diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/Lexswi.c b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Lexswi.c similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/Lexswi.c rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Lexswi.c diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/Lextab.c b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Lextab.c similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/Lextab.c rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Lextab.c diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/Lmovb.c b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Lmovb.c similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/Lmovb.c rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Lmovb.c diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/Scan.l b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Scan.l similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/Scan.l rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Scan.l diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/Yylex.c b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Yylex.c similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/Yylex.c rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/Yylex.c diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/cal.y b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/cal.y similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/cal.y rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/cal.y diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/cal_tab.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/cal_tab.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/cal_tab.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/cal_tab.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/cfunc.c b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/cfunc.c similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/cfunc.c rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/cfunc.c diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/eval.c b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/eval.c similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/eval.c rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/eval.c diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/eval.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/eval.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/eval.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/eval.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/makel.bat b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/makel.bat similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/makel.bat rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/makel.bat diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/makey.bat b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/makey.bat similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/makey.bat rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/makey.bat diff --git a/src/visualizations/Milkdrop/vis_milkdrop/evallib/readme.txt b/xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/readme.txt similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/evallib/readme.txt rename to xbmc/visualizations/Milkdrop/vis_milkdrop/evallib/readme.txt diff --git a/src/visualizations/Milkdrop/vis_milkdrop/fft.cpp b/xbmc/visualizations/Milkdrop/vis_milkdrop/fft.cpp similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/fft.cpp rename to xbmc/visualizations/Milkdrop/vis_milkdrop/fft.cpp diff --git a/src/visualizations/Milkdrop/vis_milkdrop/fft.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/fft.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/fft.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/fft.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/md_defines.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/md_defines.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/md_defines.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/md_defines.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/milkdropfs.cpp b/xbmc/visualizations/Milkdrop/vis_milkdrop/milkdropfs.cpp similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/milkdropfs.cpp rename to xbmc/visualizations/Milkdrop/vis_milkdrop/milkdropfs.cpp diff --git a/src/visualizations/Milkdrop/vis_milkdrop/plugin.cpp b/xbmc/visualizations/Milkdrop/vis_milkdrop/plugin.cpp similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/plugin.cpp rename to xbmc/visualizations/Milkdrop/vis_milkdrop/plugin.cpp diff --git a/src/visualizations/Milkdrop/vis_milkdrop/plugin.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/plugin.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/plugin.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/plugin.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/pluginshell.cpp b/xbmc/visualizations/Milkdrop/vis_milkdrop/pluginshell.cpp similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/pluginshell.cpp rename to xbmc/visualizations/Milkdrop/vis_milkdrop/pluginshell.cpp diff --git a/src/visualizations/Milkdrop/vis_milkdrop/pluginshell.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/pluginshell.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/pluginshell.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/pluginshell.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/shell_defines.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/shell_defines.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/shell_defines.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/shell_defines.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/state.cpp b/xbmc/visualizations/Milkdrop/vis_milkdrop/state.cpp similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/state.cpp rename to xbmc/visualizations/Milkdrop/vis_milkdrop/state.cpp diff --git a/src/visualizations/Milkdrop/vis_milkdrop/state.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/state.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/state.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/state.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/support.cpp b/xbmc/visualizations/Milkdrop/vis_milkdrop/support.cpp similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/support.cpp rename to xbmc/visualizations/Milkdrop/vis_milkdrop/support.cpp diff --git a/src/visualizations/Milkdrop/vis_milkdrop/support.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/support.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/support.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/support.h diff --git a/src/visualizations/Milkdrop/vis_milkdrop/utility.cpp b/xbmc/visualizations/Milkdrop/vis_milkdrop/utility.cpp similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/utility.cpp rename to xbmc/visualizations/Milkdrop/vis_milkdrop/utility.cpp diff --git a/src/visualizations/Milkdrop/vis_milkdrop/utility.h b/xbmc/visualizations/Milkdrop/vis_milkdrop/utility.h similarity index 100% rename from src/visualizations/Milkdrop/vis_milkdrop/utility.h rename to xbmc/visualizations/Milkdrop/vis_milkdrop/utility.h diff --git a/src/visualizations/OpenGLSpectrum/Makefile.in b/xbmc/visualizations/OpenGLSpectrum/Makefile.in similarity index 100% rename from src/visualizations/OpenGLSpectrum/Makefile.in rename to xbmc/visualizations/OpenGLSpectrum/Makefile.in diff --git a/src/visualizations/OpenGLSpectrum/opengl_spectrum.cpp b/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.cpp similarity index 100% rename from src/visualizations/OpenGLSpectrum/opengl_spectrum.cpp rename to xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.cpp diff --git a/src/visualizations/OpenGLSpectrum/opengl_spectrum.h b/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.h similarity index 100% rename from src/visualizations/OpenGLSpectrum/opengl_spectrum.h rename to xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.h diff --git a/src/visualizations/OpenGLSpectrum/opengl_spectrum.sln b/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.sln similarity index 100% rename from src/visualizations/OpenGLSpectrum/opengl_spectrum.sln rename to xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.sln diff --git a/src/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj b/xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj similarity index 100% rename from src/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj rename to xbmc/visualizations/OpenGLSpectrum/opengl_spectrum.vcproj diff --git a/src/visualizations/Vortex/StandAlone/StandAlone.cpp b/xbmc/visualizations/Vortex/StandAlone/StandAlone.cpp similarity index 100% rename from src/visualizations/Vortex/StandAlone/StandAlone.cpp rename to xbmc/visualizations/Vortex/StandAlone/StandAlone.cpp diff --git a/src/visualizations/Vortex/Vortex/Vortex.sln b/xbmc/visualizations/Vortex/Vortex/Vortex.sln similarity index 100% rename from src/visualizations/Vortex/Vortex/Vortex.sln rename to xbmc/visualizations/Vortex/Vortex/Vortex.sln diff --git a/src/visualizations/Vortex/Vortex/Vortex.vcxproj b/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj similarity index 100% rename from src/visualizations/Vortex/Vortex/Vortex.vcxproj rename to xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj diff --git a/src/visualizations/Vortex/Vortex/Vortex.vcxproj.filters b/xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.filters similarity index 100% rename from src/visualizations/Vortex/Vortex/Vortex.vcxproj.filters rename to xbmc/visualizations/Vortex/Vortex/Vortex.vcxproj.filters diff --git a/src/visualizations/Vortex/VortexVis/Core/DebugConsole.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/DebugConsole.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/DebugConsole.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/DebugConsole.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/DebugConsole.h b/xbmc/visualizations/Vortex/VortexVis/Core/DebugConsole.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/DebugConsole.h rename to xbmc/visualizations/Vortex/VortexVis/Core/DebugConsole.h diff --git a/src/visualizations/Vortex/VortexVis/Core/EffectBase.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/EffectBase.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/EffectBase.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/EffectBase.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/EffectBase.h b/xbmc/visualizations/Vortex/VortexVis/Core/EffectBase.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/EffectBase.h rename to xbmc/visualizations/Vortex/VortexVis/Core/EffectBase.h diff --git a/src/visualizations/Vortex/VortexVis/Core/Mesh.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Mesh.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/Mesh.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/Mesh.h b/xbmc/visualizations/Vortex/VortexVis/Core/Mesh.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Mesh.h rename to xbmc/visualizations/Vortex/VortexVis/Core/Mesh.h diff --git a/src/visualizations/Vortex/VortexVis/Core/Preset.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Preset.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Preset.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/Preset.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/Preset.h b/xbmc/visualizations/Vortex/VortexVis/Core/Preset.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Preset.h rename to xbmc/visualizations/Vortex/VortexVis/Core/Preset.h diff --git a/src/visualizations/Vortex/VortexVis/Core/Renderer.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Renderer.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Renderer.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/Renderer.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/Renderer.h b/xbmc/visualizations/Vortex/VortexVis/Core/Renderer.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Renderer.h rename to xbmc/visualizations/Vortex/VortexVis/Core/Renderer.h diff --git a/src/visualizations/Vortex/VortexVis/Core/Shader.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Shader.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Shader.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/Shader.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/Shader.h b/xbmc/visualizations/Vortex/VortexVis/Core/Shader.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Shader.h rename to xbmc/visualizations/Vortex/VortexVis/Core/Shader.h diff --git a/src/visualizations/Vortex/VortexVis/Core/Texture.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Texture.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Texture.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/Texture.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/Texture.h b/xbmc/visualizations/Vortex/VortexVis/Core/Texture.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Texture.h rename to xbmc/visualizations/Vortex/VortexVis/Core/Texture.h diff --git a/src/visualizations/Vortex/VortexVis/Core/Vortex.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Vortex.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/Vortex.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/Vortex.h b/xbmc/visualizations/Vortex/VortexVis/Core/Vortex.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/Vortex.h rename to xbmc/visualizations/Vortex/VortexVis/Core/Vortex.h diff --git a/src/visualizations/Vortex/VortexVis/Core/XBMCTypes.h b/xbmc/visualizations/Vortex/VortexVis/Core/XBMCTypes.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/XBMCTypes.h rename to xbmc/visualizations/Vortex/VortexVis/Core/XBMCTypes.h diff --git a/src/visualizations/Vortex/VortexVis/Core/XmlDocument.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/XmlDocument.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/XmlDocument.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/XmlDocument.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/XmlDocument.h b/xbmc/visualizations/Vortex/VortexVis/Core/XmlDocument.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/XmlDocument.h rename to xbmc/visualizations/Vortex/VortexVis/Core/XmlDocument.h diff --git a/src/visualizations/Vortex/VortexVis/Core/fft.cpp b/xbmc/visualizations/Vortex/VortexVis/Core/fft.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/fft.cpp rename to xbmc/visualizations/Vortex/VortexVis/Core/fft.cpp diff --git a/src/visualizations/Vortex/VortexVis/Core/fft.h b/xbmc/visualizations/Vortex/VortexVis/Core/fft.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Core/fft.h rename to xbmc/visualizations/Vortex/VortexVis/Core/fft.h diff --git a/src/visualizations/Vortex/VortexVis/Effects/Map.cpp b/xbmc/visualizations/Vortex/VortexVis/Effects/Map.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Effects/Map.cpp rename to xbmc/visualizations/Vortex/VortexVis/Effects/Map.cpp diff --git a/src/visualizations/Vortex/VortexVis/Effects/Map.h b/xbmc/visualizations/Vortex/VortexVis/Effects/Map.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Effects/Map.h rename to xbmc/visualizations/Vortex/VortexVis/Effects/Map.h diff --git a/src/visualizations/Vortex/VortexVis/Effects/Tunnel.cpp b/xbmc/visualizations/Vortex/VortexVis/Effects/Tunnel.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Effects/Tunnel.cpp rename to xbmc/visualizations/Vortex/VortexVis/Effects/Tunnel.cpp diff --git a/src/visualizations/Vortex/VortexVis/Effects/Tunnel.h b/xbmc/visualizations/Vortex/VortexVis/Effects/Tunnel.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Effects/Tunnel.h rename to xbmc/visualizations/Vortex/VortexVis/Effects/Tunnel.h diff --git a/src/visualizations/Vortex/VortexVis/Effects/VoicePrint.cpp b/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.cpp similarity index 100% rename from src/visualizations/Vortex/VortexVis/Effects/VoicePrint.cpp rename to xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.cpp diff --git a/src/visualizations/Vortex/VortexVis/Effects/VoicePrint.h b/xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.h similarity index 100% rename from src/visualizations/Vortex/VortexVis/Effects/VoicePrint.h rename to xbmc/visualizations/Vortex/VortexVis/Effects/VoicePrint.h diff --git a/src/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp b/xbmc/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp similarity index 100% rename from src/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp rename to xbmc/visualizations/Vortex/VortexXBMC/VortexXBMC.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/autowrapper/aswrappedcall.h b/xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/aswrappedcall.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/autowrapper/aswrappedcall.h rename to xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/aswrappedcall.h diff --git a/src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generateheader.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generateheader.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generateheader.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generateheader.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.dsp b/xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.dsp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.dsp rename to xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.dsp diff --git a/src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.dsw b/xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.dsw similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.dsw rename to xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.dsw diff --git a/src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.sln b/xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.sln similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.sln rename to xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.sln diff --git a/src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.vcproj b/xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.vcproj similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.vcproj rename to xbmc/visualizations/Vortex/angelscript/add_on/autowrapper/generator/generator.vcproj diff --git a/src/visualizations/Vortex/angelscript/add_on/clib/angelscript_c.h b/xbmc/visualizations/Vortex/angelscript/add_on/clib/angelscript_c.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/clib/angelscript_c.h rename to xbmc/visualizations/Vortex/angelscript/add_on/clib/angelscript_c.h diff --git a/src/visualizations/Vortex/angelscript/add_on/clib/as_c.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/clib/as_c.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/clib/as_c.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/clib/as_c.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/clib/dllmain.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/clib/dllmain.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/clib/dllmain.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/clib/dllmain.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/clib/projects/msvc6/msvc6.dsp b/xbmc/visualizations/Vortex/angelscript/add_on/clib/projects/msvc6/msvc6.dsp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/clib/projects/msvc6/msvc6.dsp rename to xbmc/visualizations/Vortex/angelscript/add_on/clib/projects/msvc6/msvc6.dsp diff --git a/src/visualizations/Vortex/angelscript/add_on/clib/projects/msvc6/msvc6.dsw b/xbmc/visualizations/Vortex/angelscript/add_on/clib/projects/msvc6/msvc6.dsw similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/clib/projects/msvc6/msvc6.dsw rename to xbmc/visualizations/Vortex/angelscript/add_on/clib/projects/msvc6/msvc6.dsw diff --git a/src/visualizations/Vortex/angelscript/add_on/contextmgr/contextmgr.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/contextmgr/contextmgr.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/contextmgr/contextmgr.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/contextmgr/contextmgr.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/contextmgr/contextmgr.h b/xbmc/visualizations/Vortex/angelscript/add_on/contextmgr/contextmgr.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/contextmgr/contextmgr.h rename to xbmc/visualizations/Vortex/angelscript/add_on/contextmgr/contextmgr.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptany/scriptany.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptany/scriptany.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptany/scriptany.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptany/scriptany.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptany/scriptany.h b/xbmc/visualizations/Vortex/angelscript/add_on/scriptany/scriptany.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptany/scriptany.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptany/scriptany.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptarray/scriptarray.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptarray/scriptarray.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptarray/scriptarray.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptarray/scriptarray.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptarray/scriptarray.h b/xbmc/visualizations/Vortex/angelscript/add_on/scriptarray/scriptarray.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptarray/scriptarray.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptarray/scriptarray.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptbuilder/scriptbuilder.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptbuilder/scriptbuilder.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptbuilder/scriptbuilder.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptbuilder/scriptbuilder.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptbuilder/scriptbuilder.h b/xbmc/visualizations/Vortex/angelscript/add_on/scriptbuilder/scriptbuilder.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptbuilder/scriptbuilder.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptbuilder/scriptbuilder.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptdictionary/scriptdictionary.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptdictionary/scriptdictionary.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptdictionary/scriptdictionary.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptdictionary/scriptdictionary.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptdictionary/scriptdictionary.h b/xbmc/visualizations/Vortex/angelscript/add_on/scriptdictionary/scriptdictionary.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptdictionary/scriptdictionary.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptdictionary/scriptdictionary.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptfile/scriptfile.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptfile/scriptfile.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptfile/scriptfile.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptfile/scriptfile.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptfile/scriptfile.h b/xbmc/visualizations/Vortex/angelscript/add_on/scriptfile/scriptfile.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptfile/scriptfile.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptfile/scriptfile.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scripthelper/scripthelper.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scripthelper/scripthelper.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scripthelper/scripthelper.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scripthelper/scripthelper.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scripthelper/scripthelper.h b/xbmc/visualizations/Vortex/angelscript/add_on/scripthelper/scripthelper.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scripthelper/scripthelper.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scripthelper/scripthelper.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptmath/scriptmath.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptmath/scriptmath.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptmath/scriptmath.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptmath/scriptmath.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptmath/scriptmath.h b/xbmc/visualizations/Vortex/angelscript/add_on/scriptmath/scriptmath.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptmath/scriptmath.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptmath/scriptmath.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptmath3d/scriptmath3d.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptmath3d/scriptmath3d.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptmath3d/scriptmath3d.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptmath3d/scriptmath3d.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptmath3d/scriptmath3d.h b/xbmc/visualizations/Vortex/angelscript/add_on/scriptmath3d/scriptmath3d.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptmath3d/scriptmath3d.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptmath3d/scriptmath3d.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptstdstring/scriptstdstring.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptstdstring/scriptstdstring.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptstdstring/scriptstdstring.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptstdstring/scriptstdstring.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptstdstring/scriptstdstring.h b/xbmc/visualizations/Vortex/angelscript/add_on/scriptstdstring/scriptstdstring.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptstdstring/scriptstdstring.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptstdstring/scriptstdstring.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring.cpp diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring.h b/xbmc/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring.h similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring.h rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring.h diff --git a/src/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring_utils.cpp b/xbmc/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring_utils.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring_utils.cpp rename to xbmc/visualizations/Vortex/angelscript/add_on/scriptstring/scriptstring_utils.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/include/angelscript.h b/xbmc/visualizations/Vortex/angelscript/angelscript/include/angelscript.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/include/angelscript.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/include/angelscript.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/lib/angelscript.lib b/xbmc/visualizations/Vortex/angelscript/angelscript/lib/angelscript.lib similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/lib/angelscript.lib rename to xbmc/visualizations/Vortex/angelscript/angelscript/lib/angelscript.lib diff --git a/src/visualizations/Vortex/angelscript/angelscript/lib/delete.me b/xbmc/visualizations/Vortex/angelscript/angelscript/lib/delete.me similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/lib/delete.me rename to xbmc/visualizations/Vortex/angelscript/angelscript/lib/delete.me diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/android/Android.mk b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/android/Android.mk similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/android/Android.mk rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/android/Android.mk diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/codeblocks/angelscript.cbp b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/codeblocks/angelscript.cbp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/codeblocks/angelscript.cbp rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/codeblocks/angelscript.cbp diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/AngelScript.dev b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/AngelScript.dev similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/AngelScript.dev rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/AngelScript.dev diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/Makefile.win b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/Makefile.win similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/Makefile.win rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/Makefile.win diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/obj/delete.me b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/obj/delete.me similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/obj/delete.me rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/dev-cpp/obj/delete.me diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/Makefile b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/Makefile similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/Makefile rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/Makefile diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/obj/delete.me b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/obj/delete.me similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/obj/delete.me rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/obj/delete.me diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/readme.txt b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/readme.txt similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/readme.txt rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/dreamcast/readme.txt diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/gnuc/makefile b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/gnuc/makefile similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/gnuc/makefile rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/gnuc/makefile diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/gnuc/obj/delete.me b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/gnuc/obj/delete.me similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/gnuc/obj/delete.me rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/gnuc/obj/delete.me diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/gnuc/readme.txt b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/gnuc/readme.txt similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/gnuc/readme.txt rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/gnuc/readme.txt diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/mingw/makefile b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/mingw/makefile similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/mingw/makefile rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/mingw/makefile diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/mingw/obj/delete.me b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/mingw/obj/delete.me similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/mingw/obj/delete.me rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/mingw/obj/delete.me diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/mingw/readme.txt b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/mingw/readme.txt similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/mingw/readme.txt rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/mingw/readme.txt diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/msvc6/angelscript.dsw b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc6/angelscript.dsw similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/msvc6/angelscript.dsw rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc6/angelscript.dsw diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/msvc6/lib/angelscript.dsp b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc6/lib/angelscript.dsp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/msvc6/lib/angelscript.dsp rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc6/lib/angelscript.dsp diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/msvc7/msvc7.sln b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc7/msvc7.sln similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/msvc7/msvc7.sln rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc7/msvc7.sln diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/msvc7/msvc7.vcproj b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc7/msvc7.vcproj similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/msvc7/msvc7.vcproj rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc7/msvc7.vcproj diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/msvc8/angelscript.sln b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc8/angelscript.sln similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/msvc8/angelscript.sln rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc8/angelscript.sln diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/msvc8/angelscript.vcproj b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc8/angelscript.vcproj similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/msvc8/angelscript.vcproj rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc8/angelscript.vcproj diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/msvc9/angelscript.sln b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc9/angelscript.sln similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/msvc9/angelscript.sln rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc9/angelscript.sln diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/msvc9/angelscript.vcproj b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc9/angelscript.vcproj similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/msvc9/angelscript.vcproj rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/msvc9/angelscript.vcproj diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/trolltechqt/angelscript.pro b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/trolltechqt/angelscript.pro similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/trolltechqt/angelscript.pro rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/trolltechqt/angelscript.pro diff --git a/src/visualizations/Vortex/angelscript/angelscript/projects/xcode/angelscript.xcodeproj/project.pbxproj b/xbmc/visualizations/Vortex/angelscript/angelscript/projects/xcode/angelscript.xcodeproj/project.pbxproj similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/projects/xcode/angelscript.xcodeproj/project.pbxproj rename to xbmc/visualizations/Vortex/angelscript/angelscript/projects/xcode/angelscript.xcodeproj/project.pbxproj diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_array.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_array.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_array.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_array.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_arrayobject.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_arrayobject.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_arrayobject.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_arrayobject.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_arrayobject.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_arrayobject.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_arrayobject.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_arrayobject.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_atomic.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_atomic.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_atomic.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_atomic.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_atomic.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_atomic.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_atomic.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_atomic.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_builder.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_builder.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_builder.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_builder.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_builder.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_builder.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_builder.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_builder.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_bytecode.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_bytecode.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_bytecode.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_bytecode.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_bytecode.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_bytecode.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_bytecode.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_bytecode.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_gcc.S b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_gcc.S similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_gcc.S rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_gcc.S diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_msvc.asm b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_msvc.asm similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_msvc.asm rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_msvc.asm diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_xcode.s b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_xcode.s similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_xcode.s rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_arm_xcode.s diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_mips.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_mips.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_mips.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_mips.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_ppc.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_ppc.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_ppc.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_ppc.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_ppc_64.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_ppc_64.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_ppc_64.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_ppc_64.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_sh4.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_sh4.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_sh4.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_sh4.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_x64_gcc.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_x64_gcc.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_x64_gcc.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_x64_gcc.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_x86.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_x86.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_x86.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_x86.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_xenon.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_xenon.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_xenon.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_callfunc_xenon.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_compiler.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_compiler.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_compiler.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_compiler.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_compiler.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_compiler.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_compiler.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_compiler.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_config.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_config.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_config.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_config.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_configgroup.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_configgroup.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_configgroup.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_configgroup.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_configgroup.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_configgroup.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_configgroup.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_configgroup.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_context.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_context.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_context.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_context.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_context.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_context.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_context.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_context.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_criticalsection.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_criticalsection.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_criticalsection.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_criticalsection.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_datatype.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_datatype.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_datatype.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_datatype.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_datatype.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_datatype.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_datatype.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_datatype.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_debug.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_debug.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_debug.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_debug.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_gc.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_gc.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_gc.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_gc.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_gc.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_gc.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_gc.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_gc.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_generic.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_generic.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_generic.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_generic.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_generic.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_generic.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_generic.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_generic.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_globalproperty.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_globalproperty.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_globalproperty.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_globalproperty.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_map.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_map.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_map.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_map.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_memory.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_memory.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_memory.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_memory.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_memory.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_memory.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_memory.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_memory.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_module.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_module.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_module.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_module.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_module.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_module.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_module.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_module.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_objecttype.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_objecttype.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_objecttype.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_objecttype.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_objecttype.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_objecttype.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_objecttype.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_objecttype.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_outputbuffer.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_outputbuffer.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_outputbuffer.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_outputbuffer.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_outputbuffer.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_outputbuffer.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_outputbuffer.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_outputbuffer.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_parser.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_parser.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_parser.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_parser.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_parser.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_parser.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_parser.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_parser.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_property.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_property.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_property.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_property.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_restore.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_restore.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_restore.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_restore.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_restore.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_restore.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_restore.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_restore.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptcode.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptcode.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptcode.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptcode.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptcode.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptcode.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptcode.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptcode.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptengine.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptengine.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptengine.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptengine.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptengine.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptengine.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptengine.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptengine.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptfunction.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptfunction.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptfunction.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptfunction.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptfunction.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptfunction.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptfunction.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptfunction.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptnode.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptnode.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptnode.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptnode.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptnode.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptnode.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptnode.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptnode.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptobject.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptobject.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptobject.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptobject.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_scriptobject.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptobject.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_scriptobject.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_scriptobject.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_string.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_string.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_string.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_string.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_string.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_string.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_string.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_string.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_string_util.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_string_util.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_string_util.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_string_util.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_string_util.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_string_util.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_string_util.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_string_util.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_texts.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_texts.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_texts.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_texts.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_thread.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_thread.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_thread.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_thread.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_thread.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_thread.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_thread.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_thread.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_tokendef.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_tokendef.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_tokendef.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_tokendef.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_tokenizer.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_tokenizer.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_tokenizer.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_tokenizer.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_tokenizer.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_tokenizer.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_tokenizer.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_tokenizer.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_typeinfo.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_typeinfo.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_typeinfo.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_typeinfo.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_typeinfo.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_typeinfo.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_typeinfo.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_typeinfo.h diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_variablescope.cpp b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_variablescope.cpp similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_variablescope.cpp rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_variablescope.cpp diff --git a/src/visualizations/Vortex/angelscript/angelscript/source/as_variablescope.h b/xbmc/visualizations/Vortex/angelscript/angelscript/source/as_variablescope.h similarity index 100% rename from src/visualizations/Vortex/angelscript/angelscript/source/as_variablescope.h rename to xbmc/visualizations/Vortex/angelscript/angelscript/source/as_variablescope.h diff --git a/src/visualizations/Vortex/angelscript/docs/articles/changes0.html b/xbmc/visualizations/Vortex/angelscript/docs/articles/changes0.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/articles/changes0.html rename to xbmc/visualizations/Vortex/angelscript/docs/articles/changes0.html diff --git a/src/visualizations/Vortex/angelscript/docs/articles/changes1.html b/xbmc/visualizations/Vortex/angelscript/docs/articles/changes1.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/articles/changes1.html rename to xbmc/visualizations/Vortex/angelscript/docs/articles/changes1.html diff --git a/src/visualizations/Vortex/angelscript/docs/articles/changes2.html b/xbmc/visualizations/Vortex/angelscript/docs/articles/changes2.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/articles/changes2.html rename to xbmc/visualizations/Vortex/angelscript/docs/articles/changes2.html diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/Doxyfile b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/Doxyfile similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/Doxyfile rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/Doxyfile diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/angelscript.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/angelscript.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/angelscript.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/angelscript.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_addon.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_addon.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_addon.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_addon.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_class_hierarchy.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_class_hierarchy.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_class_hierarchy.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_class_hierarchy.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_concurrent.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_concurrent.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_concurrent.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_concurrent.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_coroutine.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_coroutine.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_coroutine.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_coroutine.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_jit.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_jit.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_jit.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_jit.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_multithread.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_multithread.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_multithread.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_multithread.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_precompile.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_precompile.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_precompile.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_precompile.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_scoped_type.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_scoped_type.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_scoped_type.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_scoped_type.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_single_ref_type.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_single_ref_type.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_single_ref_type.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_single_ref_type.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_template.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_template.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_template.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_template.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_timeout.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_timeout.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_timeout.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_timeout.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_var_type.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_var_type.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_var_type.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_adv_var_type.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_api_functions.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_api_functions.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_api_functions.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_api_functions.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_api_interfaces.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_api_interfaces.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_api_interfaces.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_api_interfaces.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_as_vs_cpp_types.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_as_vs_cpp_types.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_as_vs_cpp_types.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_as_vs_cpp_types.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_call_script_func.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_call_script_func.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_call_script_func.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_call_script_func.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_compile_lib.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_compile_lib.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_compile_lib.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_compile_lib.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_compile_script.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_compile_script.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_compile_script.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_compile_script.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_debug.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_debug.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_debug.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_debug.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_gc.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_gc.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_gc.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_gc.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_gc_object.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_gc_object.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_gc_object.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_gc_object.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_generic.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_generic.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_generic.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_generic.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_good_practice.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_good_practice.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_good_practice.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_good_practice.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_hello_world.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_hello_world.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_hello_world.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_hello_world.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_license.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_license.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_license.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_license.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_main.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_main.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_main.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_main.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_memory.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_memory.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_memory.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_memory.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_obj_handle.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_obj_handle.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_obj_handle.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_obj_handle.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_overview.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_overview.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_overview.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_overview.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_api.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_api.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_api.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_api.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_func.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_func.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_func.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_func.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_prop.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_prop.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_prop.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_prop.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_type.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_type.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_type.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_register_type.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_samples.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_samples.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_samples.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_samples.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class_ops.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class_ops.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class_ops.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class_ops.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class_prop.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class_prop.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class_prop.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_class_prop.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_datatypes.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_datatypes.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_datatypes.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_datatypes.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_expr.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_expr.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_expr.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_expr.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_global.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_global.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_global.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_global.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_handle.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_handle.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_handle.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_handle.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_precedence.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_precedence.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_precedence.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_precedence.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_reserved.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_reserved.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_reserved.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_reserved.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_statement.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_statement.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_statement.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_script_statement.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_strings.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_strings.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_strings.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_strings.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_understanding_as.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_understanding_as.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_understanding_as.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_understanding_as.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_using_script_class.h b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_using_script_class.h similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/doc_using_script_class.h rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/doc_using_script_class.h diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/logo/aslogo.png b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/logo/aslogo.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/logo/aslogo.png rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/logo/aslogo.png diff --git a/src/visualizations/Vortex/angelscript/docs/doxygen/source/logo/aslogo.svg b/xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/logo/aslogo.svg similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/doxygen/source/logo/aslogo.svg rename to xbmc/visualizations/Vortex/angelscript/docs/doxygen/source/logo/aslogo.svg diff --git a/src/visualizations/Vortex/angelscript/docs/index.html b/xbmc/visualizations/Vortex/angelscript/docs/index.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/index.html rename to xbmc/visualizations/Vortex/angelscript/docs/index.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/angelscript_8h.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/angelscript_8h.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/angelscript_8h.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/angelscript_8h.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/annotated.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/annotated.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/annotated.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/annotated.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/aslogo.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/aslogo.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/aslogo.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/aslogo.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_binary_stream-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_binary_stream-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_binary_stream-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_binary_stream-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_binary_stream.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_binary_stream.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_binary_stream.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_binary_stream.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_j_i_t_compiler-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_j_i_t_compiler-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_j_i_t_compiler-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_j_i_t_compiler-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_j_i_t_compiler.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_j_i_t_compiler.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_j_i_t_compiler.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_j_i_t_compiler.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_object_type-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_object_type-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_object_type-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_object_type-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_object_type.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_object_type.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_object_type.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_object_type.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_array-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_array-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_array-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_array-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_array.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_array.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_array.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_array.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_context-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_context-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_context-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_context-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_context.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_context.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_context.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_context.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_engine-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_engine-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_engine-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_engine-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_engine.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_engine.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_engine.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_engine.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_function-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_function-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_function-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_function-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_function.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_function.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_function.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_function.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_generic-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_generic-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_generic-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_generic-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_generic.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_generic.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_generic.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_generic.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_module-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_module-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_module-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_module-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_module.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_module.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_module.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_module.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_object-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_object-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_object-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_object-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_object.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_object.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classas_i_script_object.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classas_i_script_object.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/classes.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/classes.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/classes.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/classes.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/deprecated.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/deprecated.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/deprecated.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/deprecated.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_any.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_any.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_any.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_any.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_application.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_application.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_application.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_application.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_array.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_array.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_array.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_array.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_autowrap.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_autowrap.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_autowrap.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_autowrap.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_build.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_build.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_build.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_build.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_clib.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_clib.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_clib.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_clib.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_ctxmgr.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_ctxmgr.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_ctxmgr.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_ctxmgr.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_dict.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_dict.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_dict.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_dict.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_file.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_file.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_file.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_file.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_helpers.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_helpers.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_helpers.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_helpers.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_math.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_math.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_math.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_math.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_math3d.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_math3d.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_math3d.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_math3d.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_script.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_script.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_script.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_script.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_std_string.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_std_string.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_std_string.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_std_string.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_addon_string.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_string.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_addon_string.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_addon_string.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_class_hierarchy.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_class_hierarchy.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_class_hierarchy.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_class_hierarchy.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_concurrent.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_concurrent.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_concurrent.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_concurrent.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_coroutine.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_coroutine.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_coroutine.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_coroutine.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_jit.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_jit.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_jit.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_jit.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_jit_1.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_jit_1.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_jit_1.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_jit_1.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_multithread.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_multithread.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_multithread.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_multithread.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_precompile.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_precompile.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_precompile.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_precompile.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_scoped_type.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_scoped_type.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_scoped_type.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_scoped_type.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_single_ref_type.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_single_ref_type.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_single_ref_type.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_single_ref_type.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_template.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_template.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_template.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_template.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_timeout.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_timeout.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_timeout.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_timeout.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_adv_var_type.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_var_type.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_adv_var_type.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_adv_var_type.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_advanced.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_advanced.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_advanced.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_advanced.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_advanced_api.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_advanced_api.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_advanced_api.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_advanced_api.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_api.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_api.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_api.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_api.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_api_functions.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_api_functions.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_api_functions.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_api_functions.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_api_interfaces.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_api_interfaces.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_api_interfaces.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_api_interfaces.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_as_vs_cpp_types.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_as_vs_cpp_types.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_as_vs_cpp_types.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_as_vs_cpp_types.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_call_script_func.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_call_script_func.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_call_script_func.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_call_script_func.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_compile_lib.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_compile_lib.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_compile_lib.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_compile_lib.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_compile_script.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_compile_script.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_compile_script.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_compile_script.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_arrays.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_arrays.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_arrays.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_arrays.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_obj.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_obj.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_obj.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_obj.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_primitives.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_primitives.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_primitives.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_primitives.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_strings.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_strings.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_strings.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_datatypes_strings.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_debug.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_debug.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_debug.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_debug.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_expressions.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_expressions.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_expressions.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_expressions.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_gc.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_gc.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_gc.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_gc.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_gc_object.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_gc_object.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_gc_object.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_gc_object.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_generic.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_generic.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_generic.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_generic.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_global.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_global.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_global.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_global.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_good_practice.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_good_practice.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_good_practice.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_good_practice.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_hello_world.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_hello_world.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_hello_world.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_hello_world.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_license.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_license.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_license.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_license.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_memory.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_memory.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_memory.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_memory.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_obj_handle.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_obj_handle.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_obj_handle.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_obj_handle.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_operator_precedence.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_operator_precedence.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_operator_precedence.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_operator_precedence.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_overview.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_overview.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_overview.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_overview.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_reg_basicref.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reg_basicref.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_reg_basicref.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reg_basicref.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_reg_objmeth.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reg_objmeth.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_reg_objmeth.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reg_objmeth.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_reg_objprop.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reg_objprop.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_reg_objprop.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reg_objprop.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_reg_opbeh.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reg_opbeh.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_reg_opbeh.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reg_opbeh.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_register_api.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_api.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_register_api.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_api.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_register_func.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_func.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_register_func.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_func.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_register_prop.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_prop.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_register_prop.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_prop.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_register_type.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_type.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_register_type.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_type.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_register_val_type.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_val_type.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_register_val_type.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_register_val_type.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_reserved_keywords.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reserved_keywords.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_reserved_keywords.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_reserved_keywords.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_samples.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_samples.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_samples_concurrent.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_concurrent.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_samples_concurrent.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_concurrent.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_samples_console.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_console.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_samples_console.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_console.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_samples_corout.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_corout.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_samples_corout.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_corout.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_samples_events.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_events.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_samples_events.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_events.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_samples_incl.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_incl.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_samples_incl.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_incl.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_samples_tutorial.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_tutorial.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_samples_tutorial.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_samples_tutorial.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_script.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_script.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_script_class.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_class.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_script_class.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_class.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_script_class_main.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_class_main.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_script_class_main.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_class_main.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_script_class_ops.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_class_ops.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_script_class_ops.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_class_ops.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_script_class_prop.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_class_prop.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_script_class_prop.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_class_prop.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_script_handle.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_handle.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_script_handle.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_handle.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_script_statements.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_statements.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_script_statements.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_script_statements.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_start.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_start.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_start.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_start.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_strings.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_strings.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_strings.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_strings.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_understanding_as.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_understanding_as.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_understanding_as.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_understanding_as.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_use_script_class.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_use_script_class.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_use_script_class.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_use_script_class.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doc_using.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/doc_using.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doc_using.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doc_using.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doxygen.css b/xbmc/visualizations/Vortex/angelscript/docs/manual/doxygen.css similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doxygen.css rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doxygen.css diff --git a/src/visualizations/Vortex/angelscript/docs/manual/doxygen.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/doxygen.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/doxygen.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/doxygen.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/files.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/files.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/files.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/files.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2blank.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2blank.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2blank.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2blank.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2doc.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2doc.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2doc.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2doc.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2folderclosed.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2folderclosed.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2folderclosed.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2folderclosed.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2folderopen.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2folderopen.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2folderopen.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2folderopen.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2lastnode.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2lastnode.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2lastnode.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2lastnode.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2link.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2link.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2link.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2link.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2mlastnode.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2mlastnode.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2mlastnode.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2mlastnode.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2mnode.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2mnode.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2mnode.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2mnode.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2node.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2node.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2node.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2node.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2plastnode.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2plastnode.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2plastnode.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2plastnode.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2pnode.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2pnode.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2pnode.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2pnode.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/ftv2vertline.png b/xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2vertline.png similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/ftv2vertline.png rename to xbmc/visualizations/Vortex/angelscript/docs/manual/ftv2vertline.png diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x62.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x62.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x62.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x62.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x63.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x63.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x63.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x63.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x64.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x64.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x64.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x64.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x65.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x65.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x65.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x65.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x67.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x67.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x67.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x67.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x69.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x69.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x69.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x69.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x6c.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x6c.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x6c.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x6c.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x6d.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x6d.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x6d.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x6d.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x6e.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x6e.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x6e.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x6e.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x6f.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x6f.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x6f.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x6f.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x70.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x70.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x70.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x70.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x72.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x72.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x72.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x72.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x73.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x73.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x73.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x73.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x74.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x74.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x74.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x74.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x75.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x75.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x75.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x75.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x76.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x76.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x76.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x76.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_0x77.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x77.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_0x77.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_0x77.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x62.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x62.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x62.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x62.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x63.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x63.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x63.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x63.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x64.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x64.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x64.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x64.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x65.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x65.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x65.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x65.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x67.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x67.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x67.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x67.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x69.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x69.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x69.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x69.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x6c.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x6c.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x6c.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x6c.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x6e.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x6e.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x6e.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x6e.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x70.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x70.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x70.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x70.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x72.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x72.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x72.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x72.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x73.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x73.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x73.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x73.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x75.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x75.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x75.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x75.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x77.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x77.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_func_0x77.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_func_0x77.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/functions_vars.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/functions_vars.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/functions_vars.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/functions_vars.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/globals.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/globals.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/globals.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/globals.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/globals_defs.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/globals_defs.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/globals_defs.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/globals_defs.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/globals_enum.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/globals_enum.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/globals_enum.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/globals_enum.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/globals_eval.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/globals_eval.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/globals_eval.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/globals_eval.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/globals_func.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/globals_func.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/globals_func.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/globals_func.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/globals_type.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/globals_type.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/globals_type.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/globals_type.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/globals_vars.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/globals_vars.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/globals_vars.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/globals_vars.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/index.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/index.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/index.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/index.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/main.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/main.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/main.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/main.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/pages.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/pages.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/pages.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/pages.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/structas_s_b_c_info-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_b_c_info-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/structas_s_b_c_info-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_b_c_info-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/structas_s_b_c_info.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_b_c_info.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/structas_s_b_c_info.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_b_c_info.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/structas_s_func_ptr-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_func_ptr-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/structas_s_func_ptr-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_func_ptr-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/structas_s_func_ptr.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_func_ptr.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/structas_s_func_ptr.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_func_ptr.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/structas_s_message_info-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_message_info-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/structas_s_message_info-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_message_info-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/structas_s_message_info.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_message_info.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/structas_s_message_info.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_message_info.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/structas_s_v_m_registers-members.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_v_m_registers-members.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/structas_s_v_m_registers-members.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_v_m_registers-members.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/structas_s_v_m_registers.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_v_m_registers.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/structas_s_v_m_registers.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/structas_s_v_m_registers.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/tab_b.gif b/xbmc/visualizations/Vortex/angelscript/docs/manual/tab_b.gif similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/tab_b.gif rename to xbmc/visualizations/Vortex/angelscript/docs/manual/tab_b.gif diff --git a/src/visualizations/Vortex/angelscript/docs/manual/tab_l.gif b/xbmc/visualizations/Vortex/angelscript/docs/manual/tab_l.gif similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/tab_l.gif rename to xbmc/visualizations/Vortex/angelscript/docs/manual/tab_l.gif diff --git a/src/visualizations/Vortex/angelscript/docs/manual/tab_r.gif b/xbmc/visualizations/Vortex/angelscript/docs/manual/tab_r.gif similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/tab_r.gif rename to xbmc/visualizations/Vortex/angelscript/docs/manual/tab_r.gif diff --git a/src/visualizations/Vortex/angelscript/docs/manual/tabs.css b/xbmc/visualizations/Vortex/angelscript/docs/manual/tabs.css similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/tabs.css rename to xbmc/visualizations/Vortex/angelscript/docs/manual/tabs.css diff --git a/src/visualizations/Vortex/angelscript/docs/manual/todo.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/todo.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/todo.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/todo.html diff --git a/src/visualizations/Vortex/angelscript/docs/manual/tree.html b/xbmc/visualizations/Vortex/angelscript/docs/manual/tree.html similarity index 100% rename from src/visualizations/Vortex/angelscript/docs/manual/tree.html rename to xbmc/visualizations/Vortex/angelscript/docs/manual/tree.html diff --git a/src/visualizations/WaveForm/Main.cpp b/xbmc/visualizations/WaveForm/Main.cpp similarity index 100% rename from src/visualizations/WaveForm/Main.cpp rename to xbmc/visualizations/WaveForm/Main.cpp diff --git a/src/visualizations/WaveForm/Main_gles.cpp b/xbmc/visualizations/WaveForm/Main_gles.cpp similarity index 100% rename from src/visualizations/WaveForm/Main_gles.cpp rename to xbmc/visualizations/WaveForm/Main_gles.cpp diff --git a/src/visualizations/WaveForm/Makefile.in b/xbmc/visualizations/WaveForm/Makefile.in similarity index 100% rename from src/visualizations/WaveForm/Makefile.in rename to xbmc/visualizations/WaveForm/Makefile.in diff --git a/src/visualizations/WaveForm/Waveform.sln b/xbmc/visualizations/WaveForm/Waveform.sln similarity index 100% rename from src/visualizations/WaveForm/Waveform.sln rename to xbmc/visualizations/WaveForm/Waveform.sln diff --git a/src/visualizations/WaveForm/Waveform.vcxproj b/xbmc/visualizations/WaveForm/Waveform.vcxproj similarity index 100% rename from src/visualizations/WaveForm/Waveform.vcxproj rename to xbmc/visualizations/WaveForm/Waveform.vcxproj diff --git a/src/visualizations/WaveForm/Waveform.vcxproj.filters b/xbmc/visualizations/WaveForm/Waveform.vcxproj.filters similarity index 100% rename from src/visualizations/WaveForm/Waveform.vcxproj.filters rename to xbmc/visualizations/WaveForm/Waveform.vcxproj.filters diff --git a/src/visualizations/XBMCProjectM/Main.cpp b/xbmc/visualizations/XBMCProjectM/Main.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/Main.cpp rename to xbmc/visualizations/XBMCProjectM/Main.cpp diff --git a/src/visualizations/XBMCProjectM/Makefile.in b/xbmc/visualizations/XBMCProjectM/Makefile.in similarity index 100% rename from src/visualizations/XBMCProjectM/Makefile.in rename to xbmc/visualizations/XBMCProjectM/Makefile.in diff --git a/src/visualizations/XBMCProjectM/README b/xbmc/visualizations/XBMCProjectM/README similarity index 100% rename from src/visualizations/XBMCProjectM/README rename to xbmc/visualizations/XBMCProjectM/README diff --git a/src/visualizations/XBMCProjectM/build_projectM_win32.sh b/xbmc/visualizations/XBMCProjectM/build_projectM_win32.sh similarity index 100% rename from src/visualizations/XBMCProjectM/build_projectM_win32.sh rename to xbmc/visualizations/XBMCProjectM/build_projectM_win32.sh diff --git a/src/visualizations/XBMCProjectM/libprojectM/Algorithms.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Algorithms.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Algorithms.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Algorithms.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/BeatDetect.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/BeatDetect.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/BeatDetect.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/BuiltinFuncs.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinFuncs.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/BuiltinFuncs.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinFuncs.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/BuiltinFuncs.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinFuncs.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/BuiltinFuncs.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinFuncs.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/BuiltinParams.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinParams.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/BuiltinParams.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinParams.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/BuiltinParams.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinParams.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/BuiltinParams.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/BuiltinParams.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt b/xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt rename to xbmc/visualizations/XBMCProjectM/libprojectM/CMakeLists.txt diff --git a/src/visualizations/XBMCProjectM/libprojectM/CValue.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/CValue.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/CValue.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/CValue.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/ChangeLog b/xbmc/visualizations/XBMCProjectM/libprojectM/ChangeLog similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/ChangeLog rename to xbmc/visualizations/XBMCProjectM/libprojectM/ChangeLog diff --git a/src/visualizations/XBMCProjectM/libprojectM/Common.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Common.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Common.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Common.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/ConfigFile.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/ConfigFile.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/ConfigFile.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/ConfigFile.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/ConfigFile.h b/xbmc/visualizations/XBMCProjectM/libprojectM/ConfigFile.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/ConfigFile.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/ConfigFile.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/CustomShape.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/CustomShape.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/CustomShape.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/CustomShape.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/CustomShape.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/CustomShape.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/CustomShape.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/CustomShape.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/CustomWave.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/CustomWave.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/CustomWave.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/CustomWave.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/CustomWave.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/CustomWave.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/CustomWave.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/CustomWave.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Eval.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Eval.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Eval.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Eval.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Eval.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Eval.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Eval.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Eval.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Expr.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Expr.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Expr.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Expr.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Expr.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Expr.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Expr.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Expr.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/FBO.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/FBO.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/FBO.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/FBO.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/FBO.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/FBO.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/FBO.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/FBO.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/FindPkgConfig.cmake b/xbmc/visualizations/XBMCProjectM/libprojectM/FindPkgConfig.cmake similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/FindPkgConfig.cmake rename to xbmc/visualizations/XBMCProjectM/libprojectM/FindPkgConfig.cmake diff --git a/src/visualizations/XBMCProjectM/libprojectM/Func.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Func.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Func.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Func.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Func.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Func.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Func.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Func.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/IdlePreset.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/IdlePreset.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/IdlePreset.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/IdlePreset.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/IdlePreset.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/IdlePreset.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/IdlePreset.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/IdlePreset.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/IdleTextures.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/IdleTextures.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/IdleTextures.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/IdleTextures.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/InitCond.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/InitCond.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/InitCond.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/InitCond.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/InitCond.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/InitCond.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/InitCond.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/InitCond.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/InitCondUtils.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/InitCondUtils.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/InitCondUtils.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/InitCondUtils.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/KeyHandler.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/KeyHandler.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/KeyHandler.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/KeyHandler.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/KeyHandler.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/KeyHandler.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/KeyHandler.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/KeyHandler.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PCM.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PCM.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PCM.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PCM.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PCM.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PCM.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PCM.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PCM.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Param.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Param.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Param.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Param.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Param.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Param.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Param.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Param.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/ParamUtils.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/ParamUtils.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/ParamUtils.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/ParamUtils.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Parser.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Parser.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Parser.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Parser.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Parser.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Parser.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Parser.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Parser.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PerFrameEqn.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PerFrameEqn.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PerFrameEqn.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PerFrameEqn.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PerFrameEqn.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PerFrameEqn.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PerFrameEqn.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PerFrameEqn.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PerPixelEqn.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PerPixelEqn.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PerPixelEqn.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PerPixelEqn.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PerPixelEqn.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PerPixelEqn.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PerPixelEqn.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PerPixelEqn.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PerPointEqn.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PerPointEqn.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PerPointEqn.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PerPointEqn.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PerPointEqn.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PerPointEqn.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PerPointEqn.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PerPointEqn.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Preset.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Preset.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Preset.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Preset.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Preset.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Preset.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Preset.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Preset.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PresetChooser.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PresetChooser.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PresetChooser.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PresetChooser.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PresetChooser.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PresetChooser.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PresetChooser.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PresetChooser.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PresetFrameIO.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PresetFrameIO.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PresetFrameIO.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PresetFrameIO.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PresetFrameIO.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PresetFrameIO.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PresetFrameIO.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PresetFrameIO.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PresetLoader.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PresetLoader.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PresetLoader.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PresetLoader.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PresetLoader.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PresetLoader.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PresetLoader.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PresetLoader.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PresetMerge.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PresetMerge.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PresetMerge.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PresetMerge.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/PresetMerge.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/PresetMerge.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/PresetMerge.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/PresetMerge.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/RandomNumberGenerators.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Renderer.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Renderer.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Renderer.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Renderer.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/Renderer.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/Renderer.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/Renderer.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/Renderer.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/SOIL.c b/xbmc/visualizations/XBMCProjectM/libprojectM/SOIL.c similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/SOIL.c rename to xbmc/visualizations/XBMCProjectM/libprojectM/SOIL.c diff --git a/src/visualizations/XBMCProjectM/libprojectM/SOIL.h b/xbmc/visualizations/XBMCProjectM/libprojectM/SOIL.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/SOIL.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/SOIL.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/SectionLock.h b/xbmc/visualizations/XBMCProjectM/libprojectM/SectionLock.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/SectionLock.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/SectionLock.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/TextureManager.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/TextureManager.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/TextureManager.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/TextureManager.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/TextureManager.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/TextureManager.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/TextureManager.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/TextureManager.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/TimeKeeper.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/TimeKeeper.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/TimeKeeper.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/TimeKeeper.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/TimeKeeper.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/TimeKeeper.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/TimeKeeper.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/TimeKeeper.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/carbontoprojectM.h b/xbmc/visualizations/XBMCProjectM/libprojectM/carbontoprojectM.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/carbontoprojectM.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/carbontoprojectM.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/compare.h b/xbmc/visualizations/XBMCProjectM/libprojectM/compare.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/compare.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/compare.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/config.inp.in b/xbmc/visualizations/XBMCProjectM/libprojectM/config.inp.in similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/config.inp.in rename to xbmc/visualizations/XBMCProjectM/libprojectM/config.inp.in diff --git a/src/visualizations/XBMCProjectM/libprojectM/dlldefs.h b/xbmc/visualizations/XBMCProjectM/libprojectM/dlldefs.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/dlldefs.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/dlldefs.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/event.h b/xbmc/visualizations/XBMCProjectM/libprojectM/event.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/event.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/event.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/fatal.h b/xbmc/visualizations/XBMCProjectM/libprojectM/fatal.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/fatal.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/fatal.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/fftsg.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/fftsg.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/fftsg.h b/xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/fftsg.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/fftsg.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/fonts/Vera.ttf b/xbmc/visualizations/XBMCProjectM/libprojectM/fonts/Vera.ttf similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/fonts/Vera.ttf rename to xbmc/visualizations/XBMCProjectM/libprojectM/fonts/Vera.ttf diff --git a/src/visualizations/XBMCProjectM/libprojectM/fonts/VeraMono.ttf b/xbmc/visualizations/XBMCProjectM/libprojectM/fonts/VeraMono.ttf similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/fonts/VeraMono.ttf rename to xbmc/visualizations/XBMCProjectM/libprojectM/fonts/VeraMono.ttf diff --git a/src/visualizations/XBMCProjectM/libprojectM/glError.h b/xbmc/visualizations/XBMCProjectM/libprojectM/glError.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/glError.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/glError.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/glew.c b/xbmc/visualizations/XBMCProjectM/libprojectM/glew.c similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/glew.c rename to xbmc/visualizations/XBMCProjectM/libprojectM/glew.c diff --git a/src/visualizations/XBMCProjectM/libprojectM/glew.h b/xbmc/visualizations/XBMCProjectM/libprojectM/glew.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/glew.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/glew.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/glxew.h b/xbmc/visualizations/XBMCProjectM/libprojectM/glxew.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/glxew.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/glxew.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/image_DXT.c b/xbmc/visualizations/XBMCProjectM/libprojectM/image_DXT.c similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/image_DXT.c rename to xbmc/visualizations/XBMCProjectM/libprojectM/image_DXT.c diff --git a/src/visualizations/XBMCProjectM/libprojectM/image_DXT.h b/xbmc/visualizations/XBMCProjectM/libprojectM/image_DXT.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/image_DXT.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/image_DXT.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/image_helper.c b/xbmc/visualizations/XBMCProjectM/libprojectM/image_helper.c similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/image_helper.c rename to xbmc/visualizations/XBMCProjectM/libprojectM/image_helper.c diff --git a/src/visualizations/XBMCProjectM/libprojectM/image_helper.h b/xbmc/visualizations/XBMCProjectM/libprojectM/image_helper.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/image_helper.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/image_helper.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/libprojectM.dsp b/xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.dsp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/libprojectM.dsp rename to xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.dsp diff --git a/src/visualizations/XBMCProjectM/libprojectM/libprojectM.opt b/xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.opt similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/libprojectM.opt rename to xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.opt diff --git a/src/visualizations/XBMCProjectM/libprojectM/libprojectM.pc.in b/xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.pc.in similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/libprojectM.pc.in rename to xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.pc.in diff --git a/src/visualizations/XBMCProjectM/libprojectM/libprojectM.plg b/xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.plg similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/libprojectM.plg rename to xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.plg diff --git a/src/visualizations/XBMCProjectM/libprojectM/libprojectM.rc b/xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.rc similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/libprojectM.rc rename to xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.rc diff --git a/src/visualizations/XBMCProjectM/libprojectM/libprojectM.sln b/xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.sln similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/libprojectM.sln rename to xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.sln diff --git a/src/visualizations/XBMCProjectM/libprojectM/libprojectM.suo b/xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.suo similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/libprojectM.suo rename to xbmc/visualizations/XBMCProjectM/libprojectM/libprojectM.suo diff --git a/src/visualizations/XBMCProjectM/libprojectM/lvtoprojectM.h b/xbmc/visualizations/XBMCProjectM/libprojectM/lvtoprojectM.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/lvtoprojectM.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/lvtoprojectM.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Agitator.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Agitator.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Agitator.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Agitator.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Aimless (Gravity Directive Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Aimless (Gravity Directive Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Aimless (Gravity Directive Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Aimless (Gravity Directive Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Aimless (Spirogravity Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Aimless (Spirogravity Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Aimless (Spirogravity Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Aimless (Spirogravity Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Airhandler (Menagerie Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Airhandler (Menagerie Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Airhandler (Menagerie Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Airhandler (Menagerie Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Airs (Windy Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Airs (Windy Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Airs (Windy Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Airs (Windy Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anchorpulse (Pulse Of A Ghast II Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anchorpulse (Pulse Of A Ghast II Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anchorpulse (Pulse Of A Ghast II Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anchorpulse (Pulse Of A Ghast II Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anchorpulse (Verified Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anchorpulse (Verified Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anchorpulse (Verified Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anchorpulse (Verified Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anomalous Material Science (Pure Splinter Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anomalous Material Science (Pure Splinter Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anomalous Material Science (Pure Splinter Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Anomalous Material Science (Pure Splinter Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote (Aqualung Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote (Aqualung Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote (Aqualung Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote (Aqualung Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote (Side Effects Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote (Side Effects Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote (Side Effects Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote (Side Effects Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antidote.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antique Abyss.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antique Abyss.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antique Abyss.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Antique Abyss.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Arise! (Padded Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Arise! (Padded Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Arise! (Padded Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Arise! (Padded Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Ashes Of Air (Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Ashes Of Air (Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Ashes Of Air (Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Ashes Of Air (Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Bitterfeld (Crystal Border Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Bitterfeld (Crystal Border Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Bitterfeld (Crystal Border Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Bitterfeld (Crystal Border Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Blender.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Blender.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Blender.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Blender.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Bow To Gravity.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Bow To Gravity.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Bow To Gravity.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Bow To Gravity.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Brakefreak.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Brakefreak.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Brakefreak.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Brakefreak.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Candy Avian.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Candy Avian.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Candy Avian.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Candy Avian.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams (Nightmare Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams (Nightmare Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams (Nightmare Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams (Nightmare Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams (REMix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams (REMix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams (REMix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams (REMix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Causeway Of Dreams.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Chromatic Abyss (The Other Side).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Chromatic Abyss (The Other Side).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Chromatic Abyss (The Other Side).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Chromatic Abyss (The Other Side).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Circlefacade.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Circlefacade.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Circlefacade.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Circlefacade.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Contortion (Xenomorph Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Contortion (Xenomorph Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Contortion (Xenomorph Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Contortion (Xenomorph Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Contortion.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Contortion.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Contortion.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Contortion.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Crystal Storm.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Crystal Storm.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Crystal Storm.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Crystal Storm.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Dark Matter (Converse Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Dark Matter (Converse Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Dark Matter (Converse Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Dark Matter (Converse Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Elastoid.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Elastoid.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Elastoid.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Elastoid.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Floater Society.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Floater Society.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Floater Society.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Floater Society.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Flowing Form.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Flowing Form.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Flowing Form.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Flowing Form.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Making Time (Swamp Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Making Time (Swamp Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Making Time (Swamp Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Making Time (Swamp Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Potion of Spirits.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Potion of Spirits.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Potion of Spirits.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Potion of Spirits.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Songflower (Moss Posy).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Songflower (Moss Posy).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Songflower (Moss Posy).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Songflower (Moss Posy).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Spillswirl.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Spillswirl.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Spillswirl.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - Spillswirl.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - What Cannot Be Undone.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - What Cannot Be Undone.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - What Cannot Be Undone.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - What Cannot Be Undone.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - What cannot be.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - What cannot be.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - What cannot be.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Aderrasi - What cannot be.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Centred Journey Mix.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Centred Journey Mix.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Centred Journey Mix.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Centred Journey Mix.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Lonely Signal Gone .milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Lonely Signal Gone .milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Lonely Signal Gone .milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren & Krash - Rainbow Orb Peacock (Lonely Signal Gone .milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Godhead.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Godhead.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Godhead.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Godhead.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Pentultimate Nerual Slipstream (Tweak 2).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Pentultimate Nerual Slipstream (Tweak 2).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Pentultimate Nerual Slipstream (Tweak 2).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Pentultimate Nerual Slipstream (Tweak 2).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Take This Highway.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Take This Highway.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Take This Highway.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Bmelgren - Take This Highway.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Che - Burning Hus.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Che - Burning Hus.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Che - Burning Hus.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Che - Burning Hus.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Che - Escape.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Che - Escape.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Che - Escape.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Che - Escape.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Che - Watch & Fly.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Che - Watch & Fly.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Che - Watch & Fly.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Che - Watch & Fly.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/CrystalHigh - mad ravetriping.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/CrystalHigh - mad ravetriping.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/CrystalHigh - mad ravetriping.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/CrystalHigh - mad ravetriping.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/DaNOnE - Highway to Heaven (rotating).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/DaNOnE - Highway to Heaven (rotating).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/DaNOnE - Highway to Heaven (rotating).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/DaNOnE - Highway to Heaven (rotating).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Changing Polyevolution.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Changing Polyevolution.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Changing Polyevolution.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Changing Polyevolution.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Look mama I'm on TV! 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Look mama I'm on TV! 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Look mama I'm on TV! 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Look mama I'm on TV! 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - They're so cute Dad can I keep one!.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - They're so cute Dad can I keep one!.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - They're so cute Dad can I keep one!.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - They're so cute Dad can I keep one!.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Turbulence Sandwich.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Turbulence Sandwich.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Turbulence Sandwich.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/EMPR - Random - Turbulence Sandwich.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. + Phat - chasers 18 hallway.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. + Phat - chasers 18 hallway.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. + Phat - chasers 18 hallway.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. + Phat - chasers 18 hallway.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 03 music.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 03 music.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 03 music.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 03 music.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 04 music minimal.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 04 music minimal.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 04 music minimal.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 04 music minimal.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 05 and proton lights (+Krash's beat code) _Phat_remix02b.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 05 and proton lights (+Krash's beat code) _Phat_remix02b.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 05 and proton lights (+Krash's beat code) _Phat_remix02b.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 05 and proton lights (+Krash's beat code) _Phat_remix02b.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 05 and proton lights (+Krash's beat code) _Phat_remix07 recursive demons.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 05 and proton lights (+Krash's beat code) _Phat_remix07 recursive demons.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 05 and proton lights (+Krash's beat code) _Phat_remix07 recursive demons.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - glowsticks v2 05 and proton lights (+Krash's beat code) _Phat_remix07 recursive demons.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - heater core C_Phat's_class + sparks_mix.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - heater core C_Phat's_class + sparks_mix.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - heater core C_Phat's_class + sparks_mix.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - heater core C_Phat's_class + sparks_mix.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - heater core C_Phat's_on route_mix+beam.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - heater core C_Phat's_on route_mix+beam.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - heater core C_Phat's_on route_mix+beam.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - heater core C_Phat's_on route_mix+beam.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - repeater 05 - rave on acid.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - repeater 05 - rave on acid.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - repeater 05 - rave on acid.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - repeater 05 - rave on acid.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - repeater 15 - kaleidoscope b.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - repeater 15 - kaleidoscope b.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - repeater 15 - kaleidoscope b.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S. - repeater 15 - kaleidoscope b.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S.+Phat - Arm_upgrades - transformer.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S.+Phat - Arm_upgrades - transformer.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S.+Phat - Arm_upgrades - transformer.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S.+Phat - Arm_upgrades - transformer.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S.+Phat Cool Bug v2 + (Krash's beat detection).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S.+Phat Cool Bug v2 + (Krash's beat detection).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Eo.S.+Phat Cool Bug v2 + (Krash's beat detection).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Eo.S.+Phat Cool Bug v2 + (Krash's beat detection).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/EvilJim - Follow the ball.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/EvilJim - Follow the ball.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/EvilJim - Follow the ball.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/EvilJim - Follow the ball.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/EvilJim - Ice Drops.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/EvilJim - Ice Drops.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/EvilJim - Ice Drops.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/EvilJim - Ice Drops.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese & Idiot24-7 - Rearview Mirror.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese & Idiot24-7 - Rearview Mirror.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese & Idiot24-7 - Rearview Mirror.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese & Idiot24-7 - Rearview Mirror.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - 0 To 60.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - 0 To 60.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - 0 To 60.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - 0 To 60.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - A Blur.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - A Blur.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - A Blur.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - A Blur.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Lifesavor Anyone.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Lifesavor Anyone.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Lifesavor Anyone.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Lifesavor Anyone.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - New meetings.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - New meetings.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - New meetings.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - New meetings.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Quicksand.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Quicksand.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Quicksand.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Quicksand.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Round and Round (geiss gamma mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Round and Round (geiss gamma mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Round and Round (geiss gamma mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Round and Round (geiss gamma mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Stand Still!.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Stand Still!.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Stand Still!.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Stand Still!.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - The Tunnel (Final Stage Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - The Tunnel (Final Stage Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - The Tunnel (Final Stage Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - The Tunnel (Final Stage Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Window Reflection 6.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Window Reflection 6.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Window Reflection 6.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Window Reflection 6.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Zoom Effects (Remix 2).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Zoom Effects (Remix 2).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Zoom Effects (Remix 2).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - Zoom Effects (Remix 2).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - simple.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - simple.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Fvese - simple.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Fvese - simple.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Julia Fractal (Vectrip Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Julia Fractal (Vectrip Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Julia Fractal (Vectrip Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Julia Fractal (Vectrip Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Notions Of Tonality 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Notions Of Tonality 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Notions Of Tonality 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Notions Of Tonality 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - The Chaos Of Colours (sprouting dimentia mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - The Chaos Of Colours (sprouting dimentia mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - The Chaos Of Colours (sprouting dimentia mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - The Chaos Of Colours (sprouting dimentia mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Tokamak (Naked Intrusion Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Tokamak (Naked Intrusion Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Tokamak (Naked Intrusion Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Rovastar - Tokamak (Naked Intrusion Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Sperl - Feedback (projectM idle HDR mix).prjm b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Sperl - Feedback (projectM idle HDR mix).prjm similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Sperl - Feedback (projectM idle HDR mix).prjm rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss & Sperl - Feedback (projectM idle HDR mix).prjm diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Aieeeeee!!!.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Aieeeeee!!!.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Aieeeeee!!!.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Aieeeeee!!!.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Anomaly 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Anomaly 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Anomaly 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Anomaly 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Anomaly 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Anomaly 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Anomaly 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Anomaly 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Approach.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Approach.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Approach.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Approach.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Asymptote.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Asymptote.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Asymptote.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Asymptote.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bass Kaleidosphere.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bass Kaleidosphere.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bass Kaleidosphere.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bass Kaleidosphere.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bass Zoom.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bass Zoom.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bass Zoom.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bass Zoom.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 4.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 4.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 4.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 4.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 5.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 5.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 5.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bipolar 5.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Blasto.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Blasto.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Blasto.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Blasto.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bonfire.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bonfire.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bonfire.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bonfire.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bright Fiber Matrix 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bright Fiber Matrix 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bright Fiber Matrix 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bright Fiber Matrix 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bright Fiber Matrix 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bright Fiber Matrix 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bright Fiber Matrix 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Bright Fiber Matrix 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Calligraphy.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Calligraphy.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Calligraphy.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Calligraphy.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Casino.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Casino.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Casino.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Casino.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cepiasound.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cepiasound.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cepiasound.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cepiasound.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Churn.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Churn.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Churn.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Churn.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Constant Velocity.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Constant Velocity.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Constant Velocity.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Constant Velocity.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Coral.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Coral.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Coral.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Coral.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Corpus Callosum.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Corpus Callosum.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Corpus Callosum.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Corpus Callosum.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cosmic Dust 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cosmic Dust 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cosmic Dust 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cosmic Dust 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cosmic Dust 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cosmic Dust 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cosmic Dust 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cosmic Dust 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cruzin'.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cruzin'.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cruzin'.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cruzin'.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cycloid 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cycloid 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cycloid 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cycloid 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cycloid 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cycloid 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cycloid 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Cycloid 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Davod The Pod.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Davod The Pod.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Davod The Pod.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Davod The Pod.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - De La Moutard 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - De La Moutard 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - De La Moutard 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - De La Moutard 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - De La Moutard 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - De La Moutard 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - De La Moutard 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - De La Moutard 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Demonic Distortion.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Demonic Distortion.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Demonic Distortion.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Demonic Distortion.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Descent.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Descent.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Descent.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Descent.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Destruction.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Destruction.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Destruction.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Destruction.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Diffraction.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Diffraction.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Diffraction.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Diffraction.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Digital Smoke.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Digital Smoke.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Digital Smoke.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Digital Smoke.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Downward Spiral.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Downward Spiral.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Downward Spiral.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Downward Spiral.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Drift.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Drift.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Drift.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Drift.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Dynamic Swirls 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Dynamic Swirls 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Dynamic Swirls 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Dynamic Swirls 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Dynamic Swirls 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Dynamic Swirls 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Dynamic Swirls 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Dynamic Swirls 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eddies 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eddies 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eddies 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eddies 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eddies 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eddies 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eddies 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eddies 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eggs.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eggs.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eggs.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Eggs.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - El Cubismo.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - El Cubismo.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - El Cubismo.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - El Cubismo.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Feedback 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Feedback 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Feedback 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Feedback 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Feedback.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Feedback.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Feedback.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Feedback.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Festive.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Festive.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Festive.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Festive.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Fiberglass.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Fiberglass.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Fiberglass.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Fiberglass.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flotsam.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flotsam.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flotsam.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flotsam.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flower Blossom.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flower Blossom.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flower Blossom.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flower Blossom.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flower.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flower.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flower.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Flower.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Four Kinds of Amphetamines.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Four Kinds of Amphetamines.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Four Kinds of Amphetamines.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Four Kinds of Amphetamines.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Galaxy 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Galaxy 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Galaxy 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Galaxy 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Galaxy 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Galaxy 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Galaxy 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Galaxy 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Greenland.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Greenland.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Greenland.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Greenland.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Heavenly 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - High Dynamic Range.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - High Dynamic Range.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - High Dynamic Range.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - High Dynamic Range.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Hovering.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Hovering.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Hovering.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Hovering.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Hyperion.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Hyperion.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Hyperion.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Hyperion.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Inkblot.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Inkblot.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Inkblot.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Inkblot.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Iris.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Iris.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Iris.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Iris.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Journey.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Journey.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Journey.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Journey.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Julia Fractal 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Julia Fractal 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Julia Fractal 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Julia Fractal 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Julia Fractal 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Julia Fractal 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Julia Fractal 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Julia Fractal 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Luz.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Luz.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Luz.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Luz.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Mega Swirl 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Microcosm.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Microcosm.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Microcosm.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Microcosm.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Monotone Ripples.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Monotone Ripples.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Monotone Ripples.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Monotone Ripples.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Music Box.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Music Box.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Music Box.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Music Box.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Nautilus.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Nautilus.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Nautilus.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Nautilus.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Blue.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Blue.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Blue.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Blue.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Ever Changing.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Ever Changing.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Ever Changing.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Ever Changing.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Fat and Ever Changing.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Fat and Ever Changing.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Fat and Ever Changing.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Fat and Ever Changing.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Gold with Dots.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Gold with Dots.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Gold with Dots.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Gold with Dots.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Gold.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Gold.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Gold.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus Gold.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Octopus.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Oldskool Mellowstyle.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Oldskool Mellowstyle.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Oldskool Mellowstyle.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Oldskool Mellowstyle.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pelota De Fuego.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pelota De Fuego.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pelota De Fuego.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pelota De Fuego.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pinch.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pinch.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pinch.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pinch.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pistons.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pistons.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pistons.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Pistons.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Planet 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Planet 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Planet 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Planet 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Planet 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Planet 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Planet 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Planet 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Quasilinear Submanifolds.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Quasilinear Submanifolds.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Quasilinear Submanifolds.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Quasilinear Submanifolds.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Reducto Absurdum.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Reducto Absurdum.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Reducto Absurdum.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Reducto Absurdum.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Reducto Ad Nauseum.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Reducto Ad Nauseum.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Reducto Ad Nauseum.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Reducto Ad Nauseum.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Rocket.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Rocket.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Rocket.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Rocket.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Runoff.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Runoff.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Runoff.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Runoff.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Scary.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Scary.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Scary.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Scary.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Script.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Script.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Script.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Script.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Serpent.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Serpent.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Serpent.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Serpent.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Shake.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Shake.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Shake.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Shake.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Shift.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Shift.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Shift.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Shift.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sinews 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sinews 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sinews 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sinews 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sinews 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sinews 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sinews 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sinews 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Smoke.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Smoke.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Smoke.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Smoke.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare (Blue).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare (Blue).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare (Blue).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare (Blue).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare (Reptile).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare (Reptile).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare (Reptile).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare (Reptile).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Solar Flare.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sound And The Fury.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sound And The Fury.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sound And The Fury.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sound And The Fury.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage (High-Warp).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage (High-Warp).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage (High-Warp).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage (High-Warp).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage Bright.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage Bright.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage Bright.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage Bright.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Space Voyage.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Spacedust.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Spacedust.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Spacedust.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Spacedust.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Starfish 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Starfish 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Starfish 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Starfish 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Starfish 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Starfish 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Starfish 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Starfish 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sunsets.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sunsets.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sunsets.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Sunsets.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Supernova 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Supernova 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Supernova 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Supernova 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Supernova 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Supernova 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Supernova 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Supernova 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Surface.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Surface.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Surface.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Surface.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirl 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirl 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirl 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirl 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirl 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirl 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirl 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirl 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 4.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 4.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 4.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 4.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 5.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 5.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 5.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Swirlie 5.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Symmetry.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Symmetry.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Symmetry.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Symmetry.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - The Fatty Lumpkin Sunkle Tweaker.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Three And A Half Kinds Of Amphetamines.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Three And A Half Kinds Of Amphetamines.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Three And A Half Kinds Of Amphetamines.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Three And A Half Kinds Of Amphetamines.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Three Kinds Of Amphetamines.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Three Kinds Of Amphetamines.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Three Kinds Of Amphetamines.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Three Kinds Of Amphetamines.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tokamak.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tokamak.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tokamak.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tokamak.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tornado.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tornado.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tornado.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tornado.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Toy.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Toy.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Toy.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Toy.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Trampoline.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Trampoline.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Trampoline.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Trampoline.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tube.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tube.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tube.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Tube.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Two-Pointed Pulsagon.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Two-Pointed Pulsagon.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Two-Pointed Pulsagon.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Two-Pointed Pulsagon.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Ultrafast.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Ultrafast.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Ultrafast.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Ultrafast.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Volume Zoom.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Volume Zoom.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Volume Zoom.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Volume Zoom.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Vortex 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Vortex 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Vortex 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Vortex 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Vortex 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Vortex 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Vortex 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Vortex 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali Bright.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali Bright.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali Bright.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Warp Of Dali Bright.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Waterfall.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Waterfall.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Waterfall.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss - Waterfall.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Geiss and Rovastar - The Chaos Of Colours (sprouting diment.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss and Rovastar - The Chaos Of Colours (sprouting diment.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Geiss and Rovastar - The Chaos Of Colours (sprouting diment.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Geiss and Rovastar - The Chaos Of Colours (sprouting diment.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Che - Various Abstract Effects.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Che - Various Abstract Effects.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Che - Various Abstract Effects.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Che - Various Abstract Effects.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Rovastar - Altars Of Madness 2 (X.42 Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Rovastar - Altars Of Madness 2 (X.42 Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Rovastar - Altars Of Madness 2 (X.42 Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Rovastar - Altars Of Madness 2 (X.42 Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Zylot - Unhealthy Love (Idiot's STDs Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Zylot - Unhealthy Love (Idiot's STDs Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Zylot - Unhealthy Love (Idiot's STDs Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot & Zylot - Unhealthy Love (Idiot's STDs Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - 9-7-02 (Remix) (sustain fixed).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - 9-7-02 (Remix) (sustain fixed).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - 9-7-02 (Remix) (sustain fixed).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - 9-7-02 (Remix) (sustain fixed).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Cortex (Spiritual Visions Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Cortex (Spiritual Visions Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Cortex (Spiritual Visions Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Cortex (Spiritual Visions Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - MOTIVATION!.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - MOTIVATION!.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - MOTIVATION!.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - MOTIVATION!.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Madness Within The Void (Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Madness Within The Void (Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Madness Within The Void (Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Madness Within The Void (Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Tentacle Dreams (Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Tentacle Dreams (Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Tentacle Dreams (Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Tentacle Dreams (Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Texture Boxes (Remix 2).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Texture Boxes (Remix 2).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Texture Boxes (Remix 2).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Texture Boxes (Remix 2).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Texture Boxes (Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Texture Boxes (Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Texture Boxes (Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Texture Boxes (Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Typomatic (Remix 2).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Typomatic (Remix 2).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Typomatic (Remix 2).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - Typomatic (Remix 2).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - What Is.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - What Is.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - What Is.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - What Is.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - What Shall Come.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - What Shall Come.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot - What Shall Come.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot - What Shall Come.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot24-7 - Ascending to heaven 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot24-7 - Ascending to heaven 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot24-7 - Ascending to heaven 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot24-7 - Ascending to heaven 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Idiot24-7 - Meeting place.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot24-7 - Meeting place.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Idiot24-7 - Meeting place.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Idiot24-7 - Meeting place.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Che - Return Of The King.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Che - Return Of The King.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Che - Return Of The King.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Che - Return Of The King.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Che - The Piper.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Che - The Piper.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Che - The Piper.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Che - The Piper.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Clouded Bottle.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Clouded Bottle.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Clouded Bottle.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Clouded Bottle.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Snowflake Delight.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Snowflake Delight.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Snowflake Delight.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Snowflake Delight.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Snowflake Return.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Snowflake Return.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Snowflake Return.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Rovastar - Snowflake Return.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Frozen Eye 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Frozen Eye 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Frozen Eye 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Frozen Eye 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Invade My Mind.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Invade My Mind.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Invade My Mind.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Invade My Mind.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Re-Enter Homeworld.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Re-Enter Homeworld.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Re-Enter Homeworld.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion & Unchained - Re-Enter Homeworld.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion - Figure Eight.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion - Figure Eight.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion - Figure Eight.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion - Figure Eight.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Illusion - Heavenly Eye.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion - Heavenly Eye.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Illusion - Heavenly Eye.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Illusion - Heavenly Eye.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Jess - Trying To Trap A Twister.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Jess - Trying To Trap A Twister.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Jess - Trying To Trap A Twister.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Jess - Trying To Trap A Twister.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Idiot - Memories Of The Castle.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Idiot - Memories Of The Castle.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Idiot - Memories Of The Castle.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Idiot - Memories Of The Castle.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Illusion - Indecisive Mosaic.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Illusion - Indecisive Mosaic.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Illusion - Indecisive Mosaic.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Illusion - Indecisive Mosaic.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Illusion - Spiral Movement.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Illusion - Spiral Movement.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Illusion - Spiral Movement.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Illusion - Spiral Movement.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - A Million Miles from Earth (Ripple Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - A Million Miles from Earth (Ripple Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - A Million Miles from Earth (Ripple Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - A Million Miles from Earth (Ripple Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Altars Of Madness (Mad Ocean Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Altars Of Madness (Mad Ocean Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Altars Of Madness (Mad Ocean Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Altars Of Madness (Mad Ocean Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Cerebral Demons (Distant Memory Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Cerebral Demons (Distant Memory Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Cerebral Demons (Distant Memory Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Cerebral Demons (Distant Memory Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Cerebral Demons - Phat + Eo.S. hall of ghouls Remix.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Cerebral Demons - Phat + Eo.S. hall of ghouls Remix.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Cerebral Demons - Phat + Eo.S. hall of ghouls Remix.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Cerebral Demons - Phat + Eo.S. hall of ghouls Remix.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Switching Polygons.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Switching Polygons.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Switching Polygons.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - Switching Polygons.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - The Devil Is In The Details.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - The Devil Is In The Details.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - The Devil Is In The Details.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Rovastar - The Devil Is In The Details.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & TEcHNO - Rhythmic Mantas.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & TEcHNO - Rhythmic Mantas.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & TEcHNO - Rhythmic Mantas.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & TEcHNO - Rhythmic Mantas.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Zylot - Inside The Planar Portal (Indecision Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Zylot - Inside The Planar Portal (Indecision Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash & Zylot - Inside The Planar Portal (Indecision Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash & Zylot - Inside The Planar Portal (Indecision Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - 3D Shapes Demo 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - 3D Shapes Demo 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - 3D Shapes Demo 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - 3D Shapes Demo 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - 3D Shapes Demo.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - 3D Shapes Demo.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - 3D Shapes Demo.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - 3D Shapes Demo.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Digital Flame.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Digital Flame.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Digital Flame.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Digital Flame.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Dynamic Borders 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Dynamic Borders 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Dynamic Borders 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Dynamic Borders 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Framed Geometry.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Framed Geometry.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Framed Geometry.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Framed Geometry.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Pulse.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Pulse.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Pulse.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Pulse.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Season's Greetings 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Season's Greetings 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Season's Greetings 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Season's Greetings 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Twisting Indecision.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Twisting Indecision.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Twisting Indecision.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Twisting Indecision.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - War Machine (Shifting Complexity Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - War Machine (Shifting Complexity Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - War Machine (Shifting Complexity Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - War Machine (Shifting Complexity Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Windowframe To Mega Swirl 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Windowframe To Mega Swirl 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash - Windowframe To Mega Swirl 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash - Windowframe To Mega Swirl 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash and Fvese - Molten Indecision (Fvese Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash and Fvese - Molten Indecision (Fvese Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash and Fvese - Molten Indecision (Fvese Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash and Fvese - Molten Indecision (Fvese Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Krash and Rovastar - Rainbow Orb.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash and Rovastar - Rainbow Orb.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Krash and Rovastar - Rainbow Orb.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Krash and Rovastar - Rainbow Orb.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/M.tga b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/M.tga similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/M.tga rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/M.tga diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Mstress & Juppy - Dancer.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Mstress & Juppy - Dancer.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Mstress & Juppy - Dancer.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Mstress & Juppy - Dancer.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Mstress & Juppy - Dancers In The Dark.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Mstress & Juppy - Dancers In The Dark.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Mstress & Juppy - Dancers In The Dark.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Mstress & Juppy - Dancers In The Dark.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Mstress - Acoustic Nerve Impulses (Under Drug Effetcs (Hypn.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Mstress - Acoustic Nerve Impulses (Under Drug Effetcs (Hypn.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Mstress - Acoustic Nerve Impulses (Under Drug Effetcs (Hypn.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Mstress - Acoustic Nerve Impulses (Under Drug Effetcs (Hypn.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Mstress - Snowing Fiber City.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Mstress - Snowing Fiber City.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Mstress - Snowing Fiber City.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Mstress - Snowing Fiber City.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Phat+fiShbRaiN+Eo.S_Mandala_Chasers_remix - www.eos4life.com.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Phat+fiShbRaiN+Eo.S_Mandala_Chasers_remix - www.eos4life.com.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Phat+fiShbRaiN+Eo.S_Mandala_Chasers_remix - www.eos4life.com.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Phat+fiShbRaiN+Eo.S_Mandala_Chasers_remix - www.eos4life.com.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Phat+fiShbRaiN+Eo.S_Mandala_Chasers_remix.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Phat+fiShbRaiN+Eo.S_Mandala_Chasers_remix.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Phat+fiShbRaiN+Eo.S_Mandala_Chasers_remix.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Phat+fiShbRaiN+Eo.S_Mandala_Chasers_remix.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/PieturP - triptrap_(getting_concrete_visions_through_a_diafragma_version).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/PieturP - triptrap_(getting_concrete_visions_through_a_diafragma_version).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/PieturP - triptrap_(getting_concrete_visions_through_a_diafragma_version).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/PieturP - triptrap_(getting_concrete_visions_through_a_diafragma_version).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/PieturP - triptrap_(ultimate-trip-mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/PieturP - triptrap_(ultimate-trip-mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/PieturP - triptrap_(ultimate-trip-mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/PieturP - triptrap_(ultimate-trip-mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Redi Jedi - acid in your brain.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Redi Jedi - acid in your brain.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Redi Jedi - acid in your brain.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Redi Jedi - acid in your brain.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Redi Jedi - multiple points of origin, one destination.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Redi Jedi - multiple points of origin, one destination.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Redi Jedi - multiple points of origin, one destination.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Redi Jedi - multiple points of origin, one destination.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Reenen - phoenix.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Reenen - phoenix.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Reenen - phoenix.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Reenen - phoenix.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rocke - Cold Love (Tei Zwaa).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rocke - Cold Love (Tei Zwaa).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rocke - Cold Love (Tei Zwaa).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rocke - Cold Love (Tei Zwaa).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rocke - Personal Comet.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rocke - Personal Comet.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rocke - Personal Comet.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rocke - Personal Comet.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Aderrasi - Oceanic Bassograph (Underwater Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Aderrasi - Oceanic Bassograph (Underwater Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Aderrasi - Oceanic Bassograph (Underwater Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Aderrasi - Oceanic Bassograph (Underwater Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Che - Adela The Flower (Altars Of Madness Mix 2).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Che - Adela The Flower (Altars Of Madness Mix 2).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Che - Adela The Flower (Altars Of Madness Mix 2).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Che - Adela The Flower (Altars Of Madness Mix 2).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Che - Asylum Animations.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Che - Asylum Animations.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Che - Asylum Animations.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Che - Asylum Animations.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Dark Subconscious.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Dark Subconscious.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Dark Subconscious.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Dark Subconscious.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Deadly Flower.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Deadly Flower.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Deadly Flower.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Deadly Flower.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Mosaic Waves.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Mosaic Waves.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Mosaic Waves.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Mosaic Waves.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Paranormal Static.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Paranormal Static.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Paranormal Static.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Paranormal Static.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Stranger Minds (Astral Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Stranger Minds (Astral Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Stranger Minds (Astral Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Stranger Minds (Astral Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Stranger Minds.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Stranger Minds.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Stranger Minds.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Fvese - Stranger Minds.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Approach (Vectrip Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Approach (Vectrip Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Approach (Vectrip Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Approach (Vectrip Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Bipolar 2 (Vectrip Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Bipolar 2 (Vectrip Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Bipolar 2 (Vectrip Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Bipolar 2 (Vectrip Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Broken Destiny Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Broken Destiny Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Broken Destiny Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Broken Destiny Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Mysticial Awakening Mi.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Mysticial Awakening Mi.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Mysticial Awakening Mi.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Mysticial Awakening Mi.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Poltergiest Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Poltergiest Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Poltergiest Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Poltergiest Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Smoke Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Smoke Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Smoke Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Smoke Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Smoking Delusion Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Smoking Delusion Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Smoking Delusion Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Smoking Delusion Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Voyage Of Twisted Soul.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Voyage Of Twisted Soul.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Voyage Of Twisted Soul.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Dynamic Swirls 3 (Voyage Of Twisted Soul.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Ice Planet.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Ice Planet.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Ice Planet.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Ice Planet.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octoplasm.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octoplasm.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octoplasm.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octoplasm.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octotrip (MultiTrip Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octotrip (MultiTrip Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octotrip (MultiTrip Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octotrip (MultiTrip Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octotrip.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octotrip.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octotrip.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Geiss - Octotrip.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Balk Acid.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Balk Acid.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Balk Acid.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Balk Acid.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Mixed Emotions (Harlequin's Shame Mi.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Mixed Emotions (Harlequin's Shame Mi.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Mixed Emotions (Harlequin's Shame Mi.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Mixed Emotions (Harlequin's Shame Mi.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Mixed Emotions (Harlequin's Shame Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Mixed Emotions (Harlequin's Shame Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Mixed Emotions (Harlequin's Shame Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Idiot24-7 - Mixed Emotions (Harlequin's Shame Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Illusion - Shifting Sphere.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Illusion - Shifting Sphere.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Illusion - Shifting Sphere.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Illusion - Shifting Sphere.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Cerebral Demons.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Cerebral Demons.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Cerebral Demons.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Cerebral Demons.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Flowing Synergy.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Flowing Synergy.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Flowing Synergy.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Flowing Synergy.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Interwoven (Contra Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Interwoven (Contra Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Interwoven (Contra Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Krash - Interwoven (Contra Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Answer.42 (Trippy S. Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Answer.42 (Trippy S. Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Answer.42 (Trippy S. Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Answer.42 (Trippy S. Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Headspin.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Headspin.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Headspin.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Headspin.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Sugar Spun Sister.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Sugar Spun Sister.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Sugar Spun Sister.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Rocke - Sugar Spun Sister.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Sperl - Tuxflower.prjm b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Sperl - Tuxflower.prjm similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Sperl - Tuxflower.prjm rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Sperl - Tuxflower.prjm diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & StudioMusic - More Cherished Desires.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & StudioMusic - More Cherished Desires.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & StudioMusic - More Cherished Desires.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & StudioMusic - More Cherished Desires.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & StudioMusic - Twisted Spider Web.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & StudioMusic - Twisted Spider Web.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & StudioMusic - Twisted Spider Web.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & StudioMusic - Twisted Spider Web.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Telek - Altars of Madness (Rolling Oceans Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Telek - Altars of Madness (Rolling Oceans Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Telek - Altars of Madness (Rolling Oceans Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Telek - Altars of Madness (Rolling Oceans Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Telek - Cosmic Fireworks.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Telek - Cosmic Fireworks.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Telek - Cosmic Fireworks.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Telek - Cosmic Fireworks.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Ambrosia Mystic (Dark Heart Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Ambrosia Mystic (Dark Heart Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Ambrosia Mystic (Dark Heart Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Ambrosia Mystic (Dark Heart Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Centre Of Gravity.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Centre Of Gravity.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Centre Of Gravity.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Centre Of Gravity.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Demonology (Vampire Soul Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Demonology (Vampire Soul Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Demonology (Vampire Soul Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Demonology (Vampire Soul Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Oddball World.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Oddball World.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Oddball World.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Oddball World.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Voodoo Chess Magnet (Everglow Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Voodoo Chess Magnet (Everglow Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Voodoo Chess Magnet (Everglow Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Voodoo Chess Magnet (Everglow Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Xen Traffic.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Xen Traffic.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Xen Traffic.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Unchained - Xen Traffic.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Azirphaeli's Plan (Multiplan Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Azirphaeli's Plan (Multiplan Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Azirphaeli's Plan (Multiplan Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Azirphaeli's Plan (Multiplan Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Narell's Fever.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Narell's Fever.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Narell's Fever.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Narell's Fever.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Passion Flower.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Passion Flower.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Passion Flower.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Passion Flower.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Sea Of Zigrot.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Sea Of Zigrot.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Sea Of Zigrot.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar & Zylot - Sea Of Zigrot.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles From Earth (Wormhole Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles From Earth (Wormhole Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles From Earth (Wormhole Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles From Earth (Wormhole Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles from Earth (Pathfinder Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles from Earth (Pathfinder Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles from Earth (Pathfinder Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles from Earth (Pathfinder Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles from Earth.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles from Earth.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles from Earth.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - A Million Miles from Earth.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Harlequin's Maddess.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Harlequin's Maddess.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Harlequin's Maddess.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Harlequin's Maddess.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Harlequin's Madness (Dark Disorder Mix.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Harlequin's Madness (Dark Disorder Mix.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Harlequin's Madness (Dark Disorder Mix.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Harlequin's Madness (Dark Disorder Mix.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (A Million Miles From Earth Mi.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (A Million Miles From Earth Mi.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (A Million Miles From Earth Mi.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (A Million Miles From Earth Mi.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Boxfresh Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Boxfresh Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Boxfresh Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Boxfresh Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Duel Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Duel Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Duel Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Duel Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Surealist Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Surealist Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Surealist Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness (Surealist Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness 2 (Frozen Time Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness 2 (Frozen Time Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness 2 (Frozen Time Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness 2 (Frozen Time Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness 4 (Spirit Of Twisted Madness M.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness 4 (Spirit Of Twisted Madness M.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness 4 (Spirit Of Twisted Madness M.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness 4 (Spirit Of Twisted Madness M.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Altars Of Madness.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Attacking Freedom.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Attacking Freedom.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Attacking Freedom.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Attacking Freedom.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Bellanova (New Wave Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Bellanova (New Wave Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Bellanova (New Wave Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Bellanova (New Wave Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Biohazard Warning.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Biohazard Warning.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Biohazard Warning.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Biohazard Warning.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Chapel Of Ghouls.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Chapel Of Ghouls.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Chapel Of Ghouls.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Chapel Of Ghouls.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Chemical Spirituality.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Chemical Spirituality.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Chemical Spirituality.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Chemical Spirituality.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Clouded Judgement 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Clouded Judgement 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Clouded Judgement 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Clouded Judgement 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Echoes 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Echoes 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Echoes 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Echoes 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Echoes 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Echoes 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Echoes 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Echoes 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Havoc.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Havoc.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Havoc.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Havoc.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Mosaic (Active Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Mosaic (Active Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Mosaic (Active Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Cosmic Mosaic (Active Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dark Ritual (Star Of Destiny Denied Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dark Ritual (Star Of Destiny Denied Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dark Ritual (Star Of Destiny Denied Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dark Ritual (Star Of Destiny Denied Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dark Ritual (Star Of Destiny Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dark Ritual (Star Of Destiny Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dark Ritual (Star Of Destiny Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dark Ritual (Star Of Destiny Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Decreasing Dreams (Extended Movement Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Decreasing Dreams (Extended Movement Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Decreasing Dreams (Extended Movement Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Decreasing Dreams (Extended Movement Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dreamcatcher.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dreamcatcher.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dreamcatcher.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Dreamcatcher.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Explosive Minds.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Explosive Minds.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Explosive Minds.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Explosive Minds.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Forgotten Moon.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Forgotten Moon.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Forgotten Moon.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Forgotten Moon.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Fantic Dancing Lights Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Fantic Dancing Lights Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Fantic Dancing Lights Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Fantic Dancing Lights Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Galaxy Swirl Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Galaxy Swirl Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Galaxy Swirl Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Galaxy Swirl Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix)_Phat_Speak_When_Spoken_2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix)_Phat_Speak_When_Spoken_2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix)_Phat_Speak_When_Spoken_2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Fractopia (Upspoken Mix)_Phat_Speak_When_Spoken_2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Frozen Rapture .milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Frozen Rapture .milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Frozen Rapture .milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Frozen Rapture .milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Future Speakers.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Future Speakers.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Future Speakers.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Future Speakers.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Halcyon Dreams 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Halcyon Dreams 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Halcyon Dreams 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Halcyon Dreams 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hallucinogenic Pyramids (Beat Time Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hallucinogenic Pyramids (Beat Time Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hallucinogenic Pyramids (Beat Time Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hallucinogenic Pyramids (Beat Time Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Delight (Endless Tunnel Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Delight (Endless Tunnel Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Delight (Endless Tunnel Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Delight (Endless Tunnel Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Crazed Spiral Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Crazed Spiral Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Crazed Spiral Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Crazed Spiral Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Dual Spiral Mix ).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Dual Spiral Mix ).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Dual Spiral Mix ).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal (Dual Spiral Mix ).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Dynamic Fractal 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Fractal Encounter.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Spirit (Twisted Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Spirit (Twisted Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Spirit (Twisted Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Spirit (Twisted Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Spirit.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Spirit.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Spirit.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Harlequin's Spirit.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace (Frozen Rapture Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace (Frozen Rapture Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace (Frozen Rapture Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace (Frozen Rapture Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace (Hyper Speed Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace (Hyper Speed Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace (Hyper Speed Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace (Hyper Speed Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Hyperspace.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Clouded Judgement Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Dark Secret Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Dark Secret Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Dark Secret Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Dark Secret Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Distant Memories Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Distant Memories Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Distant Memories Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Distant Memories Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Frantic Thoughts Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Frantic Thoughts Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Frantic Thoughts Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Frantic Thoughts Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Strange Cargo Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Strange Cargo Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Strange Cargo Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Inner Thoughts (Strange Cargo Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars (Altars Of Madness MIx).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars (Altars Of Madness MIx).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars (Altars Of Madness MIx).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars (Altars Of Madness MIx).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars (Round Round Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars (Round Round Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars (Round Round Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars (Round Round Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Kalideostars.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - LabFunk.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - LabFunk.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - LabFunk.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - LabFunk.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Lost Souls of the Bermuda Triangle (Darkest Soul.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Lost Souls of the Bermuda Triangle (Darkest Soul.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Lost Souls of the Bermuda Triangle (Darkest Soul.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Lost Souls of the Bermuda Triangle (Darkest Soul.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Magic Carpet.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Magic Carpet.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Magic Carpet.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Magic Carpet.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Mosaics Of Ages.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Mosaics Of Ages.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Mosaics Of Ages.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Mosaics Of Ages.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Multiverse Starfield 1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Multiverse Starfield 1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Multiverse Starfield 1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Multiverse Starfield 1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Multiverse Starfield 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Multiverse Starfield 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Multiverse Starfield 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Multiverse Starfield 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Omnipresence Resurrection (Raw Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Omnipresence Resurrection (Raw Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Omnipresence Resurrection (Raw Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Omnipresence Resurrection (Raw Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Omnipresence Resurrection.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Omnipresence Resurrection.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Omnipresence Resurrection.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Omnipresence Resurrection.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Oozing Resistance.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Oozing Resistance.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Oozing Resistance.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Oozing Resistance.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Pandora's Volcano.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Pandora's Volcano.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Pandora's Volcano.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Pandora's Volcano.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Parallel Universe.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Parallel Universe.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Parallel Universe.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Parallel Universe.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Sea Shells.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Sea Shells.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Sea Shells.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Sea Shells.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Snapshot Of Space.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Snapshot Of Space.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Snapshot Of Space.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Snapshot Of Space.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Solarized Space (Space DNA Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Solarized Space (Space DNA Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Solarized Space (Space DNA Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Solarized Space (Space DNA Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Solarized Space.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Solarized Space.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Solarized Space.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Solarized Space.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Space (Twisted Dimension Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Space (Twisted Dimension Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Space (Twisted Dimension Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Space (Twisted Dimension Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Space.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Space.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Space.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Space.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Starquake (Sunquake Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Starquake (Sunquake Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Starquake (Sunquake Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Starquake (Sunquake Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Awakening.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Awakening.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Awakening.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Awakening.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Chaos Of Colours (Drifting Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Chaos Of Colours (Drifting Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Chaos Of Colours (Drifting Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Chaos Of Colours (Drifting Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Chaos Of Colours.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Chaos Of Colours.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Chaos Of Colours.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Chaos Of Colours.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Shroomery.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Shroomery.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Shroomery.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - The Shroomery.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Timeless Voyage.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Timeless Voyage.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Timeless Voyage.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Timeless Voyage.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Touchdown on Mars (Detailed Pictures Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Touchdown on Mars (Detailed Pictures Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Touchdown on Mars (Detailed Pictures Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Touchdown on Mars (Detailed Pictures Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Tripmaker.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Tripmaker.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Tripmaker.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - Tripmaker.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - VooV's Movement (After Dark Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - VooV's Movement (After Dark Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - VooV's Movement (After Dark Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - VooV's Movement (After Dark Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - VooV's Movement.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - VooV's Movement.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - VooV's Movement.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - VooV's Movement.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - twisted bytes.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - twisted bytes.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - twisted bytes.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar - twisted bytes.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Krash - Hallucinogenic Pyramids (Extra Beat Ti.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Krash - Hallucinogenic Pyramids (Extra Beat Ti.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Krash - Hallucinogenic Pyramids (Extra Beat Ti.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Krash - Hallucinogenic Pyramids (Extra Beat Ti.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Unchained - Braindance Visions.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Unchained - Braindance Visions.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Unchained - Braindance Visions.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Unchained - Braindance Visions.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Unchained - Life After Pie (Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Unchained - Life After Pie (Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Unchained - Life After Pie (Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rovastar and Unchained - Life After Pie (Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzer & Zylot - Force Field Generator (Slowtime Tweak).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzer & Zylot - Force Field Generator (Slowtime Tweak).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzer & Zylot - Force Field Generator (Slowtime Tweak).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzer & Zylot - Force Field Generator (Slowtime Tweak).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Aderrasi - Canon.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Aderrasi - Canon.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Aderrasi - Canon.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Aderrasi - Canon.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Che - Inside The House Of Nil.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Che - Inside The House Of Nil.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Che - Inside The House Of Nil.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Che - Inside The House Of Nil.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Rovastar - Oozing Resistance (Waveform Mod).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Rovastar - Oozing Resistance (Waveform Mod).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Rovastar - Oozing Resistance (Waveform Mod).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor & Rovastar - Oozing Resistance (Waveform Mod).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor - Learning Curve (Invert tweak).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor - Learning Curve (Invert tweak).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor - Learning Curve (Invert tweak).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor - Learning Curve (Invert tweak).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Idiot - Any Other Deep Rising.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Idiot - Any Other Deep Rising.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Idiot - Any Other Deep Rising.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Idiot - Any Other Deep Rising.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Rovastar - Altars Of Madness 3 (ooze tweak with .milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Rovastar - Altars Of Madness 3 (ooze tweak with .milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Rovastar - Altars Of Madness 3 (ooze tweak with .milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Rovastar - Altars Of Madness 3 (ooze tweak with .milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Rovastar - Altars Of Madness 3 (ooze tweak).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Rovastar - Altars Of Madness 3 (ooze tweak).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Rovastar - Altars Of Madness 3 (ooze tweak).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Rovastar - Altars Of Madness 3 (ooze tweak).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and StudioMusic - Vertigyny (Geiss shape mod).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and StudioMusic - Vertigyny (Geiss shape mod).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and StudioMusic - Vertigyny (Geiss shape mod).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and StudioMusic - Vertigyny (Geiss shape mod).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Zylot - Associative Order.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Zylot - Associative Order.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Zylot - Associative Order.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and Zylot - Associative Order.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and che - Inside the House of nil.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and che - Inside the House of nil.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and che - Inside the House of nil.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Rozzor and che - Inside the House of nil.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Studio Music - Cherished Desires.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Studio Music - Cherished Desires.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Studio Music - Cherished Desires.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Studio Music - Cherished Desires.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Studio Music and Unchained - Rapid Alteration.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Studio Music and Unchained - Rapid Alteration.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Studio Music and Unchained - Rapid Alteration.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Studio Music and Unchained - Rapid Alteration.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Entity.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Entity.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Entity.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Entity.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Minor Alteration.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Minor Alteration.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Minor Alteration.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Minor Alteration.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - So Much Love.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - So Much Love.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - So Much Love.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - So Much Love.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - State Of Discretion.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - State Of Discretion.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - State Of Discretion.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - State Of Discretion.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Wrenched Fate.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Wrenched Fate.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Wrenched Fate.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic & Unchained - Wrenched Fate.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Harmonic Bliss (elated mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Harmonic Bliss (elated mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Harmonic Bliss (elated mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Harmonic Bliss (elated mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - It's Only Make Believe.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - It's Only Make Believe.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - It's Only Make Believe.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - It's Only Make Believe.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Numerosity.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Numerosity.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Numerosity.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Numerosity.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Twisted Galaxy.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Twisted Galaxy.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Twisted Galaxy.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic - Twisted Galaxy.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic Aderrasi & nil - LA movement (Intellectual Sens.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic Aderrasi & nil - LA movement (Intellectual Sens.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic Aderrasi & nil - LA movement (Intellectual Sens.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/StudioMusic Aderrasi & nil - LA movement (Intellectual Sens.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/TEcHNO and SandStorm - Psychodelic Highway.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/TEcHNO and SandStorm - Psychodelic Highway.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/TEcHNO and SandStorm - Psychodelic Highway.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/TEcHNO and SandStorm - Psychodelic Highway.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - City Helix Lattice.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - City Helix Lattice.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - City Helix Lattice.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - City Helix Lattice.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Directive Swagger (Spectral Inferno) (fix...) maybe.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Directive Swagger (Spectral Inferno) (fix...) maybe.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Directive Swagger (Spectral Inferno) (fix...) maybe.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Directive Swagger (Spectral Inferno) (fix...) maybe.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Flicker (@xis).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Flicker (@xis).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Flicker (@xis).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Flicker (@xis).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Flicker.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Flicker.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Flicker.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Flicker.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Lost Star (Flash).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Lost Star (Flash).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Lost Star (Flash).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Lost Star (Flash).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Recirculate (Cool).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Recirculate (Cool).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Recirculate (Cool).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Recirculate (Cool).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Sine Wave.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Sine Wave.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Sine Wave.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Sine Wave.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix (Ethereal Drift).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix (Ethereal Drift).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix (Ethereal Drift).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix (Ethereal Drift).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix (bb4.5).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix (bb4.5).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix (bb4.5).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix (bb4.5).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Shift Matrix.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Thing (Spiderman Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Thing (Spiderman Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Thing (Spiderman Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Slow Thing (Spiderman Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Spiral Tabletop (New and Improved!).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Spiral Tabletop (New and Improved!).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Spiral Tabletop (New and Improved!).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Spiral Tabletop (New and Improved!).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Spokes (More Dynamic).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Spokes (More Dynamic).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Spokes (More Dynamic).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Spokes (More Dynamic).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Target Practice (tracking retreat slide).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Target Practice (tracking retreat slide).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek - Target Practice (tracking retreat slide).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek - Target Practice (tracking retreat slide).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Telek EMPR - Scanner - Trust me I've got a Melways.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek EMPR - Scanner - Trust me I've got a Melways.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Telek EMPR - Scanner - Trust me I've got a Melways.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Telek EMPR - Scanner - Trust me I've got a Melways.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/TobiasWolfBoi - Cataract.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/TobiasWolfBoi - Cataract.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/TobiasWolfBoi - Cataract.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/TobiasWolfBoi - Cataract.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/TobiasWolfBoi - The Pit.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/TobiasWolfBoi - The Pit.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/TobiasWolfBoi - The Pit.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/TobiasWolfBoi - The Pit.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Tschoey - Music Flower.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Tschoey - Music Flower.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Tschoey - Music Flower.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Tschoey - Music Flower.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Tux.tga b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Tux.tga similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Tux.tga rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Tux.tga diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & CTho - Bad Vibes.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & CTho - Bad Vibes.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & CTho - Bad Vibes.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & CTho - Bad Vibes.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Che - Oddnezz 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Che - Oddnezz 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Che - Oddnezz 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Che - Oddnezz 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Che - Oddnezz 4 (Done it again).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Che - Oddnezz 4 (Done it again).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Che - Oddnezz 4 (Done it again).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Che - Oddnezz 4 (Done it again).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Dual Wave 3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Dual Wave 3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Dual Wave 3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Dual Wave 3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Logic Morph.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Logic Morph.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Logic Morph.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Logic Morph.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Spirit Morph.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Spirit Morph.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Spirit Morph.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Illusion - Spirit Morph.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - For The Seagull.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - For The Seagull.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - For The Seagull.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - For The Seagull.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Luckless.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Luckless.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Luckless.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Luckless.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Rainbow Obscura.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Rainbow Obscura.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Rainbow Obscura.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Rainbow Obscura.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Slow Solstice.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Slow Solstice.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Slow Solstice.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Slow Solstice.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Triptionary.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Triptionary.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Triptionary.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Triptionary.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars (Hall of Shadows mi.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars (Hall of Shadows mi.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars (Hall of Shadows mi.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars (Hall of Shadows mi.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Wormhole Pillars.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Xen Traffic.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Xen Traffic.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Xen Traffic.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained & Rovastar - Xen Traffic.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - A Matter Of Taste (Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - A Matter Of Taste (Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - A Matter Of Taste (Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - A Matter Of Taste (Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - All You Can Eat.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - All You Can Eat.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - All You Can Eat.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - All You Can Eat.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Bad Karma Oddnezz Style.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Bad Karma Oddnezz Style.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Bad Karma Oddnezz Style.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Bad Karma Oddnezz Style.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo (Demonology Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo (Demonology Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo (Demonology Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo (Demonology Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 1.0.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 1.0.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 1.0.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 1.0.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 10.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 10.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 10.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 10.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.0.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.0.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.0.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.0.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.1.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.1.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.1.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.1.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.3.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.3.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.3.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Beat Demo 2.3.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Cartoon Factory.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Cartoon Factory.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Cartoon Factory.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Cartoon Factory.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Cranked On Failure.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Cranked On Failure.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Cranked On Failure.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Cranked On Failure.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Custom Gramatix (Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Custom Gramatix (Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Custom Gramatix (Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Custom Gramatix (Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Deeper Logic.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Deeper Logic.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Deeper Logic.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Deeper Logic.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Free to Feel (Valium Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Free to Feel (Valium Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Free to Feel (Valium Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Free to Feel (Valium Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - French Clothing.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - French Clothing.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - French Clothing.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - French Clothing.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Games With Light & Sound.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Games With Light & Sound.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Games With Light & Sound.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Games With Light & Sound.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Ghostlight Whisper.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Ghostlight Whisper.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Ghostlight Whisper.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Ghostlight Whisper.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - God Of The Game (Remix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - God Of The Game (Remix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - God Of The Game (Remix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - God Of The Game (Remix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Goo Kung Fu.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Goo Kung Fu.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Goo Kung Fu.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Goo Kung Fu.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Goofy Beat Detection.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Goofy Beat Detection.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Goofy Beat Detection.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Goofy Beat Detection.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Housed In A Childish Mind.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Housed In A Childish Mind.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Housed In A Childish Mind.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Housed In A Childish Mind.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - In Memory Of Peg.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - In Memory Of Peg.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - In Memory Of Peg.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - In Memory Of Peg.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Invariant Under Rigorous Motions.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Invariant Under Rigorous Motions.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Invariant Under Rigorous Motions.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Invariant Under Rigorous Motions.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Jaded Emotion.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Jaded Emotion.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Jaded Emotion.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Jaded Emotion.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Jaundice.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Jaundice.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Jaundice.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Jaundice.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Making a Science of It 4.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Making a Science of It 4.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Making a Science of It 4.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Making a Science of It 4.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Morat's Final Voyage.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Morat's Final Voyage.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Morat's Final Voyage.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Morat's Final Voyage.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Non-Professional Music Analyzer.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Non-Professional Music Analyzer.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Non-Professional Music Analyzer.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Non-Professional Music Analyzer.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Painful Plasma (Multi-Wave Mirrored Rage) -- Ro.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Painful Plasma (Multi-Wave Mirrored Rage) -- Ro.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Painful Plasma (Multi-Wave Mirrored Rage) -- Ro.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Painful Plasma (Multi-Wave Mirrored Rage) -- Ro.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Perverted Dialect.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Perverted Dialect.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Perverted Dialect.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Perverted Dialect.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Exile.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Exile.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Exile.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Exile.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Nectar.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Nectar.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Nectar.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Nectar.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Poison.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Poison.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Poison.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Picture Of Poison.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - ReAwoke.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - ReAwoke.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - ReAwoke.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - ReAwoke.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Resistance.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Resistance.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Resistance.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Resistance.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Ribald Ballad.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Ribald Ballad.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Ribald Ballad.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Ribald Ballad.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Shaping The Grid.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Shaping The Grid.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Shaping The Grid.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Shaping The Grid.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Subjective Experience Of The Manifold.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Subjective Experience Of The Manifold.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Subjective Experience Of The Manifold.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Subjective Experience Of The Manifold.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unclaimed Wreckage 2 (Shamanic).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unclaimed Wreckage 2 (Shamanic).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unclaimed Wreckage 2 (Shamanic).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unclaimed Wreckage 2 (Shamanic).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unclaimed Wreckage.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unclaimed Wreckage.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unclaimed Wreckage.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unclaimed Wreckage.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unified Drag 2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unified Drag 2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unified Drag 2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Unified Drag 2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Working the Grid.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Working the Grid.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Working the Grid.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - Working the Grid.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - ventilation.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - ventilation.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Unchained - ventilation.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Unchained - ventilation.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Aderrasi - Oceanic Bassograph (New Jersey Shore Mix.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Aderrasi - Oceanic Bassograph (New Jersey Shore Mix.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Aderrasi - Oceanic Bassograph (New Jersey Shore Mix.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Aderrasi - Oceanic Bassograph (New Jersey Shore Mix.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Idiot - ATan2 Demo (Spiraling Mad Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Idiot - ATan2 Demo (Spiraling Mad Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Idiot - ATan2 Demo (Spiraling Mad Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Idiot - ATan2 Demo (Spiraling Mad Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Krash - Extremophile.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Krash - Extremophile.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Krash - Extremophile.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Krash - Extremophile.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Mstress - Celebrate.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Mstress - Celebrate.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Mstress - Celebrate.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Mstress - Celebrate.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Mstress - Toxic Storm On Acid Sea (The End Of The W.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Mstress - Toxic Storm On Acid Sea (The End Of The W.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Mstress - Toxic Storm On Acid Sea (The End Of The W.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Mstress - Toxic Storm On Acid Sea (The End Of The W.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Rovastar - Crystal Ball (Cerimonial Decor Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Rovastar - Crystal Ball (Cerimonial Decor Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Rovastar - Crystal Ball (Cerimonial Decor Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot & Rovastar - Crystal Ball (Cerimonial Decor Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Azirphaeli's Mirror.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Azirphaeli's Mirror.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Azirphaeli's Mirror.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Azirphaeli's Mirror.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Block Of Sound (Abstract Architecture Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Block Of Sound (Abstract Architecture Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Block Of Sound (Abstract Architecture Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Block Of Sound (Abstract Architecture Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Block Of Sound (Fractal Construction Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Block Of Sound (Fractal Construction Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Block Of Sound (Fractal Construction Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Block Of Sound (Fractal Construction Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Color Of Music.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Color Of Music.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Color Of Music.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Color Of Music.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Crystal Ball (Magical Reaction Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Crystal Ball (Magical Reaction Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Crystal Ball (Magical Reaction Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Crystal Ball (Magical Reaction Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - De(-a)range(d)(ment) complex.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - De(-a)range(d)(ment) complex.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - De(-a)range(d)(ment) complex.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - De(-a)range(d)(ment) complex.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - De(-a)range(d)(ment) strain.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - De(-a)range(d)(ment) strain.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - De(-a)range(d)(ment) strain.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - De(-a)range(d)(ment) strain.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Digiscape Advanced Processor.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Digiscape Advanced Processor.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Digiscape Advanced Processor.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Digiscape Advanced Processor.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Ether Storm.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Ether Storm.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Ether Storm.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Ether Storm.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Global Earthquake.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Global Earthquake.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Global Earthquake.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Global Earthquake.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Inside The Planar Portal.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Inside The Planar Portal.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Inside The Planar Portal.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Inside The Planar Portal.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Mixing Pot.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Mixing Pot.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Mixing Pot.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Mixing Pot.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Puddle Of Music.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Puddle Of Music.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Puddle Of Music.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Puddle Of Music.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Rainbow Planet Under Attack.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Rainbow Planet Under Attack.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Rainbow Planet Under Attack.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Rainbow Planet Under Attack.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Rush.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Rush.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Rush.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Rush.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - S Pulse Virus.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - S Pulse Virus.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - S Pulse Virus.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - S Pulse Virus.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - String.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - String.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - String.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - String.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Tangent Universe (Collapsed With Artifact Mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Tangent Universe (Collapsed With Artifact Mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Tangent Universe (Collapsed With Artifact Mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Tangent Universe (Collapsed With Artifact Mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - The Deeper.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - The Deeper.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - The Deeper.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - The Deeper.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - The Inner Workings of my New Computer.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - The Inner Workings of my New Computer.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - The Inner Workings of my New Computer.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - The Inner Workings of my New Computer.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Visionarie (geiss aspect ratio fix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Visionarie (geiss aspect ratio fix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Visionarie (geiss aspect ratio fix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Visionarie (geiss aspect ratio fix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Waves Of Blood.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Waves Of Blood.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Waves Of Blood.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Waves Of Blood.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Wisps.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Wisps.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Wisps.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - Wisps.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - light of the path.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - light of the path.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot - light of the path.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot - light of the path.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/Zylot and Rovastar - Iouo Stone Morphic Fusion.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot and Rovastar - Iouo Stone Morphic Fusion.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/Zylot and Rovastar - Iouo Stone Morphic Fusion.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/Zylot and Rovastar - Iouo Stone Morphic Fusion.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/[Ishan] - Life in the drains.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/[Ishan] - Life in the drains.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/[Ishan] - Life in the drains.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/[Ishan] - Life in the drains.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/baked - mushroom rainbows[2].milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/baked - mushroom rainbows[2].milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/baked - mushroom rainbows[2].milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/baked - mushroom rainbows[2].milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/che - adela the flower.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/che - adela the flower.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/che - adela the flower.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/che - adela the flower.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/che - burning hus (oil mix).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/che - burning hus (oil mix).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/che - burning hus (oil mix).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/che - burning hus (oil mix).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/che - terracarbon stream.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/che - terracarbon stream.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/che - terracarbon stream.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/che - terracarbon stream.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/fiShbRaiN - blueprint.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/fiShbRaiN - blueprint.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/fiShbRaiN - blueprint.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/fiShbRaiN - blueprint.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/headphones.tga b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/headphones.tga similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/headphones.tga rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/headphones.tga diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Nothing Yet - 03 - The worst of the pack.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Nothing Yet - 03 - The worst of the pack.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Nothing Yet - 03 - The worst of the pack.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Nothing Yet - 03 - The worst of the pack.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Nucleus.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Nucleus.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Nucleus.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Nucleus.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Sinful Code (unchained style).milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Sinful Code (unchained style).milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Sinful Code (unchained style).milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Sinful Code (unchained style).milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Some big word I learned.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Some big word I learned.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Some big word I learned.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Some big word I learned.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Spectrum.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Spectrum.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/idiot - Spectrum.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/idiot - Spectrum.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/illusion & studio music - charged bliss.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/illusion & studio music - charged bliss.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/illusion & studio music - charged bliss.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/illusion & studio music - charged bliss.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/nil - Can't Stop the Blithering.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Can't Stop the Blithering.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/nil - Can't Stop the Blithering.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Can't Stop the Blithering.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/nil - Can't Stop the Cramming.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Can't Stop the Cramming.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/nil - Can't Stop the Cramming.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Can't Stop the Cramming.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/nil - Cid and Lucy.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Cid and Lucy.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/nil - Cid and Lucy.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Cid and Lucy.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/nil - Disco Comet.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Disco Comet.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/nil - Disco Comet.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Disco Comet.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/nil - Singularity in My Oscilloscope.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Singularity in My Oscilloscope.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/nil - Singularity in My Oscilloscope.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Singularity in My Oscilloscope.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/nil - Vortex of Vortices.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Vortex of Vortices.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/nil - Vortex of Vortices.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/nil - Vortex of Vortices.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/project.tga b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/project.tga similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/project.tga rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/project.tga diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/shifter - escape the worm - Eo.S. + Phat - Before_It_Eats_Your_Brain_Mix_v2.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/shifter - escape the worm - Eo.S. + Phat - Before_It_Eats_Your_Brain_Mix_v2.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/shifter - escape the worm - Eo.S. + Phat - Before_It_Eats_Your_Brain_Mix_v2.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/shifter - escape the worm - Eo.S. + Phat - Before_It_Eats_Your_Brain_Mix_v2.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/presets/shifter - escape the worm - Eo.S. + Phat 5362.milk b/xbmc/visualizations/XBMCProjectM/libprojectM/presets/shifter - escape the worm - Eo.S. + Phat 5362.milk similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/presets/shifter - escape the worm - Eo.S. + Phat 5362.milk rename to xbmc/visualizations/XBMCProjectM/libprojectM/presets/shifter - escape the worm - Eo.S. + Phat 5362.milk diff --git a/src/visualizations/XBMCProjectM/libprojectM/projectM.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/projectM.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/projectM.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/projectM.dsp b/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.dsp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/projectM.dsp rename to xbmc/visualizations/XBMCProjectM/libprojectM/projectM.dsp diff --git a/src/visualizations/XBMCProjectM/libprojectM/projectM.hpp b/xbmc/visualizations/XBMCProjectM/libprojectM/projectM.hpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/projectM.hpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/projectM.hpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/resource.h b/xbmc/visualizations/XBMCProjectM/libprojectM/resource.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/resource.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/resource.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/sdltoprojectM.h b/xbmc/visualizations/XBMCProjectM/libprojectM/sdltoprojectM.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/sdltoprojectM.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/sdltoprojectM.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/stb_image_aug.c b/xbmc/visualizations/XBMCProjectM/libprojectM/stb_image_aug.c similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/stb_image_aug.c rename to xbmc/visualizations/XBMCProjectM/libprojectM/stb_image_aug.c diff --git a/src/visualizations/XBMCProjectM/libprojectM/stb_image_aug.h b/xbmc/visualizations/XBMCProjectM/libprojectM/stb_image_aug.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/stb_image_aug.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/stb_image_aug.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/stbi_DDS_aug.h b/xbmc/visualizations/XBMCProjectM/libprojectM/stbi_DDS_aug.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/stbi_DDS_aug.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/stbi_DDS_aug.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/stbi_DDS_aug_c.h b/xbmc/visualizations/XBMCProjectM/libprojectM/stbi_DDS_aug_c.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/stbi_DDS_aug_c.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/stbi_DDS_aug_c.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/timer.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/timer.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/timer.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/timer.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/timer.h b/xbmc/visualizations/XBMCProjectM/libprojectM/timer.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/timer.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/timer.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/win32-dirent.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/win32-dirent.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/win32-dirent.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/win32-dirent.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/win32-dirent.h b/xbmc/visualizations/XBMCProjectM/libprojectM/win32-dirent.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/win32-dirent.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/win32-dirent.h diff --git a/src/visualizations/XBMCProjectM/libprojectM/wipemalloc.cpp b/xbmc/visualizations/XBMCProjectM/libprojectM/wipemalloc.cpp similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/wipemalloc.cpp rename to xbmc/visualizations/XBMCProjectM/libprojectM/wipemalloc.cpp diff --git a/src/visualizations/XBMCProjectM/libprojectM/wipemalloc.h b/xbmc/visualizations/XBMCProjectM/libprojectM/wipemalloc.h similarity index 100% rename from src/visualizations/XBMCProjectM/libprojectM/wipemalloc.h rename to xbmc/visualizations/XBMCProjectM/libprojectM/wipemalloc.h diff --git a/src/visualizations/XBMCProjectM/projectm_1.2.0.patch b/xbmc/visualizations/XBMCProjectM/projectm_1.2.0.patch similarity index 100% rename from src/visualizations/XBMCProjectM/projectm_1.2.0.patch rename to xbmc/visualizations/XBMCProjectM/projectm_1.2.0.patch diff --git a/src/visualizations/XBMCProjectM/win32/glew/ReadMe.txt b/xbmc/visualizations/XBMCProjectM/win32/glew/ReadMe.txt similarity index 100% rename from src/visualizations/XBMCProjectM/win32/glew/ReadMe.txt rename to xbmc/visualizations/XBMCProjectM/win32/glew/ReadMe.txt diff --git a/src/visualizations/XBMCProjectM/win32/glew/glew32.dll b/xbmc/visualizations/XBMCProjectM/win32/glew/glew32.dll similarity index 100% rename from src/visualizations/XBMCProjectM/win32/glew/glew32.dll rename to xbmc/visualizations/XBMCProjectM/win32/glew/glew32.dll diff --git a/src/visualizations/XBMCProjectM/win32/glew/libglew32.a b/xbmc/visualizations/XBMCProjectM/win32/glew/libglew32.a similarity index 100% rename from src/visualizations/XBMCProjectM/win32/glew/libglew32.a rename to xbmc/visualizations/XBMCProjectM/win32/glew/libglew32.a diff --git a/src/visualizations/XBMCProjectM/win32/glew/libglew32.dll.a b/xbmc/visualizations/XBMCProjectM/win32/glew/libglew32.dll.a similarity index 100% rename from src/visualizations/XBMCProjectM/win32/glew/libglew32.dll.a rename to xbmc/visualizations/XBMCProjectM/win32/glew/libglew32.dll.a diff --git a/src/visualizations/XBMCProjectM/win32/pthreads/pthread.h b/xbmc/visualizations/XBMCProjectM/win32/pthreads/pthread.h similarity index 100% rename from src/visualizations/XBMCProjectM/win32/pthreads/pthread.h rename to xbmc/visualizations/XBMCProjectM/win32/pthreads/pthread.h diff --git a/src/visualizations/XBMCProjectM/win32/pthreads/sched.h b/xbmc/visualizations/XBMCProjectM/win32/pthreads/sched.h similarity index 100% rename from src/visualizations/XBMCProjectM/win32/pthreads/sched.h rename to xbmc/visualizations/XBMCProjectM/win32/pthreads/sched.h diff --git a/src/visualizations/fishBMC/Makefile.in b/xbmc/visualizations/fishBMC/Makefile.in similarity index 100% rename from src/visualizations/fishBMC/Makefile.in rename to xbmc/visualizations/fishBMC/Makefile.in diff --git a/src/visualizations/fishBMC/analyst.c b/xbmc/visualizations/fishBMC/analyst.c similarity index 100% rename from src/visualizations/fishBMC/analyst.c rename to xbmc/visualizations/fishBMC/analyst.c diff --git a/src/visualizations/fishBMC/analyst.h b/xbmc/visualizations/fishBMC/analyst.h similarity index 100% rename from src/visualizations/fishBMC/analyst.h rename to xbmc/visualizations/fishBMC/analyst.h diff --git a/src/visualizations/fishBMC/audiobuffer.c b/xbmc/visualizations/fishBMC/audiobuffer.c similarity index 100% rename from src/visualizations/fishBMC/audiobuffer.c rename to xbmc/visualizations/fishBMC/audiobuffer.c diff --git a/src/visualizations/fishBMC/audiobuffer.h b/xbmc/visualizations/fishBMC/audiobuffer.h similarity index 100% rename from src/visualizations/fishBMC/audiobuffer.h rename to xbmc/visualizations/fishBMC/audiobuffer.h diff --git a/src/visualizations/fishBMC/blurengine.c b/xbmc/visualizations/fishBMC/blurengine.c similarity index 100% rename from src/visualizations/fishBMC/blurengine.c rename to xbmc/visualizations/fishBMC/blurengine.c diff --git a/src/visualizations/fishBMC/blurengine.h b/xbmc/visualizations/fishBMC/blurengine.h similarity index 100% rename from src/visualizations/fishBMC/blurengine.h rename to xbmc/visualizations/fishBMC/blurengine.h diff --git a/src/visualizations/fishBMC/cpudetect.c b/xbmc/visualizations/fishBMC/cpudetect.c similarity index 100% rename from src/visualizations/fishBMC/cpudetect.c rename to xbmc/visualizations/fishBMC/cpudetect.c diff --git a/src/visualizations/fishBMC/fische.c b/xbmc/visualizations/fishBMC/fische.c similarity index 100% rename from src/visualizations/fishBMC/fische.c rename to xbmc/visualizations/fishBMC/fische.c diff --git a/src/visualizations/fishBMC/fische.h b/xbmc/visualizations/fishBMC/fische.h similarity index 100% rename from src/visualizations/fishBMC/fische.h rename to xbmc/visualizations/fishBMC/fische.h diff --git a/src/visualizations/fishBMC/fische_internal.h b/xbmc/visualizations/fishBMC/fische_internal.h similarity index 100% rename from src/visualizations/fishBMC/fische_internal.h rename to xbmc/visualizations/fishBMC/fische_internal.h diff --git a/src/visualizations/fishBMC/fishbmc_addon.cpp b/xbmc/visualizations/fishBMC/fishbmc_addon.cpp similarity index 100% rename from src/visualizations/fishBMC/fishbmc_addon.cpp rename to xbmc/visualizations/fishBMC/fishbmc_addon.cpp diff --git a/src/visualizations/fishBMC/fishbmc_directx.hpp b/xbmc/visualizations/fishBMC/fishbmc_directx.hpp similarity index 100% rename from src/visualizations/fishBMC/fishbmc_directx.hpp rename to xbmc/visualizations/fishBMC/fishbmc_directx.hpp diff --git a/src/visualizations/fishBMC/fishbmc_opengl.hpp b/xbmc/visualizations/fishBMC/fishbmc_opengl.hpp similarity index 100% rename from src/visualizations/fishBMC/fishbmc_opengl.hpp rename to xbmc/visualizations/fishBMC/fishbmc_opengl.hpp diff --git a/src/visualizations/fishBMC/screenbuffer.c b/xbmc/visualizations/fishBMC/screenbuffer.c similarity index 100% rename from src/visualizations/fishBMC/screenbuffer.c rename to xbmc/visualizations/fishBMC/screenbuffer.c diff --git a/src/visualizations/fishBMC/screenbuffer.h b/xbmc/visualizations/fishBMC/screenbuffer.h similarity index 100% rename from src/visualizations/fishBMC/screenbuffer.h rename to xbmc/visualizations/fishBMC/screenbuffer.h diff --git a/src/visualizations/fishBMC/vector.c b/xbmc/visualizations/fishBMC/vector.c similarity index 100% rename from src/visualizations/fishBMC/vector.c rename to xbmc/visualizations/fishBMC/vector.c diff --git a/src/visualizations/fishBMC/vector.h b/xbmc/visualizations/fishBMC/vector.h similarity index 100% rename from src/visualizations/fishBMC/vector.h rename to xbmc/visualizations/fishBMC/vector.h diff --git a/src/visualizations/fishBMC/vectorfield.c b/xbmc/visualizations/fishBMC/vectorfield.c similarity index 100% rename from src/visualizations/fishBMC/vectorfield.c rename to xbmc/visualizations/fishBMC/vectorfield.c diff --git a/src/visualizations/fishBMC/vectorfield.h b/xbmc/visualizations/fishBMC/vectorfield.h similarity index 100% rename from src/visualizations/fishBMC/vectorfield.h rename to xbmc/visualizations/fishBMC/vectorfield.h diff --git a/src/visualizations/fishBMC/wavepainter.c b/xbmc/visualizations/fishBMC/wavepainter.c similarity index 100% rename from src/visualizations/fishBMC/wavepainter.c rename to xbmc/visualizations/fishBMC/wavepainter.c diff --git a/src/visualizations/fishBMC/wavepainter.h b/xbmc/visualizations/fishBMC/wavepainter.h similarity index 100% rename from src/visualizations/fishBMC/wavepainter.h rename to xbmc/visualizations/fishBMC/wavepainter.h diff --git a/src/win32/IMMNotificationClient.h b/xbmc/win32/IMMNotificationClient.h similarity index 100% rename from src/win32/IMMNotificationClient.h rename to xbmc/win32/IMMNotificationClient.h diff --git a/src/win32/PlatformDefs.h b/xbmc/win32/PlatformDefs.h similarity index 100% rename from src/win32/PlatformDefs.h rename to xbmc/win32/PlatformDefs.h diff --git a/src/win32/PlatformInclude.h b/xbmc/win32/PlatformInclude.h similarity index 100% rename from src/win32/PlatformInclude.h rename to xbmc/win32/PlatformInclude.h diff --git a/src/win32/WIN32Util.cpp b/xbmc/win32/WIN32Util.cpp similarity index 100% rename from src/win32/WIN32Util.cpp rename to xbmc/win32/WIN32Util.cpp diff --git a/src/win32/WIN32Util.h b/xbmc/win32/WIN32Util.h similarity index 100% rename from src/win32/WIN32Util.h rename to xbmc/win32/WIN32Util.h diff --git a/src/win32/WMIInterface.cpp b/xbmc/win32/WMIInterface.cpp similarity index 100% rename from src/win32/WMIInterface.cpp rename to xbmc/win32/WMIInterface.cpp diff --git a/src/win32/WMIInterface.h b/xbmc/win32/WMIInterface.h similarity index 100% rename from src/win32/WMIInterface.h rename to xbmc/win32/WMIInterface.h diff --git a/src/win32/Win32DelayedDllLoad.cpp b/xbmc/win32/Win32DelayedDllLoad.cpp similarity index 100% rename from src/win32/Win32DelayedDllLoad.cpp rename to xbmc/win32/Win32DelayedDllLoad.cpp diff --git a/src/win32/WindowHelper.cpp b/xbmc/win32/WindowHelper.cpp similarity index 100% rename from src/win32/WindowHelper.cpp rename to xbmc/win32/WindowHelper.cpp diff --git a/src/win32/WindowHelper.h b/xbmc/win32/WindowHelper.h similarity index 100% rename from src/win32/WindowHelper.h rename to xbmc/win32/WindowHelper.h diff --git a/src/win32/XBMC_PC.cpp b/xbmc/win32/XBMC_PC.cpp similarity index 100% rename from src/win32/XBMC_PC.cpp rename to xbmc/win32/XBMC_PC.cpp diff --git a/src/win32/XBMC_PC.rc.in b/xbmc/win32/XBMC_PC.rc.in similarity index 100% rename from src/win32/XBMC_PC.rc.in rename to xbmc/win32/XBMC_PC.rc.in diff --git a/src/win32/arpa/inet.h b/xbmc/win32/arpa/inet.h similarity index 100% rename from src/win32/arpa/inet.h rename to xbmc/win32/arpa/inet.h diff --git a/src/win32/dirent.h b/xbmc/win32/dirent.h similarity index 100% rename from src/win32/dirent.h rename to xbmc/win32/dirent.h diff --git a/src/win32/my_ntddcdrm.h b/xbmc/win32/my_ntddcdrm.h similarity index 100% rename from src/win32/my_ntddcdrm.h rename to xbmc/win32/my_ntddcdrm.h diff --git a/src/win32/my_ntddscsi.h b/xbmc/win32/my_ntddscsi.h similarity index 100% rename from src/win32/my_ntddscsi.h rename to xbmc/win32/my_ntddscsi.h diff --git a/src/win32/netdb.h b/xbmc/win32/netdb.h similarity index 100% rename from src/win32/netdb.h rename to xbmc/win32/netdb.h diff --git a/src/win32/netinet/in.h b/xbmc/win32/netinet/in.h similarity index 100% rename from src/win32/netinet/in.h rename to xbmc/win32/netinet/in.h diff --git a/src/win32/netinet/tcp.h b/xbmc/win32/netinet/tcp.h similarity index 100% rename from src/win32/netinet/tcp.h rename to xbmc/win32/netinet/tcp.h diff --git a/src/win32/pch.cpp b/xbmc/win32/pch.cpp similarity index 100% rename from src/win32/pch.cpp rename to xbmc/win32/pch.cpp diff --git a/src/win32/pch.h b/xbmc/win32/pch.h similarity index 100% rename from src/win32/pch.h rename to xbmc/win32/pch.h diff --git a/src/win32/resource.h b/xbmc/win32/resource.h similarity index 100% rename from src/win32/resource.h rename to xbmc/win32/resource.h diff --git a/src/win32/stat_utf8.cpp b/xbmc/win32/stat_utf8.cpp similarity index 100% rename from src/win32/stat_utf8.cpp rename to xbmc/win32/stat_utf8.cpp diff --git a/src/win32/stat_utf8.h b/xbmc/win32/stat_utf8.h similarity index 100% rename from src/win32/stat_utf8.h rename to xbmc/win32/stat_utf8.h diff --git a/src/win32/stdio_utf8.cpp b/xbmc/win32/stdio_utf8.cpp similarity index 100% rename from src/win32/stdio_utf8.cpp rename to xbmc/win32/stdio_utf8.cpp diff --git a/src/win32/stdio_utf8.h b/xbmc/win32/stdio_utf8.h similarity index 100% rename from src/win32/stdio_utf8.h rename to xbmc/win32/stdio_utf8.h diff --git a/src/win32/strverscmp.cpp b/xbmc/win32/strverscmp.cpp similarity index 100% rename from src/win32/strverscmp.cpp rename to xbmc/win32/strverscmp.cpp diff --git a/src/win32/sys/select.h b/xbmc/win32/sys/select.h similarity index 100% rename from src/win32/sys/select.h rename to xbmc/win32/sys/select.h diff --git a/src/win32/sys/socket.h b/xbmc/win32/sys/socket.h similarity index 100% rename from src/win32/sys/socket.h rename to xbmc/win32/sys/socket.h diff --git a/src/win32/sys/time.h b/xbmc/win32/sys/time.h similarity index 100% rename from src/win32/sys/time.h rename to xbmc/win32/sys/time.h diff --git a/src/win32/unistd.h b/xbmc/win32/unistd.h similarity index 100% rename from src/win32/unistd.h rename to xbmc/win32/unistd.h diff --git a/src/windowing/DllWaylandClient.h b/xbmc/windowing/DllWaylandClient.h similarity index 100% rename from src/windowing/DllWaylandClient.h rename to xbmc/windowing/DllWaylandClient.h diff --git a/src/windowing/DllWaylandEgl.h b/xbmc/windowing/DllWaylandEgl.h similarity index 100% rename from src/windowing/DllWaylandEgl.h rename to xbmc/windowing/DllWaylandEgl.h diff --git a/src/windowing/DllXKBCommon.h b/xbmc/windowing/DllXKBCommon.h similarity index 100% rename from src/windowing/DllXKBCommon.h rename to xbmc/windowing/DllXKBCommon.h diff --git a/src/windowing/Makefile.in b/xbmc/windowing/Makefile.in similarity index 100% rename from src/windowing/Makefile.in rename to xbmc/windowing/Makefile.in diff --git a/src/windowing/WaylandProtocol.h b/xbmc/windowing/WaylandProtocol.h similarity index 100% rename from src/windowing/WaylandProtocol.h rename to xbmc/windowing/WaylandProtocol.h diff --git a/src/windowing/WinEvents.cpp b/xbmc/windowing/WinEvents.cpp similarity index 100% rename from src/windowing/WinEvents.cpp rename to xbmc/windowing/WinEvents.cpp diff --git a/src/windowing/WinEvents.h b/xbmc/windowing/WinEvents.h similarity index 100% rename from src/windowing/WinEvents.h rename to xbmc/windowing/WinEvents.h diff --git a/src/windowing/WinEventsLinux.cpp b/xbmc/windowing/WinEventsLinux.cpp similarity index 100% rename from src/windowing/WinEventsLinux.cpp rename to xbmc/windowing/WinEventsLinux.cpp diff --git a/src/windowing/WinEventsLinux.h b/xbmc/windowing/WinEventsLinux.h similarity index 100% rename from src/windowing/WinEventsLinux.h rename to xbmc/windowing/WinEventsLinux.h diff --git a/src/windowing/WinEventsSDL.cpp b/xbmc/windowing/WinEventsSDL.cpp similarity index 100% rename from src/windowing/WinEventsSDL.cpp rename to xbmc/windowing/WinEventsSDL.cpp diff --git a/src/windowing/WinEventsSDL.h b/xbmc/windowing/WinEventsSDL.h similarity index 100% rename from src/windowing/WinEventsSDL.h rename to xbmc/windowing/WinEventsSDL.h diff --git a/src/windowing/WinEventsWayland.cpp b/xbmc/windowing/WinEventsWayland.cpp similarity index 100% rename from src/windowing/WinEventsWayland.cpp rename to xbmc/windowing/WinEventsWayland.cpp diff --git a/src/windowing/WinEventsWayland.h b/xbmc/windowing/WinEventsWayland.h similarity index 100% rename from src/windowing/WinEventsWayland.h rename to xbmc/windowing/WinEventsWayland.h diff --git a/src/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp similarity index 100% rename from src/windowing/WinEventsX11.cpp rename to xbmc/windowing/WinEventsX11.cpp diff --git a/src/windowing/WinEventsX11.h b/xbmc/windowing/WinEventsX11.h similarity index 100% rename from src/windowing/WinEventsX11.h rename to xbmc/windowing/WinEventsX11.h diff --git a/src/windowing/WinSystem.cpp b/xbmc/windowing/WinSystem.cpp similarity index 100% rename from src/windowing/WinSystem.cpp rename to xbmc/windowing/WinSystem.cpp diff --git a/src/windowing/WinSystem.h b/xbmc/windowing/WinSystem.h similarity index 100% rename from src/windowing/WinSystem.h rename to xbmc/windowing/WinSystem.h diff --git a/src/windowing/WindowingFactory.h b/xbmc/windowing/WindowingFactory.h similarity index 100% rename from src/windowing/WindowingFactory.h rename to xbmc/windowing/WindowingFactory.h diff --git a/src/windowing/X11/Makefile b/xbmc/windowing/X11/Makefile similarity index 100% rename from src/windowing/X11/Makefile rename to xbmc/windowing/X11/Makefile diff --git a/src/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp similarity index 100% rename from src/windowing/X11/WinSystemX11.cpp rename to xbmc/windowing/X11/WinSystemX11.cpp diff --git a/src/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h similarity index 100% rename from src/windowing/X11/WinSystemX11.h rename to xbmc/windowing/X11/WinSystemX11.h diff --git a/src/windowing/X11/WinSystemX11GL.cpp b/xbmc/windowing/X11/WinSystemX11GL.cpp similarity index 100% rename from src/windowing/X11/WinSystemX11GL.cpp rename to xbmc/windowing/X11/WinSystemX11GL.cpp diff --git a/src/windowing/X11/WinSystemX11GL.h b/xbmc/windowing/X11/WinSystemX11GL.h similarity index 100% rename from src/windowing/X11/WinSystemX11GL.h rename to xbmc/windowing/X11/WinSystemX11GL.h diff --git a/src/windowing/X11/WinSystemX11GLES.cpp b/xbmc/windowing/X11/WinSystemX11GLES.cpp similarity index 100% rename from src/windowing/X11/WinSystemX11GLES.cpp rename to xbmc/windowing/X11/WinSystemX11GLES.cpp diff --git a/src/windowing/X11/WinSystemX11GLES.h b/xbmc/windowing/X11/WinSystemX11GLES.h similarity index 100% rename from src/windowing/X11/WinSystemX11GLES.h rename to xbmc/windowing/X11/WinSystemX11GLES.h diff --git a/src/windowing/X11/XRandR.cpp b/xbmc/windowing/X11/XRandR.cpp similarity index 100% rename from src/windowing/X11/XRandR.cpp rename to xbmc/windowing/X11/XRandR.cpp diff --git a/src/windowing/X11/XRandR.h b/xbmc/windowing/X11/XRandR.h similarity index 100% rename from src/windowing/X11/XRandR.h rename to xbmc/windowing/X11/XRandR.h diff --git a/src/windowing/XBMC_events.h b/xbmc/windowing/XBMC_events.h similarity index 100% rename from src/windowing/XBMC_events.h rename to xbmc/windowing/XBMC_events.h diff --git a/src/windowing/android/Makefile b/xbmc/windowing/android/Makefile similarity index 100% rename from src/windowing/android/Makefile rename to xbmc/windowing/android/Makefile diff --git a/src/windowing/android/WinEventsAndroid.cpp b/xbmc/windowing/android/WinEventsAndroid.cpp similarity index 100% rename from src/windowing/android/WinEventsAndroid.cpp rename to xbmc/windowing/android/WinEventsAndroid.cpp diff --git a/src/windowing/android/WinEventsAndroid.h b/xbmc/windowing/android/WinEventsAndroid.h similarity index 100% rename from src/windowing/android/WinEventsAndroid.h rename to xbmc/windowing/android/WinEventsAndroid.h diff --git a/src/windowing/egl/EGLNativeType.h b/xbmc/windowing/egl/EGLNativeType.h similarity index 100% rename from src/windowing/egl/EGLNativeType.h rename to xbmc/windowing/egl/EGLNativeType.h diff --git a/src/windowing/egl/EGLNativeTypeAmlogic.cpp b/xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp similarity index 100% rename from src/windowing/egl/EGLNativeTypeAmlogic.cpp rename to xbmc/windowing/egl/EGLNativeTypeAmlogic.cpp diff --git a/src/windowing/egl/EGLNativeTypeAmlogic.h b/xbmc/windowing/egl/EGLNativeTypeAmlogic.h similarity index 100% rename from src/windowing/egl/EGLNativeTypeAmlogic.h rename to xbmc/windowing/egl/EGLNativeTypeAmlogic.h diff --git a/src/windowing/egl/EGLNativeTypeAndroid.cpp b/xbmc/windowing/egl/EGLNativeTypeAndroid.cpp similarity index 100% rename from src/windowing/egl/EGLNativeTypeAndroid.cpp rename to xbmc/windowing/egl/EGLNativeTypeAndroid.cpp diff --git a/src/windowing/egl/EGLNativeTypeAndroid.h b/xbmc/windowing/egl/EGLNativeTypeAndroid.h similarity index 100% rename from src/windowing/egl/EGLNativeTypeAndroid.h rename to xbmc/windowing/egl/EGLNativeTypeAndroid.h diff --git a/src/windowing/egl/EGLNativeTypeIMX.cpp b/xbmc/windowing/egl/EGLNativeTypeIMX.cpp similarity index 100% rename from src/windowing/egl/EGLNativeTypeIMX.cpp rename to xbmc/windowing/egl/EGLNativeTypeIMX.cpp diff --git a/src/windowing/egl/EGLNativeTypeIMX.h b/xbmc/windowing/egl/EGLNativeTypeIMX.h similarity index 100% rename from src/windowing/egl/EGLNativeTypeIMX.h rename to xbmc/windowing/egl/EGLNativeTypeIMX.h diff --git a/src/windowing/egl/EGLNativeTypeRaspberryPI.cpp b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp similarity index 100% rename from src/windowing/egl/EGLNativeTypeRaspberryPI.cpp rename to xbmc/windowing/egl/EGLNativeTypeRaspberryPI.cpp diff --git a/src/windowing/egl/EGLNativeTypeRaspberryPI.h b/xbmc/windowing/egl/EGLNativeTypeRaspberryPI.h similarity index 100% rename from src/windowing/egl/EGLNativeTypeRaspberryPI.h rename to xbmc/windowing/egl/EGLNativeTypeRaspberryPI.h diff --git a/src/windowing/egl/EGLNativeTypeWayland.cpp b/xbmc/windowing/egl/EGLNativeTypeWayland.cpp similarity index 100% rename from src/windowing/egl/EGLNativeTypeWayland.cpp rename to xbmc/windowing/egl/EGLNativeTypeWayland.cpp diff --git a/src/windowing/egl/EGLNativeTypeWayland.h b/xbmc/windowing/egl/EGLNativeTypeWayland.h similarity index 100% rename from src/windowing/egl/EGLNativeTypeWayland.h rename to xbmc/windowing/egl/EGLNativeTypeWayland.h diff --git a/src/windowing/egl/EGLQuirks.h b/xbmc/windowing/egl/EGLQuirks.h similarity index 100% rename from src/windowing/egl/EGLQuirks.h rename to xbmc/windowing/egl/EGLQuirks.h diff --git a/src/windowing/egl/EGLWrapper.cpp b/xbmc/windowing/egl/EGLWrapper.cpp similarity index 100% rename from src/windowing/egl/EGLWrapper.cpp rename to xbmc/windowing/egl/EGLWrapper.cpp diff --git a/src/windowing/egl/EGLWrapper.h b/xbmc/windowing/egl/EGLWrapper.h similarity index 100% rename from src/windowing/egl/EGLWrapper.h rename to xbmc/windowing/egl/EGLWrapper.h diff --git a/src/windowing/egl/Makefile.in b/xbmc/windowing/egl/Makefile.in similarity index 100% rename from src/windowing/egl/Makefile.in rename to xbmc/windowing/egl/Makefile.in diff --git a/src/windowing/egl/WinSystemEGL.cpp b/xbmc/windowing/egl/WinSystemEGL.cpp similarity index 100% rename from src/windowing/egl/WinSystemEGL.cpp rename to xbmc/windowing/egl/WinSystemEGL.cpp diff --git a/src/windowing/egl/WinSystemEGL.h b/xbmc/windowing/egl/WinSystemEGL.h similarity index 100% rename from src/windowing/egl/WinSystemEGL.h rename to xbmc/windowing/egl/WinSystemEGL.h diff --git a/src/windowing/egl/wayland/Callback.cpp b/xbmc/windowing/egl/wayland/Callback.cpp similarity index 100% rename from src/windowing/egl/wayland/Callback.cpp rename to xbmc/windowing/egl/wayland/Callback.cpp diff --git a/src/windowing/egl/wayland/Callback.h b/xbmc/windowing/egl/wayland/Callback.h similarity index 100% rename from src/windowing/egl/wayland/Callback.h rename to xbmc/windowing/egl/wayland/Callback.h diff --git a/src/windowing/egl/wayland/Compositor.cpp b/xbmc/windowing/egl/wayland/Compositor.cpp similarity index 100% rename from src/windowing/egl/wayland/Compositor.cpp rename to xbmc/windowing/egl/wayland/Compositor.cpp diff --git a/src/windowing/egl/wayland/Compositor.h b/xbmc/windowing/egl/wayland/Compositor.h similarity index 100% rename from src/windowing/egl/wayland/Compositor.h rename to xbmc/windowing/egl/wayland/Compositor.h diff --git a/src/windowing/egl/wayland/Display.cpp b/xbmc/windowing/egl/wayland/Display.cpp similarity index 100% rename from src/windowing/egl/wayland/Display.cpp rename to xbmc/windowing/egl/wayland/Display.cpp diff --git a/src/windowing/egl/wayland/Display.h b/xbmc/windowing/egl/wayland/Display.h similarity index 100% rename from src/windowing/egl/wayland/Display.h rename to xbmc/windowing/egl/wayland/Display.h diff --git a/src/windowing/egl/wayland/OpenGLSurface.cpp b/xbmc/windowing/egl/wayland/OpenGLSurface.cpp similarity index 100% rename from src/windowing/egl/wayland/OpenGLSurface.cpp rename to xbmc/windowing/egl/wayland/OpenGLSurface.cpp diff --git a/src/windowing/egl/wayland/OpenGLSurface.h b/xbmc/windowing/egl/wayland/OpenGLSurface.h similarity index 100% rename from src/windowing/egl/wayland/OpenGLSurface.h rename to xbmc/windowing/egl/wayland/OpenGLSurface.h diff --git a/src/windowing/egl/wayland/Output.cpp b/xbmc/windowing/egl/wayland/Output.cpp similarity index 100% rename from src/windowing/egl/wayland/Output.cpp rename to xbmc/windowing/egl/wayland/Output.cpp diff --git a/src/windowing/egl/wayland/Output.h b/xbmc/windowing/egl/wayland/Output.h similarity index 100% rename from src/windowing/egl/wayland/Output.h rename to xbmc/windowing/egl/wayland/Output.h diff --git a/src/windowing/egl/wayland/Region.cpp b/xbmc/windowing/egl/wayland/Region.cpp similarity index 100% rename from src/windowing/egl/wayland/Region.cpp rename to xbmc/windowing/egl/wayland/Region.cpp diff --git a/src/windowing/egl/wayland/Region.h b/xbmc/windowing/egl/wayland/Region.h similarity index 100% rename from src/windowing/egl/wayland/Region.h rename to xbmc/windowing/egl/wayland/Region.h diff --git a/src/windowing/egl/wayland/Registry.cpp b/xbmc/windowing/egl/wayland/Registry.cpp similarity index 100% rename from src/windowing/egl/wayland/Registry.cpp rename to xbmc/windowing/egl/wayland/Registry.cpp diff --git a/src/windowing/egl/wayland/Registry.h b/xbmc/windowing/egl/wayland/Registry.h similarity index 100% rename from src/windowing/egl/wayland/Registry.h rename to xbmc/windowing/egl/wayland/Registry.h diff --git a/src/windowing/egl/wayland/Shell.cpp b/xbmc/windowing/egl/wayland/Shell.cpp similarity index 100% rename from src/windowing/egl/wayland/Shell.cpp rename to xbmc/windowing/egl/wayland/Shell.cpp diff --git a/src/windowing/egl/wayland/Shell.h b/xbmc/windowing/egl/wayland/Shell.h similarity index 100% rename from src/windowing/egl/wayland/Shell.h rename to xbmc/windowing/egl/wayland/Shell.h diff --git a/src/windowing/egl/wayland/ShellSurface.cpp b/xbmc/windowing/egl/wayland/ShellSurface.cpp similarity index 100% rename from src/windowing/egl/wayland/ShellSurface.cpp rename to xbmc/windowing/egl/wayland/ShellSurface.cpp diff --git a/src/windowing/egl/wayland/ShellSurface.h b/xbmc/windowing/egl/wayland/ShellSurface.h similarity index 100% rename from src/windowing/egl/wayland/ShellSurface.h rename to xbmc/windowing/egl/wayland/ShellSurface.h diff --git a/src/windowing/egl/wayland/Surface.cpp b/xbmc/windowing/egl/wayland/Surface.cpp similarity index 100% rename from src/windowing/egl/wayland/Surface.cpp rename to xbmc/windowing/egl/wayland/Surface.cpp diff --git a/src/windowing/egl/wayland/Surface.h b/xbmc/windowing/egl/wayland/Surface.h similarity index 100% rename from src/windowing/egl/wayland/Surface.h rename to xbmc/windowing/egl/wayland/Surface.h diff --git a/src/windowing/egl/wayland/WaylandLibraries.cpp b/xbmc/windowing/egl/wayland/WaylandLibraries.cpp similarity index 100% rename from src/windowing/egl/wayland/WaylandLibraries.cpp rename to xbmc/windowing/egl/wayland/WaylandLibraries.cpp diff --git a/src/windowing/egl/wayland/WaylandLibraries.h b/xbmc/windowing/egl/wayland/WaylandLibraries.h similarity index 100% rename from src/windowing/egl/wayland/WaylandLibraries.h rename to xbmc/windowing/egl/wayland/WaylandLibraries.h diff --git a/src/windowing/egl/wayland/XBMCConnection.cpp b/xbmc/windowing/egl/wayland/XBMCConnection.cpp similarity index 100% rename from src/windowing/egl/wayland/XBMCConnection.cpp rename to xbmc/windowing/egl/wayland/XBMCConnection.cpp diff --git a/src/windowing/egl/wayland/XBMCConnection.h b/xbmc/windowing/egl/wayland/XBMCConnection.h similarity index 100% rename from src/windowing/egl/wayland/XBMCConnection.h rename to xbmc/windowing/egl/wayland/XBMCConnection.h diff --git a/src/windowing/egl/wayland/XBMCSurface.cpp b/xbmc/windowing/egl/wayland/XBMCSurface.cpp similarity index 100% rename from src/windowing/egl/wayland/XBMCSurface.cpp rename to xbmc/windowing/egl/wayland/XBMCSurface.cpp diff --git a/src/windowing/egl/wayland/XBMCSurface.h b/xbmc/windowing/egl/wayland/XBMCSurface.h similarity index 100% rename from src/windowing/egl/wayland/XBMCSurface.h rename to xbmc/windowing/egl/wayland/XBMCSurface.h diff --git a/src/windowing/osx/Makefile b/xbmc/windowing/osx/Makefile similarity index 100% rename from src/windowing/osx/Makefile rename to xbmc/windowing/osx/Makefile diff --git a/src/windowing/osx/WinEventsIOS.h b/xbmc/windowing/osx/WinEventsIOS.h similarity index 100% rename from src/windowing/osx/WinEventsIOS.h rename to xbmc/windowing/osx/WinEventsIOS.h diff --git a/src/windowing/osx/WinEventsIOS.mm b/xbmc/windowing/osx/WinEventsIOS.mm similarity index 100% rename from src/windowing/osx/WinEventsIOS.mm rename to xbmc/windowing/osx/WinEventsIOS.mm diff --git a/src/windowing/osx/WinEventsOSX.h b/xbmc/windowing/osx/WinEventsOSX.h similarity index 100% rename from src/windowing/osx/WinEventsOSX.h rename to xbmc/windowing/osx/WinEventsOSX.h diff --git a/src/windowing/osx/WinEventsOSX.mm b/xbmc/windowing/osx/WinEventsOSX.mm similarity index 100% rename from src/windowing/osx/WinEventsOSX.mm rename to xbmc/windowing/osx/WinEventsOSX.mm diff --git a/src/windowing/osx/WinSystemIOS.h b/xbmc/windowing/osx/WinSystemIOS.h similarity index 100% rename from src/windowing/osx/WinSystemIOS.h rename to xbmc/windowing/osx/WinSystemIOS.h diff --git a/src/windowing/osx/WinSystemIOS.mm b/xbmc/windowing/osx/WinSystemIOS.mm similarity index 100% rename from src/windowing/osx/WinSystemIOS.mm rename to xbmc/windowing/osx/WinSystemIOS.mm diff --git a/src/windowing/osx/WinSystemOSX.h b/xbmc/windowing/osx/WinSystemOSX.h similarity index 100% rename from src/windowing/osx/WinSystemOSX.h rename to xbmc/windowing/osx/WinSystemOSX.h diff --git a/src/windowing/osx/WinSystemOSX.mm b/xbmc/windowing/osx/WinSystemOSX.mm similarity index 100% rename from src/windowing/osx/WinSystemOSX.mm rename to xbmc/windowing/osx/WinSystemOSX.mm diff --git a/src/windowing/osx/WinSystemOSXGL.h b/xbmc/windowing/osx/WinSystemOSXGL.h similarity index 100% rename from src/windowing/osx/WinSystemOSXGL.h rename to xbmc/windowing/osx/WinSystemOSXGL.h diff --git a/src/windowing/osx/WinSystemOSXGL.mm b/xbmc/windowing/osx/WinSystemOSXGL.mm similarity index 100% rename from src/windowing/osx/WinSystemOSXGL.mm rename to xbmc/windowing/osx/WinSystemOSXGL.mm diff --git a/src/windowing/tests/wayland/Makefile.in b/xbmc/windowing/tests/wayland/Makefile.in similarity index 100% rename from src/windowing/tests/wayland/Makefile.in rename to xbmc/windowing/tests/wayland/Makefile.in diff --git a/src/windowing/tests/wayland/StubCursorManager.cpp b/xbmc/windowing/tests/wayland/StubCursorManager.cpp similarity index 100% rename from src/windowing/tests/wayland/StubCursorManager.cpp rename to xbmc/windowing/tests/wayland/StubCursorManager.cpp diff --git a/src/windowing/tests/wayland/StubCursorManager.h b/xbmc/windowing/tests/wayland/StubCursorManager.h similarity index 100% rename from src/windowing/tests/wayland/StubCursorManager.h rename to xbmc/windowing/tests/wayland/StubCursorManager.h diff --git a/src/windowing/tests/wayland/StubEventListener.cpp b/xbmc/windowing/tests/wayland/StubEventListener.cpp similarity index 100% rename from src/windowing/tests/wayland/StubEventListener.cpp rename to xbmc/windowing/tests/wayland/StubEventListener.cpp diff --git a/src/windowing/tests/wayland/StubEventListener.h b/xbmc/windowing/tests/wayland/StubEventListener.h similarity index 100% rename from src/windowing/tests/wayland/StubEventListener.h rename to xbmc/windowing/tests/wayland/StubEventListener.h diff --git a/src/windowing/tests/wayland/TestEGLNativeTypeWayland.cpp b/xbmc/windowing/tests/wayland/TestEGLNativeTypeWayland.cpp similarity index 100% rename from src/windowing/tests/wayland/TestEGLNativeTypeWayland.cpp rename to xbmc/windowing/tests/wayland/TestEGLNativeTypeWayland.cpp diff --git a/src/windowing/tests/wayland/TestWaylandInputUnit.cpp b/xbmc/windowing/tests/wayland/TestWaylandInputUnit.cpp similarity index 100% rename from src/windowing/tests/wayland/TestWaylandInputUnit.cpp rename to xbmc/windowing/tests/wayland/TestWaylandInputUnit.cpp diff --git a/src/windowing/tests/wayland/TestXBMCWaylandInputAcceptance.cpp b/xbmc/windowing/tests/wayland/TestXBMCWaylandInputAcceptance.cpp similarity index 100% rename from src/windowing/tests/wayland/TestXBMCWaylandInputAcceptance.cpp rename to xbmc/windowing/tests/wayland/TestXBMCWaylandInputAcceptance.cpp diff --git a/src/windowing/tests/wayland/TmpEnv.cpp b/xbmc/windowing/tests/wayland/TmpEnv.cpp similarity index 100% rename from src/windowing/tests/wayland/TmpEnv.cpp rename to xbmc/windowing/tests/wayland/TmpEnv.cpp diff --git a/src/windowing/tests/wayland/TmpEnv.h b/xbmc/windowing/tests/wayland/TmpEnv.h similarity index 100% rename from src/windowing/tests/wayland/TmpEnv.h rename to xbmc/windowing/tests/wayland/TmpEnv.h diff --git a/src/windowing/tests/wayland/WestonProcess.cpp b/xbmc/windowing/tests/wayland/WestonProcess.cpp similarity index 100% rename from src/windowing/tests/wayland/WestonProcess.cpp rename to xbmc/windowing/tests/wayland/WestonProcess.cpp diff --git a/src/windowing/tests/wayland/WestonProcess.h b/xbmc/windowing/tests/wayland/WestonProcess.h similarity index 100% rename from src/windowing/tests/wayland/WestonProcess.h rename to xbmc/windowing/tests/wayland/WestonProcess.h diff --git a/src/windowing/tests/wayland/WestonTest.cpp b/xbmc/windowing/tests/wayland/WestonTest.cpp similarity index 100% rename from src/windowing/tests/wayland/WestonTest.cpp rename to xbmc/windowing/tests/wayland/WestonTest.cpp diff --git a/src/windowing/tests/wayland/WestonTest.h b/xbmc/windowing/tests/wayland/WestonTest.h similarity index 100% rename from src/windowing/tests/wayland/WestonTest.h rename to xbmc/windowing/tests/wayland/WestonTest.h diff --git a/src/windowing/tests/wayland/XBMCWayland.cpp b/xbmc/windowing/tests/wayland/XBMCWayland.cpp similarity index 100% rename from src/windowing/tests/wayland/XBMCWayland.cpp rename to xbmc/windowing/tests/wayland/XBMCWayland.cpp diff --git a/src/windowing/tests/wayland/XBMCWayland.h b/xbmc/windowing/tests/wayland/XBMCWayland.h similarity index 100% rename from src/windowing/tests/wayland/XBMCWayland.h rename to xbmc/windowing/tests/wayland/XBMCWayland.h diff --git a/src/windowing/tests/wayland/XBMCWaylandTestExtension.cpp b/xbmc/windowing/tests/wayland/XBMCWaylandTestExtension.cpp similarity index 100% rename from src/windowing/tests/wayland/XBMCWaylandTestExtension.cpp rename to xbmc/windowing/tests/wayland/XBMCWaylandTestExtension.cpp diff --git a/src/windowing/tests/wayland/protocol.xml b/xbmc/windowing/tests/wayland/protocol.xml similarity index 100% rename from src/windowing/tests/wayland/protocol.xml rename to xbmc/windowing/tests/wayland/protocol.xml diff --git a/src/windowing/wayland/CursorManager.h b/xbmc/windowing/wayland/CursorManager.h similarity index 100% rename from src/windowing/wayland/CursorManager.h rename to xbmc/windowing/wayland/CursorManager.h diff --git a/src/windowing/wayland/EventListener.h b/xbmc/windowing/wayland/EventListener.h similarity index 100% rename from src/windowing/wayland/EventListener.h rename to xbmc/windowing/wayland/EventListener.h diff --git a/src/windowing/wayland/EventLoop.cpp b/xbmc/windowing/wayland/EventLoop.cpp similarity index 100% rename from src/windowing/wayland/EventLoop.cpp rename to xbmc/windowing/wayland/EventLoop.cpp diff --git a/src/windowing/wayland/EventLoop.h b/xbmc/windowing/wayland/EventLoop.h similarity index 100% rename from src/windowing/wayland/EventLoop.h rename to xbmc/windowing/wayland/EventLoop.h diff --git a/src/windowing/wayland/EventQueueStrategy.h b/xbmc/windowing/wayland/EventQueueStrategy.h similarity index 100% rename from src/windowing/wayland/EventQueueStrategy.h rename to xbmc/windowing/wayland/EventQueueStrategy.h diff --git a/src/windowing/wayland/InputFactory.cpp b/xbmc/windowing/wayland/InputFactory.cpp similarity index 100% rename from src/windowing/wayland/InputFactory.cpp rename to xbmc/windowing/wayland/InputFactory.cpp diff --git a/src/windowing/wayland/InputFactory.h b/xbmc/windowing/wayland/InputFactory.h similarity index 100% rename from src/windowing/wayland/InputFactory.h rename to xbmc/windowing/wayland/InputFactory.h diff --git a/src/windowing/wayland/Keyboard.cpp b/xbmc/windowing/wayland/Keyboard.cpp similarity index 100% rename from src/windowing/wayland/Keyboard.cpp rename to xbmc/windowing/wayland/Keyboard.cpp diff --git a/src/windowing/wayland/Keyboard.h b/xbmc/windowing/wayland/Keyboard.h similarity index 100% rename from src/windowing/wayland/Keyboard.h rename to xbmc/windowing/wayland/Keyboard.h diff --git a/src/windowing/wayland/KeyboardProcessor.cpp b/xbmc/windowing/wayland/KeyboardProcessor.cpp similarity index 100% rename from src/windowing/wayland/KeyboardProcessor.cpp rename to xbmc/windowing/wayland/KeyboardProcessor.cpp diff --git a/src/windowing/wayland/KeyboardProcessor.h b/xbmc/windowing/wayland/KeyboardProcessor.h similarity index 100% rename from src/windowing/wayland/KeyboardProcessor.h rename to xbmc/windowing/wayland/KeyboardProcessor.h diff --git a/src/windowing/wayland/Pointer.cpp b/xbmc/windowing/wayland/Pointer.cpp similarity index 100% rename from src/windowing/wayland/Pointer.cpp rename to xbmc/windowing/wayland/Pointer.cpp diff --git a/src/windowing/wayland/Pointer.h b/xbmc/windowing/wayland/Pointer.h similarity index 100% rename from src/windowing/wayland/Pointer.h rename to xbmc/windowing/wayland/Pointer.h diff --git a/src/windowing/wayland/PointerProcessor.cpp b/xbmc/windowing/wayland/PointerProcessor.cpp similarity index 100% rename from src/windowing/wayland/PointerProcessor.cpp rename to xbmc/windowing/wayland/PointerProcessor.cpp diff --git a/src/windowing/wayland/PointerProcessor.h b/xbmc/windowing/wayland/PointerProcessor.h similarity index 100% rename from src/windowing/wayland/PointerProcessor.h rename to xbmc/windowing/wayland/PointerProcessor.h diff --git a/src/windowing/wayland/PollThread.cpp b/xbmc/windowing/wayland/PollThread.cpp similarity index 100% rename from src/windowing/wayland/PollThread.cpp rename to xbmc/windowing/wayland/PollThread.cpp diff --git a/src/windowing/wayland/PollThread.h b/xbmc/windowing/wayland/PollThread.h similarity index 100% rename from src/windowing/wayland/PollThread.h rename to xbmc/windowing/wayland/PollThread.h diff --git a/src/windowing/wayland/Seat.cpp b/xbmc/windowing/wayland/Seat.cpp similarity index 100% rename from src/windowing/wayland/Seat.cpp rename to xbmc/windowing/wayland/Seat.cpp diff --git a/src/windowing/wayland/Seat.h b/xbmc/windowing/wayland/Seat.h similarity index 100% rename from src/windowing/wayland/Seat.h rename to xbmc/windowing/wayland/Seat.h diff --git a/src/windowing/wayland/TimeoutManager.h b/xbmc/windowing/wayland/TimeoutManager.h similarity index 100% rename from src/windowing/wayland/TimeoutManager.h rename to xbmc/windowing/wayland/TimeoutManager.h diff --git a/src/windowing/wayland/Wayland11EventQueueStrategy.cpp b/xbmc/windowing/wayland/Wayland11EventQueueStrategy.cpp similarity index 100% rename from src/windowing/wayland/Wayland11EventQueueStrategy.cpp rename to xbmc/windowing/wayland/Wayland11EventQueueStrategy.cpp diff --git a/src/windowing/wayland/Wayland11EventQueueStrategy.h b/xbmc/windowing/wayland/Wayland11EventQueueStrategy.h similarity index 100% rename from src/windowing/wayland/Wayland11EventQueueStrategy.h rename to xbmc/windowing/wayland/Wayland11EventQueueStrategy.h diff --git a/src/windowing/wayland/Wayland12EventQueueStrategy.cpp b/xbmc/windowing/wayland/Wayland12EventQueueStrategy.cpp similarity index 100% rename from src/windowing/wayland/Wayland12EventQueueStrategy.cpp rename to xbmc/windowing/wayland/Wayland12EventQueueStrategy.cpp diff --git a/src/windowing/wayland/Wayland12EventQueueStrategy.h b/xbmc/windowing/wayland/Wayland12EventQueueStrategy.h similarity index 100% rename from src/windowing/wayland/Wayland12EventQueueStrategy.h rename to xbmc/windowing/wayland/Wayland12EventQueueStrategy.h diff --git a/src/windowing/windows/WinEventsWin32.cpp b/xbmc/windowing/windows/WinEventsWin32.cpp similarity index 100% rename from src/windowing/windows/WinEventsWin32.cpp rename to xbmc/windowing/windows/WinEventsWin32.cpp diff --git a/src/windowing/windows/WinEventsWin32.h b/xbmc/windowing/windows/WinEventsWin32.h similarity index 100% rename from src/windowing/windows/WinEventsWin32.h rename to xbmc/windowing/windows/WinEventsWin32.h diff --git a/src/windowing/windows/WinSystemWin32.cpp b/xbmc/windowing/windows/WinSystemWin32.cpp similarity index 100% rename from src/windowing/windows/WinSystemWin32.cpp rename to xbmc/windowing/windows/WinSystemWin32.cpp diff --git a/src/windowing/windows/WinSystemWin32.h b/xbmc/windowing/windows/WinSystemWin32.h similarity index 100% rename from src/windowing/windows/WinSystemWin32.h rename to xbmc/windowing/windows/WinSystemWin32.h diff --git a/src/windowing/windows/WinSystemWin32DX.cpp b/xbmc/windowing/windows/WinSystemWin32DX.cpp similarity index 100% rename from src/windowing/windows/WinSystemWin32DX.cpp rename to xbmc/windowing/windows/WinSystemWin32DX.cpp diff --git a/src/windowing/windows/WinSystemWin32DX.h b/xbmc/windowing/windows/WinSystemWin32DX.h similarity index 100% rename from src/windowing/windows/WinSystemWin32DX.h rename to xbmc/windowing/windows/WinSystemWin32DX.h diff --git a/src/windowing/windows/WinSystemWin32GL.cpp b/xbmc/windowing/windows/WinSystemWin32GL.cpp similarity index 100% rename from src/windowing/windows/WinSystemWin32GL.cpp rename to xbmc/windowing/windows/WinSystemWin32GL.cpp diff --git a/src/windowing/windows/WinSystemWin32GL.h b/xbmc/windowing/windows/WinSystemWin32GL.h similarity index 100% rename from src/windowing/windows/WinSystemWin32GL.h rename to xbmc/windowing/windows/WinSystemWin32GL.h diff --git a/src/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp similarity index 100% rename from src/windows/GUIMediaWindow.cpp rename to xbmc/windows/GUIMediaWindow.cpp diff --git a/src/windows/GUIMediaWindow.h b/xbmc/windows/GUIMediaWindow.h similarity index 100% rename from src/windows/GUIMediaWindow.h rename to xbmc/windows/GUIMediaWindow.h diff --git a/src/windows/GUIWindowDebugInfo.cpp b/xbmc/windows/GUIWindowDebugInfo.cpp similarity index 100% rename from src/windows/GUIWindowDebugInfo.cpp rename to xbmc/windows/GUIWindowDebugInfo.cpp diff --git a/src/windows/GUIWindowDebugInfo.h b/xbmc/windows/GUIWindowDebugInfo.h similarity index 100% rename from src/windows/GUIWindowDebugInfo.h rename to xbmc/windows/GUIWindowDebugInfo.h diff --git a/src/windows/GUIWindowFileManager.cpp b/xbmc/windows/GUIWindowFileManager.cpp similarity index 100% rename from src/windows/GUIWindowFileManager.cpp rename to xbmc/windows/GUIWindowFileManager.cpp diff --git a/src/windows/GUIWindowFileManager.h b/xbmc/windows/GUIWindowFileManager.h similarity index 100% rename from src/windows/GUIWindowFileManager.h rename to xbmc/windows/GUIWindowFileManager.h diff --git a/src/windows/GUIWindowHome.cpp b/xbmc/windows/GUIWindowHome.cpp similarity index 100% rename from src/windows/GUIWindowHome.cpp rename to xbmc/windows/GUIWindowHome.cpp diff --git a/src/windows/GUIWindowHome.h b/xbmc/windows/GUIWindowHome.h similarity index 100% rename from src/windows/GUIWindowHome.h rename to xbmc/windows/GUIWindowHome.h diff --git a/src/windows/GUIWindowLoginScreen.cpp b/xbmc/windows/GUIWindowLoginScreen.cpp similarity index 100% rename from src/windows/GUIWindowLoginScreen.cpp rename to xbmc/windows/GUIWindowLoginScreen.cpp diff --git a/src/windows/GUIWindowLoginScreen.h b/xbmc/windows/GUIWindowLoginScreen.h similarity index 100% rename from src/windows/GUIWindowLoginScreen.h rename to xbmc/windows/GUIWindowLoginScreen.h diff --git a/src/windows/GUIWindowPointer.cpp b/xbmc/windows/GUIWindowPointer.cpp similarity index 100% rename from src/windows/GUIWindowPointer.cpp rename to xbmc/windows/GUIWindowPointer.cpp diff --git a/src/windows/GUIWindowPointer.h b/xbmc/windows/GUIWindowPointer.h similarity index 100% rename from src/windows/GUIWindowPointer.h rename to xbmc/windows/GUIWindowPointer.h diff --git a/src/windows/GUIWindowScreensaver.cpp b/xbmc/windows/GUIWindowScreensaver.cpp similarity index 100% rename from src/windows/GUIWindowScreensaver.cpp rename to xbmc/windows/GUIWindowScreensaver.cpp diff --git a/src/windows/GUIWindowScreensaver.h b/xbmc/windows/GUIWindowScreensaver.h similarity index 100% rename from src/windows/GUIWindowScreensaver.h rename to xbmc/windows/GUIWindowScreensaver.h diff --git a/src/windows/GUIWindowScreensaverDim.cpp b/xbmc/windows/GUIWindowScreensaverDim.cpp similarity index 100% rename from src/windows/GUIWindowScreensaverDim.cpp rename to xbmc/windows/GUIWindowScreensaverDim.cpp diff --git a/src/windows/GUIWindowScreensaverDim.h b/xbmc/windows/GUIWindowScreensaverDim.h similarity index 100% rename from src/windows/GUIWindowScreensaverDim.h rename to xbmc/windows/GUIWindowScreensaverDim.h diff --git a/src/windows/GUIWindowStartup.cpp b/xbmc/windows/GUIWindowStartup.cpp similarity index 100% rename from src/windows/GUIWindowStartup.cpp rename to xbmc/windows/GUIWindowStartup.cpp diff --git a/src/windows/GUIWindowStartup.h b/xbmc/windows/GUIWindowStartup.h similarity index 100% rename from src/windows/GUIWindowStartup.h rename to xbmc/windows/GUIWindowStartup.h diff --git a/src/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp similarity index 100% rename from src/windows/GUIWindowSystemInfo.cpp rename to xbmc/windows/GUIWindowSystemInfo.cpp diff --git a/src/windows/GUIWindowSystemInfo.h b/xbmc/windows/GUIWindowSystemInfo.h similarity index 100% rename from src/windows/GUIWindowSystemInfo.h rename to xbmc/windows/GUIWindowSystemInfo.h diff --git a/src/windows/GUIWindowWeather.cpp b/xbmc/windows/GUIWindowWeather.cpp similarity index 100% rename from src/windows/GUIWindowWeather.cpp rename to xbmc/windows/GUIWindowWeather.cpp diff --git a/src/windows/GUIWindowWeather.h b/xbmc/windows/GUIWindowWeather.h similarity index 100% rename from src/windows/GUIWindowWeather.h rename to xbmc/windows/GUIWindowWeather.h diff --git a/src/windows/Makefile b/xbmc/windows/Makefile similarity index 100% rename from src/windows/Makefile rename to xbmc/windows/Makefile diff --git a/src/xbmc.cpp b/xbmc/xbmc.cpp similarity index 100% rename from src/xbmc.cpp rename to xbmc/xbmc.cpp diff --git a/src/xbmc.h b/xbmc/xbmc.h similarity index 100% rename from src/xbmc.h rename to xbmc/xbmc.h