diff --git a/libresonic-main/Getting Started.html b/airsonic-main/Getting Started.html
similarity index 100%
rename from libresonic-main/Getting Started.html
rename to airsonic-main/Getting Started.html
diff --git a/libresonic-main/LICENSE.TXT b/airsonic-main/LICENSE.TXT
similarity index 100%
rename from libresonic-main/LICENSE.TXT
rename to airsonic-main/LICENSE.TXT
diff --git a/libresonic-main/dreamplug.txt b/airsonic-main/dreamplug.txt
similarity index 100%
rename from libresonic-main/dreamplug.txt
rename to airsonic-main/dreamplug.txt
diff --git a/libresonic-main/pom.xml b/airsonic-main/pom.xml
similarity index 100%
rename from libresonic-main/pom.xml
rename to airsonic-main/pom.xml
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/ArtistInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/ArtistInfo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/ArtistInfo.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/ArtistInfo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtInfo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtInfo.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtInfo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/CoverArtService.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/CoverArtService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsInfo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsInfo.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsInfo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/LyricsService.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/LyricsService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/MultiService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/MultiService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/MultiService.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/MultiService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingInfo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingInfo.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingInfo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/NowPlayingService.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/NowPlayingService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueInfo.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/PlayQueueService.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistInfo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistInfo.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistInfo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/PlaylistService.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/PlaylistService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/ScanInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/ScanInfo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/ScanInfo.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/ScanInfo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/SimilarArtist.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/SimilarArtist.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/SimilarArtist.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/SimilarArtist.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/StarService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/StarService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/StarService.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/StarService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/TagService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/TagService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/TagService.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/TagService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/TopSong.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/TopSong.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/TopSong.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/TopSong.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/TransferService.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/TransferService.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/TransferService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/ajax/UploadInfo.java b/airsonic-main/src/main/java/org/airsonic/player/ajax/UploadInfo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/ajax/UploadInfo.java
rename to airsonic-main/src/main/java/org/airsonic/player/ajax/UploadInfo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/boot/Application.java b/airsonic-main/src/main/java/org/airsonic/player/boot/Application.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/boot/Application.java
rename to airsonic-main/src/main/java/org/airsonic/player/boot/Application.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/boot/TomcatApplication.java b/airsonic-main/src/main/java/org/airsonic/player/boot/TomcatApplication.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/boot/TomcatApplication.java
rename to airsonic-main/src/main/java/org/airsonic/player/boot/TomcatApplication.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/cache/CacheFactory.java b/airsonic-main/src/main/java/org/airsonic/player/cache/CacheFactory.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/cache/CacheFactory.java
rename to airsonic-main/src/main/java/org/airsonic/player/cache/CacheFactory.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/AdvancedSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/AdvancedSettingsCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/AdvancedSettingsCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/AdvancedSettingsCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/DatabaseSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/DatabaseSettingsCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/DatabaseSettingsCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/DatabaseSettingsCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/EnumHolder.java b/airsonic-main/src/main/java/org/airsonic/player/command/EnumHolder.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/EnumHolder.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/EnumHolder.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/GeneralSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/GeneralSettingsCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/GeneralSettingsCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/GeneralSettingsCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/MusicFolderSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/MusicFolderSettingsCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/MusicFolderSettingsCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/MusicFolderSettingsCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/PasswordSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/PasswordSettingsCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/PasswordSettingsCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/PasswordSettingsCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/PersonalSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/PersonalSettingsCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/PersonalSettingsCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/PersonalSettingsCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/PlayerSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/PlayerSettingsCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/PlayerSettingsCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/PlayerSettingsCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/PodcastSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/PodcastSettingsCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/PodcastSettingsCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/PodcastSettingsCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/SearchCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/SearchCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/SearchCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/SearchCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/command/UserSettingsCommand.java b/airsonic-main/src/main/java/org/airsonic/player/command/UserSettingsCommand.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/command/UserSettingsCommand.java
rename to airsonic-main/src/main/java/org/airsonic/player/command/UserSettingsCommand.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AbstractChartController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AbstractChartController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/AbstractChartController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/AbstractChartController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AccessDeniedController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AccessDeniedController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/AccessDeniedController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/AccessDeniedController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AdvancedSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/AdvancedSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/AdvancedSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AllmusicController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AllmusicController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/AllmusicController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/AllmusicController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AutoCoverDemo.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AutoCoverDemo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/AutoCoverDemo.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/AutoCoverDemo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/AvatarController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/AvatarController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/AvatarUploadController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/AvatarUploadController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/AvatarUploadController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/ChangeCoverArtController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ControllerUtils.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/ControllerUtils.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/ControllerUtils.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/CoverArtController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/CoverArtController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/CoverArtController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/DBController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/DBController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/DBController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/DLNASettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/DLNASettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/DatabaseSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/DatabaseSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/DatabaseSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/DatabaseSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/DownloadController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/DownloadController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/DownloadController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/DownloadController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/EditTagsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/EditTagsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/EditTagsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ExportPlayListController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ExportPlayListController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/ExportPlayListController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/ExportPlayListController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ExternalPlayerController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/ExternalPlayerController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/ExternalPlayerController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/GeneralSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/GeneralSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/GeneralSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/GettingStartedController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/GettingStartedController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/GettingStartedController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/HLSController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/HLSController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/HLSController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/HelpController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/HelpController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/HelpController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/HomeController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/HomeController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/HomeController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ImportPlaylistController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/ImportPlaylistController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/ImportPlaylistController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/IndexController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/IndexController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/IndexController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/IndexController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/InternetRadioSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java b/airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/JAXBWriter.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/JAXBWriter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/LeftController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/LeftController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/LeftController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/LoginController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/LoginController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/LoginController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/LoginController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/LyricsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/LyricsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/LyricsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/LyricsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/M3UController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/M3UController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/M3UController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/MainController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/MainController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/MainController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/MoreController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/MoreController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/MusicFolderSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/MusicFolderSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/MusicFolderSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/MusicFolderSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/NotFoundController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/NotFoundController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/NotFoundController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/NotFoundController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/NowPlayingController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/NowPlayingController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/NowPlayingController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/NowPlayingController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PasswordSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PasswordSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PasswordSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PasswordSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PersonalSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PersonalSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PersonalSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PlayQueueController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PlayQueueController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PlayerSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PlayerSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PlayerSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PlaylistsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PlaylistsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastChannelController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PodcastChannelController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastChannelsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PodcastChannelsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PodcastChannelsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PodcastController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PodcastController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastReceiverAdminController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastReceiverAdminController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PodcastReceiverAdminController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PodcastReceiverAdminController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/PodcastSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/PodcastSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/PodcastSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/PodcastSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ProxyController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/ProxyController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/ProxyController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/RESTController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RESTController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/RESTController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/RESTController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/RandomPlayQueueController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/RandomPlayQueueController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/RandomPlayQueueController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/RecoverController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/RecoverController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/RecoverController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ReloadFrame.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ReloadFrame.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/ReloadFrame.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/ReloadFrame.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/RightController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SearchController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SearchController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/SearchController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/SearchController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SetMusicFileInfoController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SetMusicFileInfoController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/SetMusicFileInfoController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/SetMusicFileInfoController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SetRatingController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SetRatingController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/SetRatingController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/SetRatingController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/SettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/SettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/ShareManagementController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/ShareSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/ShareSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/SonosSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/SonosSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StarredController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StarredController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/StarredController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/StarredController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StatusChartController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StatusChartController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/StatusChartController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/StatusChartController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StatusController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/StatusController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/StatusController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/StreamController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/StreamController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/TestController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/TestController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/TestController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/TestController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/TopController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/TopController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/TopController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/TopController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/TranscodingSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/TranscodingSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/UploadController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/UploadController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/UploadController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/UploadController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/UserChartController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/UserChartController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/UserChartController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/UserChartController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/UserSettingsController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/UserSettingsController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/controller/VideoPlayerController.java b/airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/controller/VideoPlayerController.java
rename to airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/AbstractDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/AbstractDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/AbstractDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/AlbumDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/AlbumDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/AlbumDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/ArtistDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/ArtistDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/ArtistDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/ArtistDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/AvatarDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/AvatarDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/AvatarDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/AvatarDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/BookmarkDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/BookmarkDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/BookmarkDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/BookmarkDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/DaoHelper.java b/airsonic-main/src/main/java/org/airsonic/player/dao/DaoHelper.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/DaoHelper.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/DaoHelper.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/GenericDaoHelper.java b/airsonic-main/src/main/java/org/airsonic/player/dao/GenericDaoHelper.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/GenericDaoHelper.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/GenericDaoHelper.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/InternetRadioDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/InternetRadioDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/InternetRadioDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/InternetRadioDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/MediaFileDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/MediaFileDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/MediaFileDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/MediaFileDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/MusicFolderDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/MusicFolderDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/MusicFolderDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/PlayQueueDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/PlayQueueDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/PlayQueueDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/PlayQueueDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/PlayerDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/PlayerDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/PlayerDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/PlayerDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/PlaylistDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/PlaylistDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/PlaylistDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/PlaylistDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/PodcastDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/PodcastDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/PodcastDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/PodcastDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/RatingDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/RatingDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/RatingDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/RatingDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/ShareDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/ShareDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/ShareDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/ShareDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/TranscodingDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/TranscodingDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/TranscodingDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/TranscodingDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java b/airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/dao/UserDao.java
rename to airsonic-main/src/main/java/org/airsonic/player/dao/UserDao.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Album.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Album.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Album.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Album.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/AlbumListType.java b/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumListType.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/AlbumListType.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/AlbumListType.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/AlbumNotes.java b/airsonic-main/src/main/java/org/airsonic/player/domain/AlbumNotes.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/AlbumNotes.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/AlbumNotes.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Artist.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Artist.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Artist.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Artist.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/ArtistBio.java b/airsonic-main/src/main/java/org/airsonic/player/domain/ArtistBio.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/ArtistBio.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/ArtistBio.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Avatar.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Avatar.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Avatar.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Avatar.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/AvatarScheme.java b/airsonic-main/src/main/java/org/airsonic/player/domain/AvatarScheme.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/AvatarScheme.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/AvatarScheme.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Bookmark.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Bookmark.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Bookmark.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Bookmark.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/CacheElement.java b/airsonic-main/src/main/java/org/airsonic/player/domain/CacheElement.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/CacheElement.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/CacheElement.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/CoverArtScheme.java b/airsonic-main/src/main/java/org/airsonic/player/domain/CoverArtScheme.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/CoverArtScheme.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/CoverArtScheme.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Genre.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Genre.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Genre.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Genre.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Genres.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Genres.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Genres.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Genres.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/InternetRadio.java b/airsonic-main/src/main/java/org/airsonic/player/domain/InternetRadio.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/InternetRadio.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/InternetRadio.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/LastFmCoverArt.java b/airsonic-main/src/main/java/org/airsonic/player/domain/LastFmCoverArt.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/LastFmCoverArt.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/LastFmCoverArt.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFile.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFile.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/MediaFile.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/MediaFile.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFileComparator.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/MediaFileComparator.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileComparator.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaFileWithUrlInfo.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileWithUrlInfo.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/MediaFileWithUrlInfo.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/MediaFileWithUrlInfo.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MediaLibraryStatistics.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MediaLibraryStatistics.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/MediaLibraryStatistics.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/MediaLibraryStatistics.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MusicFolder.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolder.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/MusicFolder.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolder.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MusicFolderContent.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolderContent.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/MusicFolderContent.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/MusicFolderContent.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/MusicIndex.java b/airsonic-main/src/main/java/org/airsonic/player/domain/MusicIndex.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/MusicIndex.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/MusicIndex.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/ParamSearchResult.java b/airsonic-main/src/main/java/org/airsonic/player/domain/ParamSearchResult.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/ParamSearchResult.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/ParamSearchResult.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/PlayQueue.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/PlayQueue.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PlayStatus.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayStatus.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/PlayStatus.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/PlayStatus.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Player.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Player.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Player.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Player.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PlayerTechnology.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PlayerTechnology.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/PlayerTechnology.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/PlayerTechnology.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Playlist.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Playlist.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastChannel.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastChannel.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/PodcastChannel.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/PodcastChannel.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastEpisode.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastEpisode.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/PodcastEpisode.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/PodcastEpisode.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/PodcastStatus.java b/airsonic-main/src/main/java/org/airsonic/player/domain/PodcastStatus.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/PodcastStatus.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/PodcastStatus.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/RandomSearchCriteria.java b/airsonic-main/src/main/java/org/airsonic/player/domain/RandomSearchCriteria.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/RandomSearchCriteria.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/RandomSearchCriteria.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/SavedPlayQueue.java b/airsonic-main/src/main/java/org/airsonic/player/domain/SavedPlayQueue.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/SavedPlayQueue.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/SavedPlayQueue.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/SearchCriteria.java b/airsonic-main/src/main/java/org/airsonic/player/domain/SearchCriteria.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/SearchCriteria.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/SearchCriteria.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/SearchResult.java b/airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/SearchResult.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/SearchResult.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Share.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Share.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Share.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Share.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Theme.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Theme.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Theme.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Theme.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/TranscodeScheme.java b/airsonic-main/src/main/java/org/airsonic/player/domain/TranscodeScheme.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/TranscodeScheme.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/TranscodeScheme.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Transcoding.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Transcoding.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Transcoding.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Transcoding.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/TransferStatus.java b/airsonic-main/src/main/java/org/airsonic/player/domain/TransferStatus.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/TransferStatus.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/TransferStatus.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/User.java b/airsonic-main/src/main/java/org/airsonic/player/domain/User.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/User.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/User.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/UserSettings.java b/airsonic-main/src/main/java/org/airsonic/player/domain/UserSettings.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/UserSettings.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/UserSettings.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/Version.java b/airsonic-main/src/main/java/org/airsonic/player/domain/Version.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/Version.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/Version.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/domain/VideoTranscodingSettings.java b/airsonic-main/src/main/java/org/airsonic/player/domain/VideoTranscodingSettings.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/domain/VideoTranscodingSettings.java
rename to airsonic-main/src/main/java/org/airsonic/player/domain/VideoTranscodingSettings.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/BootstrapVerificationFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/BootstrapVerificationFilter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/filter/BootstrapVerificationFilter.java
rename to airsonic-main/src/main/java/org/airsonic/player/filter/BootstrapVerificationFilter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/MetricsFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/MetricsFilter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/filter/MetricsFilter.java
rename to airsonic-main/src/main/java/org/airsonic/player/filter/MetricsFilter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/ParameterDecodingFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/ParameterDecodingFilter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/filter/ParameterDecodingFilter.java
rename to airsonic-main/src/main/java/org/airsonic/player/filter/ParameterDecodingFilter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/RESTFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/RESTFilter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/filter/RESTFilter.java
rename to airsonic-main/src/main/java/org/airsonic/player/filter/RESTFilter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/RequestEncodingFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/RequestEncodingFilter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/filter/RequestEncodingFilter.java
rename to airsonic-main/src/main/java/org/airsonic/player/filter/RequestEncodingFilter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/filter/ResponseHeaderFilter.java b/airsonic-main/src/main/java/org/airsonic/player/filter/ResponseHeaderFilter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/filter/ResponseHeaderFilter.java
rename to airsonic-main/src/main/java/org/airsonic/player/filter/ResponseHeaderFilter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/i18n/LibresonicLocaleResolver.java b/airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/i18n/LibresonicLocaleResolver.java
rename to airsonic-main/src/main/java/org/airsonic/player/i18n/LocaleResolver.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/InputStreamReaderThread.java b/airsonic-main/src/main/java/org/airsonic/player/io/InputStreamReaderThread.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/io/InputStreamReaderThread.java
rename to airsonic-main/src/main/java/org/airsonic/player/io/InputStreamReaderThread.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/PlayQueueInputStream.java b/airsonic-main/src/main/java/org/airsonic/player/io/PlayQueueInputStream.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/io/PlayQueueInputStream.java
rename to airsonic-main/src/main/java/org/airsonic/player/io/PlayQueueInputStream.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/RangeOutputStream.java b/airsonic-main/src/main/java/org/airsonic/player/io/RangeOutputStream.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/io/RangeOutputStream.java
rename to airsonic-main/src/main/java/org/airsonic/player/io/RangeOutputStream.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/ShoutCastOutputStream.java b/airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/io/ShoutCastOutputStream.java
rename to airsonic-main/src/main/java/org/airsonic/player/io/ShoutCastOutputStream.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/io/TranscodeInputStream.java b/airsonic-main/src/main/java/org/airsonic/player/io/TranscodeInputStream.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/io/TranscodeInputStream.java
rename to airsonic-main/src/main/java/org/airsonic/player/io/TranscodeInputStream.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/monitor/MetricsManager.java b/airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/monitor/MetricsManager.java
rename to airsonic-main/src/main/java/org/airsonic/player/monitor/MetricsManager.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/CsrfSecurityRequestMatcher.java b/airsonic-main/src/main/java/org/airsonic/player/security/CsrfSecurityRequestMatcher.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/security/CsrfSecurityRequestMatcher.java
rename to airsonic-main/src/main/java/org/airsonic/player/security/CsrfSecurityRequestMatcher.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/LibresonicUserDetailsContextMapper.java b/airsonic-main/src/main/java/org/airsonic/player/security/CustomUserDetailsContextMapper.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/security/LibresonicUserDetailsContextMapper.java
rename to airsonic-main/src/main/java/org/airsonic/player/security/CustomUserDetailsContextMapper.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/GlobalSecurityConfig.java b/airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/security/GlobalSecurityConfig.java
rename to airsonic-main/src/main/java/org/airsonic/player/security/GlobalSecurityConfig.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/JWTAuthenticationProvider.java b/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/security/JWTAuthenticationProvider.java
rename to airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationProvider.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/JWTAuthenticationToken.java b/airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationToken.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/security/JWTAuthenticationToken.java
rename to airsonic-main/src/main/java/org/airsonic/player/security/JWTAuthenticationToken.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/JWTRequestParameterProcessingFilter.java b/airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/security/JWTRequestParameterProcessingFilter.java
rename to airsonic-main/src/main/java/org/airsonic/player/security/JWTRequestParameterProcessingFilter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/LoginFailureListener.java b/airsonic-main/src/main/java/org/airsonic/player/security/LoginFailureListener.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/security/LoginFailureListener.java
rename to airsonic-main/src/main/java/org/airsonic/player/security/LoginFailureListener.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/security/RESTRequestParameterProcessingFilter.java b/airsonic-main/src/main/java/org/airsonic/player/security/RESTRequestParameterProcessingFilter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/security/RESTRequestParameterProcessingFilter.java
rename to airsonic-main/src/main/java/org/airsonic/player/security/RESTRequestParameterProcessingFilter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/ApacheCommonsConfigurationService.java b/airsonic-main/src/main/java/org/airsonic/player/service/ApacheCommonsConfigurationService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/ApacheCommonsConfigurationService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/ApacheCommonsConfigurationService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/AudioScrobblerService.java b/airsonic-main/src/main/java/org/airsonic/player/service/AudioScrobblerService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/AudioScrobblerService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/AudioScrobblerService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/JWTSecurityService.java b/airsonic-main/src/main/java/org/airsonic/player/service/JWTSecurityService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/JWTSecurityService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/JWTSecurityService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/JukeboxService.java b/airsonic-main/src/main/java/org/airsonic/player/service/JukeboxService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/JukeboxService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/JukeboxService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/LastFmCache.java b/airsonic-main/src/main/java/org/airsonic/player/service/LastFmCache.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/LastFmCache.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/LastFmCache.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/LastFmService.java b/airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/LastFmService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/LastFmService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/MediaFileService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/MediaFileService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/MediaFileService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/MediaScannerService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MediaScannerService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/MediaScannerService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/MediaScannerService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/MusicIndexService.java b/airsonic-main/src/main/java/org/airsonic/player/service/MusicIndexService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/MusicIndexService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/MusicIndexService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java b/airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/NetworkService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/NetworkService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/PlayerService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/PlayerService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/PlayerService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PlaylistService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/PlaylistService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/PlaylistService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/PodcastService.java b/airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/PodcastService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/PodcastService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/RatingService.java b/airsonic-main/src/main/java/org/airsonic/player/service/RatingService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/RatingService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/RatingService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/SearchService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/SearchService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/SecurityService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/SecurityService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/ServiceLocator.java b/airsonic-main/src/main/java/org/airsonic/player/service/ServiceLocator.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/ServiceLocator.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/ServiceLocator.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/SettingsService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/SettingsService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/ShareService.java b/airsonic-main/src/main/java/org/airsonic/player/service/ShareService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/ShareService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/ShareService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/SonosService.java b/airsonic-main/src/main/java/org/airsonic/player/service/SonosService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/SonosService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/SonosService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/StatusService.java b/airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/StatusService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/StatusService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/TranscodingService.java b/airsonic-main/src/main/java/org/airsonic/player/service/TranscodingService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/TranscodingService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/TranscodingService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java b/airsonic-main/src/main/java/org/airsonic/player/service/UPnPService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/UPnPService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/UPnPService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/VersionService.java b/airsonic-main/src/main/java/org/airsonic/player/service/VersionService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/VersionService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/VersionService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/jukebox/AudioPlayer.java b/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/AudioPlayer.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/jukebox/AudioPlayer.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/jukebox/AudioPlayer.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/jukebox/PlayerTest.java b/airsonic-main/src/main/java/org/airsonic/player/service/jukebox/PlayerTest.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/jukebox/PlayerTest.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/jukebox/PlayerTest.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/DefaultMetaDataParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/metadata/DefaultMetaDataParser.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/metadata/DefaultMetaDataParser.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/FFmpegParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/FFmpegParser.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/metadata/FFmpegParser.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/metadata/FFmpegParser.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/metadata/JaudiotaggerParser.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/metadata/JaudiotaggerParser.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaData.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaData.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaData.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaData.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParser.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParser.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParser.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParser.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParserFactory.java b/airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParserFactory.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/metadata/MetaDataParserFactory.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/metadata/MetaDataParserFactory.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/playlist/DefaultPlaylistExportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistExportHandler.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/playlist/DefaultPlaylistExportHandler.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistExportHandler.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/playlist/DefaultPlaylistImportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistImportHandler.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/playlist/DefaultPlaylistImportHandler.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/playlist/DefaultPlaylistImportHandler.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/playlist/PlaylistExportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistExportHandler.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/playlist/PlaylistExportHandler.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistExportHandler.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/playlist/PlaylistImportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistImportHandler.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/playlist/PlaylistImportHandler.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/playlist/PlaylistImportHandler.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/playlist/XspfPlaylistExportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistExportHandler.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/playlist/XspfPlaylistExportHandler.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistExportHandler.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/playlist/XspfPlaylistImportHandler.java b/airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistImportHandler.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/playlist/XspfPlaylistImportHandler.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/playlist/XspfPlaylistImportHandler.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/sonos/AlbumList.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/AlbumList.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/sonos/AlbumList.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/sonos/AlbumList.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosFaultInterceptor.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosFaultInterceptor.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosFaultInterceptor.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosFaultInterceptor.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosHelper.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosHelper.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosHelper.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosHelper.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosServiceRegistration.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosServiceRegistration.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosServiceRegistration.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosServiceRegistration.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosSoapFault.java b/airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosSoapFault.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/sonos/SonosSoapFault.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/sonos/SonosSoapFault.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/AlbumUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/AlbumUpnpProcessor.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/AlbumUpnpProcessor.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ApacheUpnpServiceConfiguration.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ApacheUpnpServiceConfiguration.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/ApacheUpnpServiceConfiguration.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/ApacheUpnpServiceConfiguration.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/ArtistUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/ArtistUpnpProcessor.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/ArtistUpnpProcessor.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/LibresonicContentDirectory.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/CustomContentDirectory.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/LibresonicContentDirectory.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/CustomContentDirectory.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/DispatchingContentDirectory.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/DispatchingContentDirectory.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/DispatchingContentDirectory.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/FolderBasedContentDirectory.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/FolderBasedContentDirectory.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/FolderBasedContentDirectory.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/FolderBasedContentDirectory.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/GenreUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/GenreUpnpProcessor.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/GenreUpnpProcessor.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/MSMediaReceiverRegistrarService.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MSMediaReceiverRegistrarService.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/MSMediaReceiverRegistrarService.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/MSMediaReceiverRegistrarService.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/MediaFileUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/MediaFileUpnpProcessor.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/MediaFileUpnpProcessor.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/MediaFileUpnpProcessor.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/NATPMPRouter.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/NATPMPRouter.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/NATPMPRouter.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/NATPMPRouter.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/PlaylistUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/PlaylistUpnpProcessor.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/PlaylistUpnpProcessor.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/PlaylistUpnpProcessor.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/RecentAlbumUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RecentAlbumUpnpProcessor.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/RecentAlbumUpnpProcessor.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/RecentAlbumUpnpProcessor.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/RootUpnpProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/RootUpnpProcessor.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/RootUpnpProcessor.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/RootUpnpProcessor.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/Router.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/Router.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/Router.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/Router.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/service/upnp/UpnpContentProcessor.java b/airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/service/upnp/UpnpContentProcessor.java
rename to airsonic-main/src/main/java/org/airsonic/player/service/upnp/UpnpContentProcessor.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/spring/CommonsConfigurationPropertySource.java b/airsonic-main/src/main/java/org/airsonic/player/spring/CommonsConfigurationPropertySource.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/spring/CommonsConfigurationPropertySource.java
rename to airsonic-main/src/main/java/org/airsonic/player/spring/CommonsConfigurationPropertySource.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/spring/LibresonicPropertySourceConfigurer.java b/airsonic-main/src/main/java/org/airsonic/player/spring/CustomPropertySourceConfigurer.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/spring/LibresonicPropertySourceConfigurer.java
rename to airsonic-main/src/main/java/org/airsonic/player/spring/CustomPropertySourceConfigurer.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/spring/DataSourceConfigType.java b/airsonic-main/src/main/java/org/airsonic/player/spring/DataSourceConfigType.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/spring/DataSourceConfigType.java
rename to airsonic-main/src/main/java/org/airsonic/player/spring/DataSourceConfigType.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/spring/DbmsVersionPrecondition.java b/airsonic-main/src/main/java/org/airsonic/player/spring/DbmsVersionPrecondition.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/spring/DbmsVersionPrecondition.java
rename to airsonic-main/src/main/java/org/airsonic/player/spring/DbmsVersionPrecondition.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/spring/HsqlDatabase.java b/airsonic-main/src/main/java/org/airsonic/player/spring/HsqlDatabase.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/spring/HsqlDatabase.java
rename to airsonic-main/src/main/java/org/airsonic/player/spring/HsqlDatabase.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/spring/LoggingExceptionResolver.java b/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingExceptionResolver.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/spring/LoggingExceptionResolver.java
rename to airsonic-main/src/main/java/org/airsonic/player/spring/LoggingExceptionResolver.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/spring/LoggingFileOverrideListener.java b/airsonic-main/src/main/java/org/airsonic/player/spring/LoggingFileOverrideListener.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/spring/LoggingFileOverrideListener.java
rename to airsonic-main/src/main/java/org/airsonic/player/spring/LoggingFileOverrideListener.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/spring/SpringLiquibase.java b/airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/spring/SpringLiquibase.java
rename to airsonic-main/src/main/java/org/airsonic/player/spring/SpringLiquibase.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/EscapeJavaScriptTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/EscapeJavaScriptTag.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/taglib/EscapeJavaScriptTag.java
rename to airsonic-main/src/main/java/org/airsonic/player/taglib/EscapeJavaScriptTag.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/FormatBytesTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/FormatBytesTag.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/taglib/FormatBytesTag.java
rename to airsonic-main/src/main/java/org/airsonic/player/taglib/FormatBytesTag.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/ParamTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/ParamTag.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/taglib/ParamTag.java
rename to airsonic-main/src/main/java/org/airsonic/player/taglib/ParamTag.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/UrlTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/UrlTag.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/taglib/UrlTag.java
rename to airsonic-main/src/main/java/org/airsonic/player/taglib/UrlTag.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/taglib/WikiTag.java b/airsonic-main/src/main/java/org/airsonic/player/taglib/WikiTag.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/taglib/WikiTag.java
rename to airsonic-main/src/main/java/org/airsonic/player/taglib/WikiTag.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeResolver.java b/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeResolver.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeResolver.java
rename to airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeResolver.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeSource.java b/airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/theme/LibresonicThemeSource.java
rename to airsonic-main/src/main/java/org/airsonic/player/theme/CustomThemeSource.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItem.java b/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItem.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItem.java
rename to airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItem.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItemFactory.java b/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItemFactory.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredDiskFileItemFactory.java
rename to airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredDiskFileItemFactory.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredOutputStream.java b/airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredOutputStream.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/upload/MonitoredOutputStream.java
rename to airsonic-main/src/main/java/org/airsonic/player/upload/MonitoredOutputStream.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/upload/UploadListener.java b/airsonic-main/src/main/java/org/airsonic/player/upload/UploadListener.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/upload/UploadListener.java
rename to airsonic-main/src/main/java/org/airsonic/player/upload/UploadListener.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/BoundedList.java b/airsonic-main/src/main/java/org/airsonic/player/util/BoundedList.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/util/BoundedList.java
rename to airsonic-main/src/main/java/org/airsonic/player/util/BoundedList.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/FileUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/util/FileUtil.java
rename to airsonic-main/src/main/java/org/airsonic/player/util/FileUtil.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/HttpRange.java b/airsonic-main/src/main/java/org/airsonic/player/util/HttpRange.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/util/HttpRange.java
rename to airsonic-main/src/main/java/org/airsonic/player/util/HttpRange.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/Pair.java b/airsonic-main/src/main/java/org/airsonic/player/util/Pair.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/util/Pair.java
rename to airsonic-main/src/main/java/org/airsonic/player/util/Pair.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/StringUtil.java b/airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/util/StringUtil.java
rename to airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/util/Util.java b/airsonic-main/src/main/java/org/airsonic/player/util/Util.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/util/Util.java
rename to airsonic-main/src/main/java/org/airsonic/player/util/Util.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/validator/PasswordSettingsValidator.java b/airsonic-main/src/main/java/org/airsonic/player/validator/PasswordSettingsValidator.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/validator/PasswordSettingsValidator.java
rename to airsonic-main/src/main/java/org/airsonic/player/validator/PasswordSettingsValidator.java
diff --git a/libresonic-main/src/main/java/org/libresonic/player/validator/UserSettingsValidator.java b/airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java
similarity index 100%
rename from libresonic-main/src/main/java/org/libresonic/player/validator/UserSettingsValidator.java
rename to airsonic-main/src/main/java/org/airsonic/player/validator/UserSettingsValidator.java
diff --git a/libresonic-main/src/main/resources/META-INF/services/chameleon.playlist.SpecificPlaylistProvider b/airsonic-main/src/main/resources/META-INF/services/chameleon.playlist.SpecificPlaylistProvider
similarity index 100%
rename from libresonic-main/src/main/resources/META-INF/services/chameleon.playlist.SpecificPlaylistProvider
rename to airsonic-main/src/main/resources/META-INF/services/chameleon.playlist.SpecificPlaylistProvider
diff --git a/libresonic-main/src/main/resources/META-INF/spring.factories b/airsonic-main/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from libresonic-main/src/main/resources/META-INF/spring.factories
rename to airsonic-main/src/main/resources/META-INF/spring.factories
diff --git a/libresonic-main/src/main/resources/application.properties b/airsonic-main/src/main/resources/application.properties
similarity index 100%
rename from libresonic-main/src/main/resources/application.properties
rename to airsonic-main/src/main/resources/application.properties
diff --git a/libresonic-main/src/main/resources/applicationContext-cache.xml b/airsonic-main/src/main/resources/applicationContext-cache.xml
similarity index 100%
rename from libresonic-main/src/main/resources/applicationContext-cache.xml
rename to airsonic-main/src/main/resources/applicationContext-cache.xml
diff --git a/libresonic-main/src/main/resources/applicationContext-db-embed.xml b/airsonic-main/src/main/resources/applicationContext-db-embed.xml
similarity index 100%
rename from libresonic-main/src/main/resources/applicationContext-db-embed.xml
rename to airsonic-main/src/main/resources/applicationContext-db-embed.xml
diff --git a/libresonic-main/src/main/resources/applicationContext-db-jndi.xml b/airsonic-main/src/main/resources/applicationContext-db-jndi.xml
similarity index 100%
rename from libresonic-main/src/main/resources/applicationContext-db-jndi.xml
rename to airsonic-main/src/main/resources/applicationContext-db-jndi.xml
diff --git a/libresonic-main/src/main/resources/applicationContext-db-legacy.xml b/airsonic-main/src/main/resources/applicationContext-db-legacy.xml
similarity index 100%
rename from libresonic-main/src/main/resources/applicationContext-db-legacy.xml
rename to airsonic-main/src/main/resources/applicationContext-db-legacy.xml
diff --git a/libresonic-main/src/main/resources/applicationContext-db.xml b/airsonic-main/src/main/resources/applicationContext-db.xml
similarity index 100%
rename from libresonic-main/src/main/resources/applicationContext-db.xml
rename to airsonic-main/src/main/resources/applicationContext-db.xml
diff --git a/libresonic-main/src/main/resources/applicationContext-service.xml b/airsonic-main/src/main/resources/applicationContext-service.xml
similarity index 100%
rename from libresonic-main/src/main/resources/applicationContext-service.xml
rename to airsonic-main/src/main/resources/applicationContext-service.xml
diff --git a/libresonic-main/src/main/resources/applicationContext-sonos.xml b/airsonic-main/src/main/resources/applicationContext-sonos.xml
similarity index 100%
rename from libresonic-main/src/main/resources/applicationContext-sonos.xml
rename to airsonic-main/src/main/resources/applicationContext-sonos.xml
diff --git a/libresonic-main/src/main/resources/banner.txt b/airsonic-main/src/main/resources/banner.txt
similarity index 100%
rename from libresonic-main/src/main/resources/banner.txt
rename to airsonic-main/src/main/resources/banner.txt
diff --git a/libresonic-main/src/main/resources/ehcache.xml b/airsonic-main/src/main/resources/ehcache.xml
similarity index 100%
rename from libresonic-main/src/main/resources/ehcache.xml
rename to airsonic-main/src/main/resources/ehcache.xml
diff --git a/libresonic-main/src/main/resources/liquibase/6.2/add-user-pagination.xml b/airsonic-main/src/main/resources/liquibase/6.2/add-user-pagination.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/6.2/add-user-pagination.xml
rename to airsonic-main/src/main/resources/liquibase/6.2/add-user-pagination.xml
diff --git a/libresonic-main/src/main/resources/liquibase/6.2/changelog.xml b/airsonic-main/src/main/resources/liquibase/6.2/changelog.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/6.2/changelog.xml
rename to airsonic-main/src/main/resources/liquibase/6.2/changelog.xml
diff --git a/libresonic-main/src/main/resources/liquibase/6.2/remove-show-chat.xml b/airsonic-main/src/main/resources/liquibase/6.2/remove-show-chat.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/6.2/remove-show-chat.xml
rename to airsonic-main/src/main/resources/liquibase/6.2/remove-show-chat.xml
diff --git a/libresonic-main/src/main/resources/liquibase/6.3/changelog.xml b/airsonic-main/src/main/resources/liquibase/6.3/changelog.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/6.3/changelog.xml
rename to airsonic-main/src/main/resources/liquibase/6.3/changelog.xml
diff --git a/libresonic-main/src/main/resources/liquibase/6.3/mediaelement.xml b/airsonic-main/src/main/resources/liquibase/6.3/mediaelement.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/6.3/mediaelement.xml
rename to airsonic-main/src/main/resources/liquibase/6.3/mediaelement.xml
diff --git a/libresonic-main/src/main/resources/liquibase/db-changelog.xml b/airsonic-main/src/main/resources/liquibase/db-changelog.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/db-changelog.xml
rename to airsonic-main/src/main/resources/liquibase/db-changelog.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/legacy-changelog.xml b/airsonic-main/src/main/resources/liquibase/legacy/legacy-changelog.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/legacy-changelog.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/legacy-changelog.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema100.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema100.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema100.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema100.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema25.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema25.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema25.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema25.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema26.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema26.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema26.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema26.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema27.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema27.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema27.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema27.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema28.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema28.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema28.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema28.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema29.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema29.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema29.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema29.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema30.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema30.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema30.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema30.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema31.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema31.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema31.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema31.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema32.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema32.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema32.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema32.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema33.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema33.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema33.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema33.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema34.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema34.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema34.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema34.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema35.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema35.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema35.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema35.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema36.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema36.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema36.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema36.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema37.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema37.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema37.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema37.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema38.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema38.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema38.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema38.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema40.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema40.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema40.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema40.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema43.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema43.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema43.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema43.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema45.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema45.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema45.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema45.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema46.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema46.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema46.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema46.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema47.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema47.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema47.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema47.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema49.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema49.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema49.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema49.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema50.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema50.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema50.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema50.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema51.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema51.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema51.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema51.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema52.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema52.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema52.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema52.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema53.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema53.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema53.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema53.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema61.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema61.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema61.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema61.xml
diff --git a/libresonic-main/src/main/resources/liquibase/legacy/schema62.xml b/airsonic-main/src/main/resources/liquibase/legacy/schema62.xml
similarity index 100%
rename from libresonic-main/src/main/resources/liquibase/legacy/schema62.xml
rename to airsonic-main/src/main/resources/liquibase/legacy/schema62.xml
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/controller/default_cover.jpg b/airsonic-main/src/main/resources/org/airsonic/player/controller/default_cover.jpg
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/controller/default_cover.jpg
rename to airsonic-main/src/main/resources/org/airsonic/player/controller/default_cover.jpg
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/All-Caps.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/All-Caps.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/All-Caps.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/All-Caps.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Army-Officer.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Army-Officer.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Army-Officer.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Army-Officer.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Beatnik.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Beatnik.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Beatnik.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Beatnik.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Clown.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Clown.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Clown.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Clown.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Commie-Pinko.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Commie-Pinko.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Commie-Pinko.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Commie-Pinko.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Cool.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Cool.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Cool.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Cool.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Drum.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Drum.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Drum.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Drum.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Engineer.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Engineer.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Engineer.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Engineer.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Fire-Guitar.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Fire-Guitar.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Fire-Guitar.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Fire-Guitar.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Footballer.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Footballer.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Footballer.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Footballer.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Formal.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Formal.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Formal.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Formal.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Forum-Flirt.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Forum-Flirt.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Forum-Flirt.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Forum-Flirt.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Gamer.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Gamer.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Gamer.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Gamer.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Green-Boy.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Green-Boy.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Green-Boy.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Green-Boy.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Headphones.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Headphones.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Headphones.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Headphones.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Hopelessly-Addicted.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Hopelessly-Addicted.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Hopelessly-Addicted.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Hopelessly-Addicted.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Jekyll-And-Hyde.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Jekyll-And-Hyde.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Jekyll-And-Hyde.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Jekyll-And-Hyde.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Joker.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Joker.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Joker.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Joker.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Laugh.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Laugh.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Laugh.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Laugh.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Linux-Zealot.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Linux-Zealot.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Linux-Zealot.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Linux-Zealot.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Lurker.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Lurker.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Lurker.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Lurker.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Mac-Zealot.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Mac-Zealot.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Mac-Zealot.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Mac-Zealot.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Mic.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Mic.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Mic.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Mic.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Moderator.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Moderator.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Moderator.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Moderator.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Newbie.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Newbie.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Newbie.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Newbie.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/No-Dissent.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/No-Dissent.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/No-Dissent.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/No-Dissent.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Performer.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Performer.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Performer.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Performer.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Push-My-Button.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Push-My-Button.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Push-My-Button.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Push-My-Button.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Ray-Of-Sunshine.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Ray-Of-Sunshine.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Ray-Of-Sunshine.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Ray-Of-Sunshine.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Red-Hot-Chili-Peppers-1.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Red-Hot-Chili-Peppers-1.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Red-Hot-Chili-Peppers-1.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Red-Hot-Chili-Peppers-1.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Red-Hot-Chili-Peppers-2.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Red-Hot-Chili-Peppers-2.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Red-Hot-Chili-Peppers-2.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Red-Hot-Chili-Peppers-2.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Red-Hot-Chili-Peppers-3.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Red-Hot-Chili-Peppers-3.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Red-Hot-Chili-Peppers-3.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Red-Hot-Chili-Peppers-3.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Red-Hot-Chili-Peppers-4.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Red-Hot-Chili-Peppers-4.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Red-Hot-Chili-Peppers-4.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Red-Hot-Chili-Peppers-4.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Ringmaster.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Ringmaster.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Ringmaster.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Ringmaster.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Rumor-Junkie.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Rumor-Junkie.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Rumor-Junkie.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Rumor-Junkie.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Sozzled-Surfer.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Sozzled-Surfer.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Sozzled-Surfer.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Sozzled-Surfer.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Statistician.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Statistician.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Statistician.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Statistician.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Study.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Study.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Study.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Study.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Tech-Support.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Tech-Support.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Tech-Support.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Tech-Support.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/The-Guru.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/The-Guru.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/The-Guru.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/The-Guru.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/The-Referee.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/The-Referee.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/The-Referee.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/The-Referee.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Troll.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Troll.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Troll.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Troll.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Turntable.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Turntable.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Turntable.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Turntable.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Uptight.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Uptight.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Uptight.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Uptight.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Vinyl.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Vinyl.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Vinyl.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Vinyl.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Windows-Zealot.png b/airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Windows-Zealot.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/dao/schema/Windows-Zealot.png
rename to airsonic-main/src/main/resources/org/airsonic/player/dao/schema/Windows-Zealot.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_bg.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_bg.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_bg.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ca.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ca.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ca.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_cs.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_cs.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_da.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_da.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_da.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_de.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_de.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_el.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_el.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_el.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en_GB.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en_GB.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_en_GB.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_es.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_es.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_es.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_et.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_et.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fi.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fi.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fi.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fr.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_fr.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_fr.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_is.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_is.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_is.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_it.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_it.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_it.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ja_JP.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ja_JP.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ko.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ko.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ko.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_mk.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_mk.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_mk.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_nl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_nl.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nl.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_nn.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_nn.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_nn.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_no.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_no.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_no.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pl.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pl.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pt.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_pt.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_pt.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ru.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_ru.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_ru.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sl.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sl.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sl.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sv.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_sv.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_sv.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_CN.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_CN.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_CN.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties b/airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/ResourceBundle_zh_TW.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/locales.txt b/airsonic-main/src/main/resources/org/airsonic/player/i18n/locales.txt
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/i18n/locales.txt
rename to airsonic-main/src/main/resources/org/airsonic/player/i18n/locales.txt
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png b/airsonic-main/src/main/resources/org/airsonic/player/service/logo-512.png
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png
rename to airsonic-main/src/main/resources/org/airsonic/player/service/logo-512.png
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/2010.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/2010.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/2010.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/2010.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/barents.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/barents.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/barents.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/barents.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/black.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/black.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/black.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/black.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/buuftheme.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/buuftheme.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/buuftheme.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/buuftheme.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/coolandclean.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/coolandclean.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/coolandclean.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/coolandclean.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/default.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/default.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/default.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/default_dark.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/default_dark.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/default_dark.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/default_light.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/default_light.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/default_light.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/denim.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/denim.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/denim.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/denim.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/groove.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/groove.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/groove.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/groove.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/groove_simple.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/groove_simple.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/groove_simple.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/groove_simple.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/hd1080.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/hd1080.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/hd1080.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/hd1080.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/hd720.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/hd720.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/hd720.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/hd720.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/hd768.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/hd768.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/hd768.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/hd768.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/hicon.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/hicon.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/hicon.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/hicon.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/hiconi.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/hiconi.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/hiconi.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/hiconi.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/hitech.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/hitech.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/hitech.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/hitech.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/midnight.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/midnight.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/midnight.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/midnight.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/midnightfun.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/midnightfun.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/midnightfun.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/midnightfun.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/monochrome.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/monochrome.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/monochrome.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/monochrome.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/monochrome_black.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/monochrome_black.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/monochrome_black.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/monochrome_black.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/pinkpanther.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/pinkpanther.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/pinkpanther.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/pinkpanther.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/ripserver.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/ripserver.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/ripserver.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/sandstorm.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/sandstorm.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/sandstorm.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/sandstorm.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/simplify.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/simplify.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/simplify.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/simplify.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/slick.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/slick.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/slick.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/slick.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/sonic.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/sonic.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/sonic.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/sonic.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/sonic_blue.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/sonic_blue.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/sonic_blue.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/sonic_blue.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/sonic_white.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/sonic_white.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/sonic_white.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/sonic_white.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/subStandard.properties b/airsonic-main/src/main/resources/org/airsonic/player/theme/subStandard.properties
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/subStandard.properties
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/subStandard.properties
diff --git a/libresonic-main/src/main/resources/org/libresonic/player/theme/themes.txt b/airsonic-main/src/main/resources/org/airsonic/player/theme/themes.txt
similarity index 100%
rename from libresonic-main/src/main/resources/org/libresonic/player/theme/themes.txt
rename to airsonic-main/src/main/resources/org/airsonic/player/theme/themes.txt
diff --git a/libresonic-main/src/main/resources/libresonic-servlet.xml b/airsonic-main/src/main/resources/servlet.xml
similarity index 100%
rename from libresonic-main/src/main/resources/libresonic-servlet.xml
rename to airsonic-main/src/main/resources/servlet.xml
diff --git a/libresonic-main/src/main/webapp/WEB-INF/dwr.xml b/airsonic-main/src/main/webapp/WEB-INF/dwr.xml
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/dwr.xml
rename to airsonic-main/src/main/webapp/WEB-INF/dwr.xml
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/accessDenied.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/accessDenied.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/accessDenied.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/accessDenied.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/allmusic.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/allmusic.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/allmusic.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/allmusic.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/artistMain.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/avatarUploadResult.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/changeCoverArt.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/coverArt.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/createShare.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/db.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/db.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/db.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/db.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/editTags.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/editTags.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/editTags.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/editTags.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/error.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/error.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/error.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/externalPlayer.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/generalDatabaseSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/gettingStarted.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/gettingStarted.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/gettingStarted.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/gettingStarted.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/head.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/head.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/help.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/help.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/help.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/helpToolTip.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/helpToolTip.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/helpToolTip.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/helpToolTip.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/home.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/home.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/home.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/home.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/importPlaylist.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/include.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/include.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/include.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/index.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/index.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/index.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/jquery.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/left.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/left.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/lyrics.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/lyrics.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/lyrics.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/lyrics.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/notFound.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/notFound.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/notFound.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/notFound.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/playButtons.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/playQueueCast.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playQueueCast.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/playQueueCast.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/playQueueCast.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/playlist.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playlist.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/playlist.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/playlist.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/playlists.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/playlists.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/playlists.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/playlists.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/podcast.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcast.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/podcast.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/podcast.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/podcastChannel.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannel.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/podcastChannel.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannel.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/podcastChannels.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannels.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/podcastChannels.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/podcastChannels.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/rating.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/rating.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/rating.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/rating.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/recover.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/reload.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/reload.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/reload.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/reload.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/rest/videoPlayer.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/rest/videoPlayer.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/rest/videoPlayer.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/rest/videoPlayer.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/right.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/right.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/right.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/search.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/search.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/search.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/search.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/settingsHeader.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/settingsHeader.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/settingsHeader.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/settingsHeader.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/starred.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/status.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/status.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/status.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/status.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/test.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/test.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/test.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/test.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/top.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/upload.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/upload.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/upload.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/upload.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/videoMain.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/videoMain.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/videoMain.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/videoMain.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/videoPlayer.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/videoPlayer.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/videoPlayer.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/videoPlayer.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/videoPlayerCast.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/videoPlayerCast.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/videoPlayerCast.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/videoPlayerCast.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/viewSelector.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/viewSelector.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/viewSelector.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/viewSelector.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/wap/browse.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/browse.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/wap/browse.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/wap/browse.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/wap/head.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/head.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/wap/head.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/wap/head.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/wap/index.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/index.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/wap/index.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/wap/index.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/wap/loadPlaylist.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/loadPlaylist.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/wap/loadPlaylist.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/wap/loadPlaylist.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/wap/playlist.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/playlist.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/wap/playlist.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/wap/playlist.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/wap/search.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/search.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/wap/search.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/wap/search.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/wap/searchResult.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/searchResult.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/wap/searchResult.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/wap/searchResult.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/wap/settings.jsp b/airsonic-main/src/main/webapp/WEB-INF/jsp/wap/settings.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/jsp/wap/settings.jsp
rename to airsonic-main/src/main/webapp/WEB-INF/jsp/wap/settings.jsp
diff --git a/libresonic-main/src/main/webapp/WEB-INF/sub.tld b/airsonic-main/src/main/webapp/WEB-INF/sub.tld
similarity index 100%
rename from libresonic-main/src/main/webapp/WEB-INF/sub.tld
rename to airsonic-main/src/main/webapp/WEB-INF/sub.tld
diff --git a/libresonic-main/src/main/webapp/crossdomain.xml b/airsonic-main/src/main/webapp/crossdomain.xml
similarity index 100%
rename from libresonic-main/src/main/webapp/crossdomain.xml
rename to airsonic-main/src/main/webapp/crossdomain.xml
diff --git a/libresonic-main/src/main/webapp/flash/jw-player-5.10.swf b/airsonic-main/src/main/webapp/flash/jw-player-5.10.swf
similarity index 100%
rename from libresonic-main/src/main/webapp/flash/jw-player-5.10.swf
rename to airsonic-main/src/main/webapp/flash/jw-player-5.10.swf
diff --git a/libresonic-main/src/main/webapp/flash/jw-player-libresonic-skin.zip b/airsonic-main/src/main/webapp/flash/jw-player-libresonic-skin.zip
similarity index 100%
rename from libresonic-main/src/main/webapp/flash/jw-player-libresonic-skin.zip
rename to airsonic-main/src/main/webapp/flash/jw-player-libresonic-skin.zip
diff --git a/libresonic-main/src/main/webapp/flash/whotube.zip b/airsonic-main/src/main/webapp/flash/whotube.zip
similarity index 100%
rename from libresonic-main/src/main/webapp/flash/whotube.zip
rename to airsonic-main/src/main/webapp/flash/whotube.zip
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/add.png b/airsonic-main/src/main/webapp/icons/buuftheme/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/add.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/add.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/android.png b/airsonic-main/src/main/webapp/icons/buuftheme/android.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/android.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/android.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/back.png b/airsonic-main/src/main/webapp/icons/buuftheme/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/back.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/back.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/background_main.png b/airsonic-main/src/main/webapp/icons/buuftheme/background_main.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/background_main.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/background_main.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/clear_rating.png b/airsonic-main/src/main/webapp/icons/buuftheme/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/donate.png b/airsonic-main/src/main/webapp/icons/buuftheme/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/donate.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/donate_small.png b/airsonic-main/src/main/webapp/icons/buuftheme/donate_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/donate_small.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/donate_small.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/down.png b/airsonic-main/src/main/webapp/icons/buuftheme/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/down.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/down.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/download.png b/airsonic-main/src/main/webapp/icons/buuftheme/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/download.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/download.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/error.png b/airsonic-main/src/main/webapp/icons/buuftheme/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/error.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/error.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/favicon.ico b/airsonic-main/src/main/webapp/icons/buuftheme/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/favicon.ico
rename to airsonic-main/src/main/webapp/icons/buuftheme/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/forward.png b/airsonic-main/src/main/webapp/icons/buuftheme/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/forward.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/gpl.png b/airsonic-main/src/main/webapp/icons/buuftheme/gpl.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/gpl.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/gpl.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/help.png b/airsonic-main/src/main/webapp/icons/buuftheme/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/help.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/help.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/help_small.png b/airsonic-main/src/main/webapp/icons/buuftheme/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/help_small.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/home.png b/airsonic-main/src/main/webapp/icons/buuftheme/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/home.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/home.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/home_hover.png b/airsonic-main/src/main/webapp/icons/buuftheme/home_hover.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/home_hover.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/home_hover.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/list_heading.png b/airsonic-main/src/main/webapp/icons/buuftheme/list_heading.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/list_heading.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/list_heading.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/log.png b/airsonic-main/src/main/webapp/icons/buuftheme/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/log.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/log.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/logo.png b/airsonic-main/src/main/webapp/icons/buuftheme/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/logo.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/more.png b/airsonic-main/src/main/webapp/icons/buuftheme/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/more.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/more.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/now_playing.png b/airsonic-main/src/main/webapp/icons/buuftheme/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/now_playing.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/paypal.gif b/airsonic-main/src/main/webapp/icons/buuftheme/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/paypal.gif
rename to airsonic-main/src/main/webapp/icons/buuftheme/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/phone.png b/airsonic-main/src/main/webapp/icons/buuftheme/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/phone.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/play.png b/airsonic-main/src/main/webapp/icons/buuftheme/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/play.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/play.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/playing.png b/airsonic-main/src/main/webapp/icons/buuftheme/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/playing.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/podcast.png b/airsonic-main/src/main/webapp/icons/buuftheme/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/podcast.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/podcast_small.png b/airsonic-main/src/main/webapp/icons/buuftheme/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/progress.png b/airsonic-main/src/main/webapp/icons/buuftheme/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/progress.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/random.png b/airsonic-main/src/main/webapp/icons/buuftheme/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/random.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/random.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/rating_half.png b/airsonic-main/src/main/webapp/icons/buuftheme/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/rating_half.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/rating_off.png b/airsonic-main/src/main/webapp/icons/buuftheme/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/rating_off.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/rating_on.png b/airsonic-main/src/main/webapp/icons/buuftheme/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/rating_on.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/remove.png b/airsonic-main/src/main/webapp/icons/buuftheme/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/remove.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/search.png b/airsonic-main/src/main/webapp/icons/buuftheme/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/search.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/search.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/settings.png b/airsonic-main/src/main/webapp/icons/buuftheme/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/settings.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/status.png b/airsonic-main/src/main/webapp/icons/buuftheme/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/status.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/status.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/subair.png b/airsonic-main/src/main/webapp/icons/buuftheme/subair.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/subair.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/subair.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/up.png b/airsonic-main/src/main/webapp/icons/buuftheme/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/up.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/up.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/upload.png b/airsonic-main/src/main/webapp/icons/buuftheme/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/upload.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/buuftheme/wap.png b/airsonic-main/src/main/webapp/icons/buuftheme/wap.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/buuftheme/wap.png
rename to airsonic-main/src/main/webapp/icons/buuftheme/wap.png
diff --git a/libresonic-main/src/main/webapp/icons/cast/cast_icon_active.png b/airsonic-main/src/main/webapp/icons/cast/cast_icon_active.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/cast/cast_icon_active.png
rename to airsonic-main/src/main/webapp/icons/cast/cast_icon_active.png
diff --git a/libresonic-main/src/main/webapp/icons/cast/cast_icon_error.png b/airsonic-main/src/main/webapp/icons/cast/cast_icon_error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/cast/cast_icon_error.png
rename to airsonic-main/src/main/webapp/icons/cast/cast_icon_error.png
diff --git a/libresonic-main/src/main/webapp/icons/cast/cast_icon_idle.png b/airsonic-main/src/main/webapp/icons/cast/cast_icon_idle.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/cast/cast_icon_idle.png
rename to airsonic-main/src/main/webapp/icons/cast/cast_icon_idle.png
diff --git a/libresonic-main/src/main/webapp/icons/cast/cast_icon_warning.png b/airsonic-main/src/main/webapp/icons/cast/cast_icon_warning.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/cast/cast_icon_warning.png
rename to airsonic-main/src/main/webapp/icons/cast/cast_icon_warning.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/add.png b/airsonic-main/src/main/webapp/icons/coolandclean/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/add.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/add.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/back.png b/airsonic-main/src/main/webapp/icons/coolandclean/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/back.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/back.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/background.png b/airsonic-main/src/main/webapp/icons/coolandclean/background.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/background.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/background.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/background_main.png b/airsonic-main/src/main/webapp/icons/coolandclean/background_main.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/background_main.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/background_main.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/clear_rating.png b/airsonic-main/src/main/webapp/icons/coolandclean/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/donate.png b/airsonic-main/src/main/webapp/icons/coolandclean/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/donate.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/down.png b/airsonic-main/src/main/webapp/icons/coolandclean/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/down.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/down.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/download.png b/airsonic-main/src/main/webapp/icons/coolandclean/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/download.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/download.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/error.png b/airsonic-main/src/main/webapp/icons/coolandclean/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/error.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/error.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/favicon.ico b/airsonic-main/src/main/webapp/icons/coolandclean/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/favicon.ico
rename to airsonic-main/src/main/webapp/icons/coolandclean/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/forward.png b/airsonic-main/src/main/webapp/icons/coolandclean/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/forward.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/help.png b/airsonic-main/src/main/webapp/icons/coolandclean/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/help.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/help.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/help_small.png b/airsonic-main/src/main/webapp/icons/coolandclean/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/help_small.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/home.png b/airsonic-main/src/main/webapp/icons/coolandclean/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/home.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/home.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/home_hover.png b/airsonic-main/src/main/webapp/icons/coolandclean/home_hover.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/home_hover.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/home_hover.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/list_heading.png b/airsonic-main/src/main/webapp/icons/coolandclean/list_heading.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/list_heading.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/list_heading.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/log.png b/airsonic-main/src/main/webapp/icons/coolandclean/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/log.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/log.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/logo.png b/airsonic-main/src/main/webapp/icons/coolandclean/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/logo.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/more.png b/airsonic-main/src/main/webapp/icons/coolandclean/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/more.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/more.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/now_playing.png b/airsonic-main/src/main/webapp/icons/coolandclean/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/now_playing.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/paypal.gif b/airsonic-main/src/main/webapp/icons/coolandclean/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/paypal.gif
rename to airsonic-main/src/main/webapp/icons/coolandclean/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/phone.png b/airsonic-main/src/main/webapp/icons/coolandclean/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/phone.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/play.png b/airsonic-main/src/main/webapp/icons/coolandclean/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/play.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/play.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/playing.png b/airsonic-main/src/main/webapp/icons/coolandclean/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/playing.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/podcast.png b/airsonic-main/src/main/webapp/icons/coolandclean/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/podcast.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/podcast_small.png b/airsonic-main/src/main/webapp/icons/coolandclean/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/progress.png b/airsonic-main/src/main/webapp/icons/coolandclean/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/progress.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/random.png b/airsonic-main/src/main/webapp/icons/coolandclean/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/random.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/random.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/rating_half.png b/airsonic-main/src/main/webapp/icons/coolandclean/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/rating_half.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/rating_off.png b/airsonic-main/src/main/webapp/icons/coolandclean/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/rating_off.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/rating_on.png b/airsonic-main/src/main/webapp/icons/coolandclean/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/rating_on.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/remove.png b/airsonic-main/src/main/webapp/icons/coolandclean/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/remove.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/search.png b/airsonic-main/src/main/webapp/icons/coolandclean/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/search.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/search.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/settings.png b/airsonic-main/src/main/webapp/icons/coolandclean/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/settings.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/starred.png b/airsonic-main/src/main/webapp/icons/coolandclean/starred.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/starred.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/starred.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/status.png b/airsonic-main/src/main/webapp/icons/coolandclean/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/status.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/status.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/up.png b/airsonic-main/src/main/webapp/icons/coolandclean/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/up.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/up.png
diff --git a/libresonic-main/src/main/webapp/icons/coolandclean/upload.png b/airsonic-main/src/main/webapp/icons/coolandclean/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/coolandclean/upload.png
rename to airsonic-main/src/main/webapp/icons/coolandclean/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/add.png b/airsonic-main/src/main/webapp/icons/default_dark/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/add.png
rename to airsonic-main/src/main/webapp/icons/default_dark/add.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/add_next.png b/airsonic-main/src/main/webapp/icons/default_dark/add_next.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/add_next.png
rename to airsonic-main/src/main/webapp/icons/default_dark/add_next.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/android.png b/airsonic-main/src/main/webapp/icons/default_dark/android.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/android.png
rename to airsonic-main/src/main/webapp/icons/default_dark/android.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/apps.png b/airsonic-main/src/main/webapp/icons/default_dark/apps.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/apps.png
rename to airsonic-main/src/main/webapp/icons/default_dark/apps.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/back.png b/airsonic-main/src/main/webapp/icons/default_dark/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/back.png
rename to airsonic-main/src/main/webapp/icons/default_dark/back.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/cast_active.png b/airsonic-main/src/main/webapp/icons/default_dark/cast_active.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/cast_active.png
rename to airsonic-main/src/main/webapp/icons/default_dark/cast_active.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/cast_idle.png b/airsonic-main/src/main/webapp/icons/default_dark/cast_idle.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/cast_idle.png
rename to airsonic-main/src/main/webapp/icons/default_dark/cast_idle.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/cast_pause.png b/airsonic-main/src/main/webapp/icons/default_dark/cast_pause.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/cast_pause.png
rename to airsonic-main/src/main/webapp/icons/default_dark/cast_pause.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/cast_play.png b/airsonic-main/src/main/webapp/icons/default_dark/cast_play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/cast_play.png
rename to airsonic-main/src/main/webapp/icons/default_dark/cast_play.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/current.png b/airsonic-main/src/main/webapp/icons/default_dark/current.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/current.png
rename to airsonic-main/src/main/webapp/icons/default_dark/current.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/donate.png b/airsonic-main/src/main/webapp/icons/default_dark/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/donate.png
rename to airsonic-main/src/main/webapp/icons/default_dark/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/donate_small.png b/airsonic-main/src/main/webapp/icons/default_dark/donate_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/donate_small.png
rename to airsonic-main/src/main/webapp/icons/default_dark/donate_small.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/down.png b/airsonic-main/src/main/webapp/icons/default_dark/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/down.png
rename to airsonic-main/src/main/webapp/icons/default_dark/down.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/download.png b/airsonic-main/src/main/webapp/icons/default_dark/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/download.png
rename to airsonic-main/src/main/webapp/icons/default_dark/download.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/error.png b/airsonic-main/src/main/webapp/icons/default_dark/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/error.png
rename to airsonic-main/src/main/webapp/icons/default_dark/error.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/favicon.ico b/airsonic-main/src/main/webapp/icons/default_dark/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/favicon.ico
rename to airsonic-main/src/main/webapp/icons/default_dark/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/forward.png b/airsonic-main/src/main/webapp/icons/default_dark/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/forward.png
rename to airsonic-main/src/main/webapp/icons/default_dark/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/gpl.png b/airsonic-main/src/main/webapp/icons/default_dark/gpl.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/gpl.png
rename to airsonic-main/src/main/webapp/icons/default_dark/gpl.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/help.png b/airsonic-main/src/main/webapp/icons/default_dark/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/help.png
rename to airsonic-main/src/main/webapp/icons/default_dark/help.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/help_small.png b/airsonic-main/src/main/webapp/icons/default_dark/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/help_small.png
rename to airsonic-main/src/main/webapp/icons/default_dark/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/home.png b/airsonic-main/src/main/webapp/icons/default_dark/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/home.png
rename to airsonic-main/src/main/webapp/icons/default_dark/home.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/html5.png b/airsonic-main/src/main/webapp/icons/default_dark/html5.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/html5.png
rename to airsonic-main/src/main/webapp/icons/default_dark/html5.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/jamstash.png b/airsonic-main/src/main/webapp/icons/default_dark/jamstash.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/jamstash.png
rename to airsonic-main/src/main/webapp/icons/default_dark/jamstash.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/keyboard.png b/airsonic-main/src/main/webapp/icons/default_dark/keyboard.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/keyboard.png
rename to airsonic-main/src/main/webapp/icons/default_dark/keyboard.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/log.png b/airsonic-main/src/main/webapp/icons/default_dark/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/log.png
rename to airsonic-main/src/main/webapp/icons/default_dark/log.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/logo_light.png b/airsonic-main/src/main/webapp/icons/default_dark/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/logo_light.png
rename to airsonic-main/src/main/webapp/icons/default_dark/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/more.png b/airsonic-main/src/main/webapp/icons/default_dark/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/more.png
rename to airsonic-main/src/main/webapp/icons/default_dark/more.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/mute.png b/airsonic-main/src/main/webapp/icons/default_dark/mute.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/mute.png
rename to airsonic-main/src/main/webapp/icons/default_dark/mute.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/now_playing.png b/airsonic-main/src/main/webapp/icons/default_dark/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/now_playing.png
rename to airsonic-main/src/main/webapp/icons/default_dark/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/play.png b/airsonic-main/src/main/webapp/icons/default_dark/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/play.png
rename to airsonic-main/src/main/webapp/icons/default_dark/play.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/play_overlay.png b/airsonic-main/src/main/webapp/icons/default_dark/play_overlay.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/play_overlay.png
rename to airsonic-main/src/main/webapp/icons/default_dark/play_overlay.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/playlist.png b/airsonic-main/src/main/webapp/icons/default_dark/playlist.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/playlist.png
rename to airsonic-main/src/main/webapp/icons/default_dark/playlist.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/podcast.png b/airsonic-main/src/main/webapp/icons/default_dark/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/podcast.png
rename to airsonic-main/src/main/webapp/icons/default_dark/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/podcast_large.png b/airsonic-main/src/main/webapp/icons/default_dark/podcast_large.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/podcast_large.png
rename to airsonic-main/src/main/webapp/icons/default_dark/podcast_large.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/progress.png b/airsonic-main/src/main/webapp/icons/default_dark/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/progress.png
rename to airsonic-main/src/main/webapp/icons/default_dark/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/random.png b/airsonic-main/src/main/webapp/icons/default_dark/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/random.png
rename to airsonic-main/src/main/webapp/icons/default_dark/random.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/ratingHalf.png b/airsonic-main/src/main/webapp/icons/default_dark/ratingHalf.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/ratingHalf.png
rename to airsonic-main/src/main/webapp/icons/default_dark/ratingHalf.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/ratingOff.png b/airsonic-main/src/main/webapp/icons/default_dark/ratingOff.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/ratingOff.png
rename to airsonic-main/src/main/webapp/icons/default_dark/ratingOff.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/ratingOn.png b/airsonic-main/src/main/webapp/icons/default_dark/ratingOn.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/ratingOn.png
rename to airsonic-main/src/main/webapp/icons/default_dark/ratingOn.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/remove.png b/airsonic-main/src/main/webapp/icons/default_dark/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/remove.png
rename to airsonic-main/src/main/webapp/icons/default_dark/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/search.png b/airsonic-main/src/main/webapp/icons/default_dark/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/search.png
rename to airsonic-main/src/main/webapp/icons/default_dark/search.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/settings.png b/airsonic-main/src/main/webapp/icons/default_dark/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/settings.png
rename to airsonic-main/src/main/webapp/icons/default_dark/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/share.png b/airsonic-main/src/main/webapp/icons/default_dark/share.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/share.png
rename to airsonic-main/src/main/webapp/icons/default_dark/share.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/share_facebook.png b/airsonic-main/src/main/webapp/icons/default_dark/share_facebook.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/share_facebook.png
rename to airsonic-main/src/main/webapp/icons/default_dark/share_facebook.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/share_googleplus.png b/airsonic-main/src/main/webapp/icons/default_dark/share_googleplus.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/share_googleplus.png
rename to airsonic-main/src/main/webapp/icons/default_dark/share_googleplus.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/share_small.png b/airsonic-main/src/main/webapp/icons/default_dark/share_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/share_small.png
rename to airsonic-main/src/main/webapp/icons/default_dark/share_small.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/share_twitter.png b/airsonic-main/src/main/webapp/icons/default_dark/share_twitter.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/share_twitter.png
rename to airsonic-main/src/main/webapp/icons/default_dark/share_twitter.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/shuffle.png b/airsonic-main/src/main/webapp/icons/default_dark/shuffle.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/shuffle.png
rename to airsonic-main/src/main/webapp/icons/default_dark/shuffle.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/spinner.gif b/airsonic-main/src/main/webapp/icons/default_dark/spinner.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/spinner.gif
rename to airsonic-main/src/main/webapp/icons/default_dark/spinner.gif
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/starred.png b/airsonic-main/src/main/webapp/icons/default_dark/starred.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/starred.png
rename to airsonic-main/src/main/webapp/icons/default_dark/starred.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/status.png b/airsonic-main/src/main/webapp/icons/default_dark/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/status.png
rename to airsonic-main/src/main/webapp/icons/default_dark/status.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/status_small.png b/airsonic-main/src/main/webapp/icons/default_dark/status_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/status_small.png
rename to airsonic-main/src/main/webapp/icons/default_dark/status_small.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/up.png b/airsonic-main/src/main/webapp/icons/default_dark/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/up.png
rename to airsonic-main/src/main/webapp/icons/default_dark/up.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/upload.png b/airsonic-main/src/main/webapp/icons/default_dark/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/upload.png
rename to airsonic-main/src/main/webapp/icons/default_dark/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/view_as_grid.png b/airsonic-main/src/main/webapp/icons/default_dark/view_as_grid.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/view_as_grid.png
rename to airsonic-main/src/main/webapp/icons/default_dark/view_as_grid.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/view_as_list.png b/airsonic-main/src/main/webapp/icons/default_dark/view_as_list.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/view_as_list.png
rename to airsonic-main/src/main/webapp/icons/default_dark/view_as_list.png
diff --git a/libresonic-main/src/main/webapp/icons/default_dark/volume.png b/airsonic-main/src/main/webapp/icons/default_dark/volume.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_dark/volume.png
rename to airsonic-main/src/main/webapp/icons/default_dark/volume.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/add.png b/airsonic-main/src/main/webapp/icons/default_light/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/add.png
rename to airsonic-main/src/main/webapp/icons/default_light/add.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/add_next.png b/airsonic-main/src/main/webapp/icons/default_light/add_next.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/add_next.png
rename to airsonic-main/src/main/webapp/icons/default_light/add_next.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/android.png b/airsonic-main/src/main/webapp/icons/default_light/android.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/android.png
rename to airsonic-main/src/main/webapp/icons/default_light/android.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/apps.png b/airsonic-main/src/main/webapp/icons/default_light/apps.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/apps.png
rename to airsonic-main/src/main/webapp/icons/default_light/apps.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/back.png b/airsonic-main/src/main/webapp/icons/default_light/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/back.png
rename to airsonic-main/src/main/webapp/icons/default_light/back.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/cast_active.png b/airsonic-main/src/main/webapp/icons/default_light/cast_active.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/cast_active.png
rename to airsonic-main/src/main/webapp/icons/default_light/cast_active.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/cast_idle.png b/airsonic-main/src/main/webapp/icons/default_light/cast_idle.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/cast_idle.png
rename to airsonic-main/src/main/webapp/icons/default_light/cast_idle.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/cast_pause.png b/airsonic-main/src/main/webapp/icons/default_light/cast_pause.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/cast_pause.png
rename to airsonic-main/src/main/webapp/icons/default_light/cast_pause.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/cast_play.png b/airsonic-main/src/main/webapp/icons/default_light/cast_play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/cast_play.png
rename to airsonic-main/src/main/webapp/icons/default_light/cast_play.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/current.png b/airsonic-main/src/main/webapp/icons/default_light/current.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/current.png
rename to airsonic-main/src/main/webapp/icons/default_light/current.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/donate.png b/airsonic-main/src/main/webapp/icons/default_light/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/donate.png
rename to airsonic-main/src/main/webapp/icons/default_light/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/donate_small.png b/airsonic-main/src/main/webapp/icons/default_light/donate_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/donate_small.png
rename to airsonic-main/src/main/webapp/icons/default_light/donate_small.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/down.png b/airsonic-main/src/main/webapp/icons/default_light/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/down.png
rename to airsonic-main/src/main/webapp/icons/default_light/down.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/download.png b/airsonic-main/src/main/webapp/icons/default_light/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/download.png
rename to airsonic-main/src/main/webapp/icons/default_light/download.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/error.png b/airsonic-main/src/main/webapp/icons/default_light/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/error.png
rename to airsonic-main/src/main/webapp/icons/default_light/error.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/favicon.ico b/airsonic-main/src/main/webapp/icons/default_light/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/favicon.ico
rename to airsonic-main/src/main/webapp/icons/default_light/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/default_light/forward.png b/airsonic-main/src/main/webapp/icons/default_light/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/forward.png
rename to airsonic-main/src/main/webapp/icons/default_light/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/gpl.png b/airsonic-main/src/main/webapp/icons/default_light/gpl.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/gpl.png
rename to airsonic-main/src/main/webapp/icons/default_light/gpl.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/help.png b/airsonic-main/src/main/webapp/icons/default_light/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/help.png
rename to airsonic-main/src/main/webapp/icons/default_light/help.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/help_small.png b/airsonic-main/src/main/webapp/icons/default_light/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/help_small.png
rename to airsonic-main/src/main/webapp/icons/default_light/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/home.png b/airsonic-main/src/main/webapp/icons/default_light/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/home.png
rename to airsonic-main/src/main/webapp/icons/default_light/home.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/html5.png b/airsonic-main/src/main/webapp/icons/default_light/html5.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/html5.png
rename to airsonic-main/src/main/webapp/icons/default_light/html5.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/jamstash.png b/airsonic-main/src/main/webapp/icons/default_light/jamstash.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/jamstash.png
rename to airsonic-main/src/main/webapp/icons/default_light/jamstash.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/keyboard.png b/airsonic-main/src/main/webapp/icons/default_light/keyboard.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/keyboard.png
rename to airsonic-main/src/main/webapp/icons/default_light/keyboard.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/log.png b/airsonic-main/src/main/webapp/icons/default_light/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/log.png
rename to airsonic-main/src/main/webapp/icons/default_light/log.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/logo.png b/airsonic-main/src/main/webapp/icons/default_light/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/logo.png
rename to airsonic-main/src/main/webapp/icons/default_light/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/more.png b/airsonic-main/src/main/webapp/icons/default_light/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/more.png
rename to airsonic-main/src/main/webapp/icons/default_light/more.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/mute.png b/airsonic-main/src/main/webapp/icons/default_light/mute.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/mute.png
rename to airsonic-main/src/main/webapp/icons/default_light/mute.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/now_playing.png b/airsonic-main/src/main/webapp/icons/default_light/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/now_playing.png
rename to airsonic-main/src/main/webapp/icons/default_light/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/play.png b/airsonic-main/src/main/webapp/icons/default_light/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/play.png
rename to airsonic-main/src/main/webapp/icons/default_light/play.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/play_overlay.png b/airsonic-main/src/main/webapp/icons/default_light/play_overlay.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/play_overlay.png
rename to airsonic-main/src/main/webapp/icons/default_light/play_overlay.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/playlist.png b/airsonic-main/src/main/webapp/icons/default_light/playlist.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/playlist.png
rename to airsonic-main/src/main/webapp/icons/default_light/playlist.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/podcast.png b/airsonic-main/src/main/webapp/icons/default_light/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/podcast.png
rename to airsonic-main/src/main/webapp/icons/default_light/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/podcast_large.png b/airsonic-main/src/main/webapp/icons/default_light/podcast_large.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/podcast_large.png
rename to airsonic-main/src/main/webapp/icons/default_light/podcast_large.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/progress.png b/airsonic-main/src/main/webapp/icons/default_light/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/progress.png
rename to airsonic-main/src/main/webapp/icons/default_light/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/random.png b/airsonic-main/src/main/webapp/icons/default_light/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/random.png
rename to airsonic-main/src/main/webapp/icons/default_light/random.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/ratingHalf.png b/airsonic-main/src/main/webapp/icons/default_light/ratingHalf.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/ratingHalf.png
rename to airsonic-main/src/main/webapp/icons/default_light/ratingHalf.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/ratingOff.png b/airsonic-main/src/main/webapp/icons/default_light/ratingOff.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/ratingOff.png
rename to airsonic-main/src/main/webapp/icons/default_light/ratingOff.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/ratingOn.png b/airsonic-main/src/main/webapp/icons/default_light/ratingOn.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/ratingOn.png
rename to airsonic-main/src/main/webapp/icons/default_light/ratingOn.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/remove.gif b/airsonic-main/src/main/webapp/icons/default_light/remove.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/remove.gif
rename to airsonic-main/src/main/webapp/icons/default_light/remove.gif
diff --git a/libresonic-main/src/main/webapp/icons/default_light/remove.png b/airsonic-main/src/main/webapp/icons/default_light/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/remove.png
rename to airsonic-main/src/main/webapp/icons/default_light/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/search.png b/airsonic-main/src/main/webapp/icons/default_light/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/search.png
rename to airsonic-main/src/main/webapp/icons/default_light/search.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/settings.png b/airsonic-main/src/main/webapp/icons/default_light/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/settings.png
rename to airsonic-main/src/main/webapp/icons/default_light/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/share.png b/airsonic-main/src/main/webapp/icons/default_light/share.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/share.png
rename to airsonic-main/src/main/webapp/icons/default_light/share.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/share_facebook.png b/airsonic-main/src/main/webapp/icons/default_light/share_facebook.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/share_facebook.png
rename to airsonic-main/src/main/webapp/icons/default_light/share_facebook.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/share_googleplus.png b/airsonic-main/src/main/webapp/icons/default_light/share_googleplus.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/share_googleplus.png
rename to airsonic-main/src/main/webapp/icons/default_light/share_googleplus.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/share_small.png b/airsonic-main/src/main/webapp/icons/default_light/share_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/share_small.png
rename to airsonic-main/src/main/webapp/icons/default_light/share_small.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/share_twitter.png b/airsonic-main/src/main/webapp/icons/default_light/share_twitter.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/share_twitter.png
rename to airsonic-main/src/main/webapp/icons/default_light/share_twitter.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/shuffle.png b/airsonic-main/src/main/webapp/icons/default_light/shuffle.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/shuffle.png
rename to airsonic-main/src/main/webapp/icons/default_light/shuffle.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/spinner.gif b/airsonic-main/src/main/webapp/icons/default_light/spinner.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/spinner.gif
rename to airsonic-main/src/main/webapp/icons/default_light/spinner.gif
diff --git a/libresonic-main/src/main/webapp/icons/default_light/star_off.png b/airsonic-main/src/main/webapp/icons/default_light/star_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/star_off.png
rename to airsonic-main/src/main/webapp/icons/default_light/star_off.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/starred.png b/airsonic-main/src/main/webapp/icons/default_light/starred.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/starred.png
rename to airsonic-main/src/main/webapp/icons/default_light/starred.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/status.png b/airsonic-main/src/main/webapp/icons/default_light/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/status.png
rename to airsonic-main/src/main/webapp/icons/default_light/status.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/status_small.png b/airsonic-main/src/main/webapp/icons/default_light/status_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/status_small.png
rename to airsonic-main/src/main/webapp/icons/default_light/status_small.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/up.png b/airsonic-main/src/main/webapp/icons/default_light/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/up.png
rename to airsonic-main/src/main/webapp/icons/default_light/up.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/upload.png b/airsonic-main/src/main/webapp/icons/default_light/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/upload.png
rename to airsonic-main/src/main/webapp/icons/default_light/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/view_as_grid.png b/airsonic-main/src/main/webapp/icons/default_light/view_as_grid.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/view_as_grid.png
rename to airsonic-main/src/main/webapp/icons/default_light/view_as_grid.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/view_as_list.png b/airsonic-main/src/main/webapp/icons/default_light/view_as_list.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/view_as_list.png
rename to airsonic-main/src/main/webapp/icons/default_light/view_as_list.png
diff --git a/libresonic-main/src/main/webapp/icons/default_light/volume.png b/airsonic-main/src/main/webapp/icons/default_light/volume.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/default_light/volume.png
rename to airsonic-main/src/main/webapp/icons/default_light/volume.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/add.png b/airsonic-main/src/main/webapp/icons/denim/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/add.png
rename to airsonic-main/src/main/webapp/icons/denim/add.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/back.png b/airsonic-main/src/main/webapp/icons/denim/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/back.png
rename to airsonic-main/src/main/webapp/icons/denim/back.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/clear_rating.png b/airsonic-main/src/main/webapp/icons/denim/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/denim/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/donate.png b/airsonic-main/src/main/webapp/icons/denim/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/donate.png
rename to airsonic-main/src/main/webapp/icons/denim/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/down.png b/airsonic-main/src/main/webapp/icons/denim/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/down.png
rename to airsonic-main/src/main/webapp/icons/denim/down.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/download.png b/airsonic-main/src/main/webapp/icons/denim/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/download.png
rename to airsonic-main/src/main/webapp/icons/denim/download.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/error.png b/airsonic-main/src/main/webapp/icons/denim/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/error.png
rename to airsonic-main/src/main/webapp/icons/denim/error.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/favicon.ico b/airsonic-main/src/main/webapp/icons/denim/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/favicon.ico
rename to airsonic-main/src/main/webapp/icons/denim/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/denim/forward.png b/airsonic-main/src/main/webapp/icons/denim/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/forward.png
rename to airsonic-main/src/main/webapp/icons/denim/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/help.png b/airsonic-main/src/main/webapp/icons/denim/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/help.png
rename to airsonic-main/src/main/webapp/icons/denim/help.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/help_small.png b/airsonic-main/src/main/webapp/icons/denim/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/help_small.png
rename to airsonic-main/src/main/webapp/icons/denim/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/home.png b/airsonic-main/src/main/webapp/icons/denim/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/home.png
rename to airsonic-main/src/main/webapp/icons/denim/home.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/log.png b/airsonic-main/src/main/webapp/icons/denim/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/log.png
rename to airsonic-main/src/main/webapp/icons/denim/log.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/logo_light.png b/airsonic-main/src/main/webapp/icons/denim/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/logo_light.png
rename to airsonic-main/src/main/webapp/icons/denim/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/more.png b/airsonic-main/src/main/webapp/icons/denim/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/more.png
rename to airsonic-main/src/main/webapp/icons/denim/more.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/now_playing.png b/airsonic-main/src/main/webapp/icons/denim/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/now_playing.png
rename to airsonic-main/src/main/webapp/icons/denim/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/paypal.gif b/airsonic-main/src/main/webapp/icons/denim/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/paypal.gif
rename to airsonic-main/src/main/webapp/icons/denim/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/denim/phone.png b/airsonic-main/src/main/webapp/icons/denim/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/phone.png
rename to airsonic-main/src/main/webapp/icons/denim/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/play.png b/airsonic-main/src/main/webapp/icons/denim/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/play.png
rename to airsonic-main/src/main/webapp/icons/denim/play.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/playing.png b/airsonic-main/src/main/webapp/icons/denim/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/playing.png
rename to airsonic-main/src/main/webapp/icons/denim/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/podcast.png b/airsonic-main/src/main/webapp/icons/denim/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/podcast.png
rename to airsonic-main/src/main/webapp/icons/denim/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/podcast_small.png b/airsonic-main/src/main/webapp/icons/denim/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/denim/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/progress.png b/airsonic-main/src/main/webapp/icons/denim/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/progress.png
rename to airsonic-main/src/main/webapp/icons/denim/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/random.png b/airsonic-main/src/main/webapp/icons/denim/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/random.png
rename to airsonic-main/src/main/webapp/icons/denim/random.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/rating_half.png b/airsonic-main/src/main/webapp/icons/denim/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/rating_half.png
rename to airsonic-main/src/main/webapp/icons/denim/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/rating_off.png b/airsonic-main/src/main/webapp/icons/denim/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/rating_off.png
rename to airsonic-main/src/main/webapp/icons/denim/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/rating_on.png b/airsonic-main/src/main/webapp/icons/denim/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/rating_on.png
rename to airsonic-main/src/main/webapp/icons/denim/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/remove.png b/airsonic-main/src/main/webapp/icons/denim/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/remove.png
rename to airsonic-main/src/main/webapp/icons/denim/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/search.png b/airsonic-main/src/main/webapp/icons/denim/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/search.png
rename to airsonic-main/src/main/webapp/icons/denim/search.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/settings.png b/airsonic-main/src/main/webapp/icons/denim/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/settings.png
rename to airsonic-main/src/main/webapp/icons/denim/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/status.png b/airsonic-main/src/main/webapp/icons/denim/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/status.png
rename to airsonic-main/src/main/webapp/icons/denim/status.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/up.png b/airsonic-main/src/main/webapp/icons/denim/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/up.png
rename to airsonic-main/src/main/webapp/icons/denim/up.png
diff --git a/libresonic-main/src/main/webapp/icons/denim/upload.png b/airsonic-main/src/main/webapp/icons/denim/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/denim/upload.png
rename to airsonic-main/src/main/webapp/icons/denim/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/favicon.png b/airsonic-main/src/main/webapp/icons/favicon.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/favicon.png
rename to airsonic-main/src/main/webapp/icons/favicon.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/add.png b/airsonic-main/src/main/webapp/icons/groove/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/add.png
rename to airsonic-main/src/main/webapp/icons/groove/add.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/back.png b/airsonic-main/src/main/webapp/icons/groove/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/back.png
rename to airsonic-main/src/main/webapp/icons/groove/back.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/background_main.png b/airsonic-main/src/main/webapp/icons/groove/background_main.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/background_main.png
rename to airsonic-main/src/main/webapp/icons/groove/background_main.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/background_main_blank.png b/airsonic-main/src/main/webapp/icons/groove/background_main_blank.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/background_main_blank.png
rename to airsonic-main/src/main/webapp/icons/groove/background_main_blank.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/clear_rating.png b/airsonic-main/src/main/webapp/icons/groove/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/groove/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/donate.png b/airsonic-main/src/main/webapp/icons/groove/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/donate.png
rename to airsonic-main/src/main/webapp/icons/groove/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/down.png b/airsonic-main/src/main/webapp/icons/groove/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/down.png
rename to airsonic-main/src/main/webapp/icons/groove/down.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/download.png b/airsonic-main/src/main/webapp/icons/groove/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/download.png
rename to airsonic-main/src/main/webapp/icons/groove/download.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/error.png b/airsonic-main/src/main/webapp/icons/groove/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/error.png
rename to airsonic-main/src/main/webapp/icons/groove/error.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/favicon.ico b/airsonic-main/src/main/webapp/icons/groove/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/favicon.ico
rename to airsonic-main/src/main/webapp/icons/groove/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/groove/forward.png b/airsonic-main/src/main/webapp/icons/groove/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/forward.png
rename to airsonic-main/src/main/webapp/icons/groove/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/help.png b/airsonic-main/src/main/webapp/icons/groove/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/help.png
rename to airsonic-main/src/main/webapp/icons/groove/help.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/help_small.png b/airsonic-main/src/main/webapp/icons/groove/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/help_small.png
rename to airsonic-main/src/main/webapp/icons/groove/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/home.png b/airsonic-main/src/main/webapp/icons/groove/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/home.png
rename to airsonic-main/src/main/webapp/icons/groove/home.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/log.png b/airsonic-main/src/main/webapp/icons/groove/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/log.png
rename to airsonic-main/src/main/webapp/icons/groove/log.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/logo.png b/airsonic-main/src/main/webapp/icons/groove/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/logo.png
rename to airsonic-main/src/main/webapp/icons/groove/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/more.png b/airsonic-main/src/main/webapp/icons/groove/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/more.png
rename to airsonic-main/src/main/webapp/icons/groove/more.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/now_playing.png b/airsonic-main/src/main/webapp/icons/groove/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/now_playing.png
rename to airsonic-main/src/main/webapp/icons/groove/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/paypal.gif b/airsonic-main/src/main/webapp/icons/groove/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/paypal.gif
rename to airsonic-main/src/main/webapp/icons/groove/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/groove/phone.png b/airsonic-main/src/main/webapp/icons/groove/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/phone.png
rename to airsonic-main/src/main/webapp/icons/groove/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/play.png b/airsonic-main/src/main/webapp/icons/groove/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/play.png
rename to airsonic-main/src/main/webapp/icons/groove/play.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/playing.png b/airsonic-main/src/main/webapp/icons/groove/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/playing.png
rename to airsonic-main/src/main/webapp/icons/groove/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/podcast.png b/airsonic-main/src/main/webapp/icons/groove/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/podcast.png
rename to airsonic-main/src/main/webapp/icons/groove/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/podcast_small.png b/airsonic-main/src/main/webapp/icons/groove/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/groove/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/progress.png b/airsonic-main/src/main/webapp/icons/groove/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/progress.png
rename to airsonic-main/src/main/webapp/icons/groove/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/random.png b/airsonic-main/src/main/webapp/icons/groove/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/random.png
rename to airsonic-main/src/main/webapp/icons/groove/random.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/rating_half.png b/airsonic-main/src/main/webapp/icons/groove/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/rating_half.png
rename to airsonic-main/src/main/webapp/icons/groove/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/rating_off.png b/airsonic-main/src/main/webapp/icons/groove/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/rating_off.png
rename to airsonic-main/src/main/webapp/icons/groove/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/rating_on.png b/airsonic-main/src/main/webapp/icons/groove/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/rating_on.png
rename to airsonic-main/src/main/webapp/icons/groove/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/remove.png b/airsonic-main/src/main/webapp/icons/groove/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/remove.png
rename to airsonic-main/src/main/webapp/icons/groove/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/search.png b/airsonic-main/src/main/webapp/icons/groove/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/search.png
rename to airsonic-main/src/main/webapp/icons/groove/search.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/settings.png b/airsonic-main/src/main/webapp/icons/groove/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/settings.png
rename to airsonic-main/src/main/webapp/icons/groove/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/status.png b/airsonic-main/src/main/webapp/icons/groove/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/status.png
rename to airsonic-main/src/main/webapp/icons/groove/status.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/up.png b/airsonic-main/src/main/webapp/icons/groove/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/up.png
rename to airsonic-main/src/main/webapp/icons/groove/up.png
diff --git a/libresonic-main/src/main/webapp/icons/groove/upload.png b/airsonic-main/src/main/webapp/icons/groove/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/groove/upload.png
rename to airsonic-main/src/main/webapp/icons/groove/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/hd/background.png b/airsonic-main/src/main/webapp/icons/hd/background.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hd/background.png
rename to airsonic-main/src/main/webapp/icons/hd/background.png
diff --git a/libresonic-main/src/main/webapp/icons/hicon/favicon.ico b/airsonic-main/src/main/webapp/icons/hicon/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hicon/favicon.ico
rename to airsonic-main/src/main/webapp/icons/hicon/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/hicon/help.png b/airsonic-main/src/main/webapp/icons/hicon/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hicon/help.png
rename to airsonic-main/src/main/webapp/icons/hicon/help.png
diff --git a/libresonic-main/src/main/webapp/icons/hicon/home.png b/airsonic-main/src/main/webapp/icons/hicon/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hicon/home.png
rename to airsonic-main/src/main/webapp/icons/hicon/home.png
diff --git a/libresonic-main/src/main/webapp/icons/hicon/logo.png b/airsonic-main/src/main/webapp/icons/hicon/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hicon/logo.png
rename to airsonic-main/src/main/webapp/icons/hicon/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/hicon/more.png b/airsonic-main/src/main/webapp/icons/hicon/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hicon/more.png
rename to airsonic-main/src/main/webapp/icons/hicon/more.png
diff --git a/libresonic-main/src/main/webapp/icons/hicon/now_playing.png b/airsonic-main/src/main/webapp/icons/hicon/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hicon/now_playing.png
rename to airsonic-main/src/main/webapp/icons/hicon/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/hicon/podcast_large.png b/airsonic-main/src/main/webapp/icons/hicon/podcast_large.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hicon/podcast_large.png
rename to airsonic-main/src/main/webapp/icons/hicon/podcast_large.png
diff --git a/libresonic-main/src/main/webapp/icons/hicon/settings.png b/airsonic-main/src/main/webapp/icons/hicon/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hicon/settings.png
rename to airsonic-main/src/main/webapp/icons/hicon/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/hicon/status.png b/airsonic-main/src/main/webapp/icons/hicon/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hicon/status.png
rename to airsonic-main/src/main/webapp/icons/hicon/status.png
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/Untitled-1.ico b/airsonic-main/src/main/webapp/icons/hiconi/Untitled-1.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hiconi/Untitled-1.ico
rename to airsonic-main/src/main/webapp/icons/hiconi/Untitled-1.ico
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/help.png b/airsonic-main/src/main/webapp/icons/hiconi/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hiconi/help.png
rename to airsonic-main/src/main/webapp/icons/hiconi/help.png
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/home.png b/airsonic-main/src/main/webapp/icons/hiconi/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hiconi/home.png
rename to airsonic-main/src/main/webapp/icons/hiconi/home.png
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/logo_light.png b/airsonic-main/src/main/webapp/icons/hiconi/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hiconi/logo_light.png
rename to airsonic-main/src/main/webapp/icons/hiconi/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/more.png b/airsonic-main/src/main/webapp/icons/hiconi/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hiconi/more.png
rename to airsonic-main/src/main/webapp/icons/hiconi/more.png
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/now_playing.png b/airsonic-main/src/main/webapp/icons/hiconi/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hiconi/now_playing.png
rename to airsonic-main/src/main/webapp/icons/hiconi/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/podcast_large.png b/airsonic-main/src/main/webapp/icons/hiconi/podcast_large.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hiconi/podcast_large.png
rename to airsonic-main/src/main/webapp/icons/hiconi/podcast_large.png
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/settings.png b/airsonic-main/src/main/webapp/icons/hiconi/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hiconi/settings.png
rename to airsonic-main/src/main/webapp/icons/hiconi/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/hiconi/status.png b/airsonic-main/src/main/webapp/icons/hiconi/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hiconi/status.png
rename to airsonic-main/src/main/webapp/icons/hiconi/status.png
diff --git a/libresonic-main/src/main/webapp/icons/hitech/bg.jpg b/airsonic-main/src/main/webapp/icons/hitech/bg.jpg
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/bg.jpg
rename to airsonic-main/src/main/webapp/icons/hitech/bg.jpg
diff --git a/libresonic-main/src/main/webapp/icons/hitech/bg2.jpg b/airsonic-main/src/main/webapp/icons/hitech/bg2.jpg
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/bg2.jpg
rename to airsonic-main/src/main/webapp/icons/hitech/bg2.jpg
diff --git a/libresonic-main/src/main/webapp/icons/hitech/favicon.ico b/airsonic-main/src/main/webapp/icons/hitech/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/favicon.ico
rename to airsonic-main/src/main/webapp/icons/hitech/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/hitech/help.png b/airsonic-main/src/main/webapp/icons/hitech/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/help.png
rename to airsonic-main/src/main/webapp/icons/hitech/help.png
diff --git a/libresonic-main/src/main/webapp/icons/hitech/home.png b/airsonic-main/src/main/webapp/icons/hitech/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/home.png
rename to airsonic-main/src/main/webapp/icons/hitech/home.png
diff --git a/libresonic-main/src/main/webapp/icons/hitech/logo_light.png b/airsonic-main/src/main/webapp/icons/hitech/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/logo_light.png
rename to airsonic-main/src/main/webapp/icons/hitech/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/hitech/more.png b/airsonic-main/src/main/webapp/icons/hitech/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/more.png
rename to airsonic-main/src/main/webapp/icons/hitech/more.png
diff --git a/libresonic-main/src/main/webapp/icons/hitech/now_playing.png b/airsonic-main/src/main/webapp/icons/hitech/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/now_playing.png
rename to airsonic-main/src/main/webapp/icons/hitech/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/hitech/podcast_large.png b/airsonic-main/src/main/webapp/icons/hitech/podcast_large.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/podcast_large.png
rename to airsonic-main/src/main/webapp/icons/hitech/podcast_large.png
diff --git a/libresonic-main/src/main/webapp/icons/hitech/settings.png b/airsonic-main/src/main/webapp/icons/hitech/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/settings.png
rename to airsonic-main/src/main/webapp/icons/hitech/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/hitech/status.png b/airsonic-main/src/main/webapp/icons/hitech/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/hitech/status.png
rename to airsonic-main/src/main/webapp/icons/hitech/status.png
diff --git a/libresonic-main/src/main/webapp/icons/lastfm.gif b/airsonic-main/src/main/webapp/icons/lastfm.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/lastfm.gif
rename to airsonic-main/src/main/webapp/icons/lastfm.gif
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/error.png b/airsonic-main/src/main/webapp/icons/midnightfun/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/error.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/error.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/favicon.ico b/airsonic-main/src/main/webapp/icons/midnightfun/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/favicon.ico
rename to airsonic-main/src/main/webapp/icons/midnightfun/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/logo.png b/airsonic-main/src/main/webapp/icons/midnightfun/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/logo.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_Now_Playing.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_Now_Playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_Now_Playing.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_Now_Playing.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_add.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_add.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_add.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_back.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_back.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_back.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_background.gif b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_background.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_background.gif
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_background.gif
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_clear_Rating.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_clear_Rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_clear_Rating.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_clear_Rating.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_donate.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_donate.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_donate.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_down.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_down.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_down.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_download.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_download.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_download.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_form_controls.jpg b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_form_controls.jpg
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_form_controls.jpg
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_form_controls.jpg
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_form_controls_hover.jpg b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_form_controls_hover.jpg
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_form_controls_hover.jpg
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_form_controls_hover.jpg
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_forward.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_forward.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_forward.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_help.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_help.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_help.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_help_small.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_help_small.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_home.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_home.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_home.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_home_hover.jpg b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_home_hover.jpg
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_home_hover.jpg
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_home_hover.jpg
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_log.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_log.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_log.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_logo_favicon.ico b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_logo_favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_logo_favicon.ico
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_logo_favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_more.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_more.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_more.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_paypal.gif b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_paypal.gif
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_phone.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_phone.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_phone.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_play.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_play.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_play.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_playing.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_playing.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_podcast.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_podcast.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_podcast_small.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_podcast_small.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_random.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_random.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_random.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_remove.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_remove.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_remove.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_search.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_search.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_search.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_settings.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_settings.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_settings.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_status.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_status.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_status.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_table.jpg b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_table.jpg
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_table.jpg
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_table.jpg
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_text_back.jpg b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_text_back.jpg
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_text_back.jpg
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_text_back.jpg
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_up.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_up.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_up.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_upload.png b/airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/midnightfun_upload.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/midnightfun_upload.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/progress.png b/airsonic-main/src/main/webapp/icons/midnightfun/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/progress.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/ratingHalf.png b/airsonic-main/src/main/webapp/icons/midnightfun/ratingHalf.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/ratingHalf.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/ratingHalf.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/ratingOff.png b/airsonic-main/src/main/webapp/icons/midnightfun/ratingOff.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/ratingOff.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/ratingOff.png
diff --git a/libresonic-main/src/main/webapp/icons/midnightfun/ratingOn.png b/airsonic-main/src/main/webapp/icons/midnightfun/ratingOn.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/midnightfun/ratingOn.png
rename to airsonic-main/src/main/webapp/icons/midnightfun/ratingOn.png
diff --git a/libresonic-main/src/main/webapp/icons/monochrome/logo.png b/airsonic-main/src/main/webapp/icons/monochrome/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/monochrome/logo.png
rename to airsonic-main/src/main/webapp/icons/monochrome/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/monochrome/logo_light.png b/airsonic-main/src/main/webapp/icons/monochrome/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/monochrome/logo_light.png
rename to airsonic-main/src/main/webapp/icons/monochrome/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/add.png b/airsonic-main/src/main/webapp/icons/pinkpanther/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/add.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/add.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/back.png b/airsonic-main/src/main/webapp/icons/pinkpanther/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/back.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/back.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/clear_rating.png b/airsonic-main/src/main/webapp/icons/pinkpanther/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/donate.png b/airsonic-main/src/main/webapp/icons/pinkpanther/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/donate.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/down.png b/airsonic-main/src/main/webapp/icons/pinkpanther/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/down.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/down.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/download.png b/airsonic-main/src/main/webapp/icons/pinkpanther/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/download.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/download.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/error.png b/airsonic-main/src/main/webapp/icons/pinkpanther/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/error.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/error.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/favicon.ico b/airsonic-main/src/main/webapp/icons/pinkpanther/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/favicon.ico
rename to airsonic-main/src/main/webapp/icons/pinkpanther/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/forward.png b/airsonic-main/src/main/webapp/icons/pinkpanther/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/forward.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/help.png b/airsonic-main/src/main/webapp/icons/pinkpanther/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/help.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/help.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/help_small.png b/airsonic-main/src/main/webapp/icons/pinkpanther/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/help_small.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/home.png b/airsonic-main/src/main/webapp/icons/pinkpanther/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/home.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/home.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/log.png b/airsonic-main/src/main/webapp/icons/pinkpanther/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/log.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/log.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png b/airsonic-main/src/main/webapp/icons/pinkpanther/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/more.png b/airsonic-main/src/main/webapp/icons/pinkpanther/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/more.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/more.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/now_playing.png b/airsonic-main/src/main/webapp/icons/pinkpanther/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/now_playing.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/paypal.gif b/airsonic-main/src/main/webapp/icons/pinkpanther/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/paypal.gif
rename to airsonic-main/src/main/webapp/icons/pinkpanther/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/phone.png b/airsonic-main/src/main/webapp/icons/pinkpanther/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/phone.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/play.png b/airsonic-main/src/main/webapp/icons/pinkpanther/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/play.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/play.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/playing.png b/airsonic-main/src/main/webapp/icons/pinkpanther/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/playing.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/podcast.png b/airsonic-main/src/main/webapp/icons/pinkpanther/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/podcast.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/podcast_small.png b/airsonic-main/src/main/webapp/icons/pinkpanther/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/progress.png b/airsonic-main/src/main/webapp/icons/pinkpanther/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/progress.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/random.png b/airsonic-main/src/main/webapp/icons/pinkpanther/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/random.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/random.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/rating_half.png b/airsonic-main/src/main/webapp/icons/pinkpanther/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/rating_half.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/rating_off.png b/airsonic-main/src/main/webapp/icons/pinkpanther/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/rating_off.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/rating_on.png b/airsonic-main/src/main/webapp/icons/pinkpanther/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/rating_on.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/remove.png b/airsonic-main/src/main/webapp/icons/pinkpanther/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/remove.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/search.png b/airsonic-main/src/main/webapp/icons/pinkpanther/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/search.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/search.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/settings.png b/airsonic-main/src/main/webapp/icons/pinkpanther/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/settings.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/status.png b/airsonic-main/src/main/webapp/icons/pinkpanther/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/status.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/status.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/up.png b/airsonic-main/src/main/webapp/icons/pinkpanther/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/up.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/up.png
diff --git a/libresonic-main/src/main/webapp/icons/pinkpanther/upload.png b/airsonic-main/src/main/webapp/icons/pinkpanther/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/pinkpanther/upload.png
rename to airsonic-main/src/main/webapp/icons/pinkpanther/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/add.gif b/airsonic-main/src/main/webapp/icons/ripserver/add.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/add.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/add.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/back.gif b/airsonic-main/src/main/webapp/icons/ripserver/back.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/back.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/back.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/background.png b/airsonic-main/src/main/webapp/icons/ripserver/background.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/background.png
rename to airsonic-main/src/main/webapp/icons/ripserver/background.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/libresonic_black.png b/airsonic-main/src/main/webapp/icons/ripserver/black.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/libresonic_black.png
rename to airsonic-main/src/main/webapp/icons/ripserver/black.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/clearRating.png b/airsonic-main/src/main/webapp/icons/ripserver/clearRating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/clearRating.png
rename to airsonic-main/src/main/webapp/icons/ripserver/clearRating.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/current.gif b/airsonic-main/src/main/webapp/icons/ripserver/current.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/current.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/current.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/donate.png b/airsonic-main/src/main/webapp/icons/ripserver/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/donate.png
rename to airsonic-main/src/main/webapp/icons/ripserver/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/down.gif b/airsonic-main/src/main/webapp/icons/ripserver/down.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/down.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/down.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/download.gif b/airsonic-main/src/main/webapp/icons/ripserver/download.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/download.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/download.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/error.png b/airsonic-main/src/main/webapp/icons/ripserver/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/error.png
rename to airsonic-main/src/main/webapp/icons/ripserver/error.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/favicon.ico b/airsonic-main/src/main/webapp/icons/ripserver/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/favicon.ico
rename to airsonic-main/src/main/webapp/icons/ripserver/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/forward.gif b/airsonic-main/src/main/webapp/icons/ripserver/forward.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/forward.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/forward.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/help.png b/airsonic-main/src/main/webapp/icons/ripserver/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/help.png
rename to airsonic-main/src/main/webapp/icons/ripserver/help.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/help_small.png b/airsonic-main/src/main/webapp/icons/ripserver/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/help_small.png
rename to airsonic-main/src/main/webapp/icons/ripserver/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/home.png b/airsonic-main/src/main/webapp/icons/ripserver/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/home.png
rename to airsonic-main/src/main/webapp/icons/ripserver/home.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/log.png b/airsonic-main/src/main/webapp/icons/ripserver/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/log.png
rename to airsonic-main/src/main/webapp/icons/ripserver/log.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/logo.png b/airsonic-main/src/main/webapp/icons/ripserver/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/logo.png
rename to airsonic-main/src/main/webapp/icons/ripserver/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/more.png b/airsonic-main/src/main/webapp/icons/ripserver/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/more.png
rename to airsonic-main/src/main/webapp/icons/ripserver/more.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/now_playing.png b/airsonic-main/src/main/webapp/icons/ripserver/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/now_playing.png
rename to airsonic-main/src/main/webapp/icons/ripserver/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/paypal.gif b/airsonic-main/src/main/webapp/icons/ripserver/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/paypal.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/play.gif b/airsonic-main/src/main/webapp/icons/ripserver/play.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/play.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/play.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/podcast.png b/airsonic-main/src/main/webapp/icons/ripserver/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/podcast.png
rename to airsonic-main/src/main/webapp/icons/ripserver/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/podcast_large.png b/airsonic-main/src/main/webapp/icons/ripserver/podcast_large.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/podcast_large.png
rename to airsonic-main/src/main/webapp/icons/ripserver/podcast_large.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/progress.png b/airsonic-main/src/main/webapp/icons/ripserver/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/progress.png
rename to airsonic-main/src/main/webapp/icons/ripserver/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/random.png b/airsonic-main/src/main/webapp/icons/ripserver/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/random.png
rename to airsonic-main/src/main/webapp/icons/ripserver/random.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/ratingHalf.png b/airsonic-main/src/main/webapp/icons/ripserver/ratingHalf.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/ratingHalf.png
rename to airsonic-main/src/main/webapp/icons/ripserver/ratingHalf.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/ratingOff.png b/airsonic-main/src/main/webapp/icons/ripserver/ratingOff.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/ratingOff.png
rename to airsonic-main/src/main/webapp/icons/ripserver/ratingOff.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/ratingOn.png b/airsonic-main/src/main/webapp/icons/ripserver/ratingOn.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/ratingOn.png
rename to airsonic-main/src/main/webapp/icons/ripserver/ratingOn.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/remove.gif b/airsonic-main/src/main/webapp/icons/ripserver/remove.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/remove.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/remove.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/search.png b/airsonic-main/src/main/webapp/icons/ripserver/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/search.png
rename to airsonic-main/src/main/webapp/icons/ripserver/search.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/settings.png b/airsonic-main/src/main/webapp/icons/ripserver/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/settings.png
rename to airsonic-main/src/main/webapp/icons/ripserver/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/status.png b/airsonic-main/src/main/webapp/icons/ripserver/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/status.png
rename to airsonic-main/src/main/webapp/icons/ripserver/status.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/up.gif b/airsonic-main/src/main/webapp/icons/ripserver/up.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/up.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/up.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/upload.gif b/airsonic-main/src/main/webapp/icons/ripserver/upload.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/upload.gif
rename to airsonic-main/src/main/webapp/icons/ripserver/upload.gif
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/wap.png b/airsonic-main/src/main/webapp/icons/ripserver/wap.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/wap.png
rename to airsonic-main/src/main/webapp/icons/ripserver/wap.png
diff --git a/libresonic-main/src/main/webapp/icons/ripserver/libresonic_white.png b/airsonic-main/src/main/webapp/icons/ripserver/white.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/ripserver/libresonic_white.png
rename to airsonic-main/src/main/webapp/icons/ripserver/white.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/add.png b/airsonic-main/src/main/webapp/icons/simplify/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/add.png
rename to airsonic-main/src/main/webapp/icons/simplify/add.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/back.png b/airsonic-main/src/main/webapp/icons/simplify/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/back.png
rename to airsonic-main/src/main/webapp/icons/simplify/back.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/clear_rating.png b/airsonic-main/src/main/webapp/icons/simplify/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/simplify/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/donate.png b/airsonic-main/src/main/webapp/icons/simplify/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/donate.png
rename to airsonic-main/src/main/webapp/icons/simplify/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/down.png b/airsonic-main/src/main/webapp/icons/simplify/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/down.png
rename to airsonic-main/src/main/webapp/icons/simplify/down.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/download.png b/airsonic-main/src/main/webapp/icons/simplify/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/download.png
rename to airsonic-main/src/main/webapp/icons/simplify/download.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/error.png b/airsonic-main/src/main/webapp/icons/simplify/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/error.png
rename to airsonic-main/src/main/webapp/icons/simplify/error.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/favicon.ico b/airsonic-main/src/main/webapp/icons/simplify/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/favicon.ico
rename to airsonic-main/src/main/webapp/icons/simplify/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/simplify/forward.png b/airsonic-main/src/main/webapp/icons/simplify/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/forward.png
rename to airsonic-main/src/main/webapp/icons/simplify/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/help.png b/airsonic-main/src/main/webapp/icons/simplify/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/help.png
rename to airsonic-main/src/main/webapp/icons/simplify/help.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/help_small.png b/airsonic-main/src/main/webapp/icons/simplify/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/help_small.png
rename to airsonic-main/src/main/webapp/icons/simplify/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/home.png b/airsonic-main/src/main/webapp/icons/simplify/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/home.png
rename to airsonic-main/src/main/webapp/icons/simplify/home.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/log.png b/airsonic-main/src/main/webapp/icons/simplify/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/log.png
rename to airsonic-main/src/main/webapp/icons/simplify/log.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/logo_light.png b/airsonic-main/src/main/webapp/icons/simplify/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/logo_light.png
rename to airsonic-main/src/main/webapp/icons/simplify/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/more.png b/airsonic-main/src/main/webapp/icons/simplify/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/more.png
rename to airsonic-main/src/main/webapp/icons/simplify/more.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/now_playing.png b/airsonic-main/src/main/webapp/icons/simplify/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/now_playing.png
rename to airsonic-main/src/main/webapp/icons/simplify/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/paypal.gif b/airsonic-main/src/main/webapp/icons/simplify/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/paypal.gif
rename to airsonic-main/src/main/webapp/icons/simplify/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/simplify/phone.png b/airsonic-main/src/main/webapp/icons/simplify/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/phone.png
rename to airsonic-main/src/main/webapp/icons/simplify/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/play.png b/airsonic-main/src/main/webapp/icons/simplify/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/play.png
rename to airsonic-main/src/main/webapp/icons/simplify/play.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/playing.png b/airsonic-main/src/main/webapp/icons/simplify/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/playing.png
rename to airsonic-main/src/main/webapp/icons/simplify/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/podcast.png b/airsonic-main/src/main/webapp/icons/simplify/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/podcast.png
rename to airsonic-main/src/main/webapp/icons/simplify/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/podcast_small.png b/airsonic-main/src/main/webapp/icons/simplify/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/simplify/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/progress.png b/airsonic-main/src/main/webapp/icons/simplify/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/progress.png
rename to airsonic-main/src/main/webapp/icons/simplify/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/random.png b/airsonic-main/src/main/webapp/icons/simplify/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/random.png
rename to airsonic-main/src/main/webapp/icons/simplify/random.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/rating_half.png b/airsonic-main/src/main/webapp/icons/simplify/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/rating_half.png
rename to airsonic-main/src/main/webapp/icons/simplify/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/rating_off.png b/airsonic-main/src/main/webapp/icons/simplify/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/rating_off.png
rename to airsonic-main/src/main/webapp/icons/simplify/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/rating_on.png b/airsonic-main/src/main/webapp/icons/simplify/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/rating_on.png
rename to airsonic-main/src/main/webapp/icons/simplify/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/remove.png b/airsonic-main/src/main/webapp/icons/simplify/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/remove.png
rename to airsonic-main/src/main/webapp/icons/simplify/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/search.png b/airsonic-main/src/main/webapp/icons/simplify/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/search.png
rename to airsonic-main/src/main/webapp/icons/simplify/search.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/settings.png b/airsonic-main/src/main/webapp/icons/simplify/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/settings.png
rename to airsonic-main/src/main/webapp/icons/simplify/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/status.png b/airsonic-main/src/main/webapp/icons/simplify/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/status.png
rename to airsonic-main/src/main/webapp/icons/simplify/status.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/up.png b/airsonic-main/src/main/webapp/icons/simplify/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/up.png
rename to airsonic-main/src/main/webapp/icons/simplify/up.png
diff --git a/libresonic-main/src/main/webapp/icons/simplify/upload.png b/airsonic-main/src/main/webapp/icons/simplify/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/simplify/upload.png
rename to airsonic-main/src/main/webapp/icons/simplify/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/slick/favicon.ico b/airsonic-main/src/main/webapp/icons/slick/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/favicon.ico
rename to airsonic-main/src/main/webapp/icons/slick/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/slick/help.png b/airsonic-main/src/main/webapp/icons/slick/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/help.png
rename to airsonic-main/src/main/webapp/icons/slick/help.png
diff --git a/libresonic-main/src/main/webapp/icons/slick/home.png b/airsonic-main/src/main/webapp/icons/slick/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/home.png
rename to airsonic-main/src/main/webapp/icons/slick/home.png
diff --git a/libresonic-main/src/main/webapp/icons/slick/logo_light.png b/airsonic-main/src/main/webapp/icons/slick/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/logo_light.png
rename to airsonic-main/src/main/webapp/icons/slick/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/slick/more.png b/airsonic-main/src/main/webapp/icons/slick/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/more.png
rename to airsonic-main/src/main/webapp/icons/slick/more.png
diff --git a/libresonic-main/src/main/webapp/icons/slick/now_playing.png b/airsonic-main/src/main/webapp/icons/slick/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/now_playing.png
rename to airsonic-main/src/main/webapp/icons/slick/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/slick/podcast_large.png b/airsonic-main/src/main/webapp/icons/slick/podcast_large.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/podcast_large.png
rename to airsonic-main/src/main/webapp/icons/slick/podcast_large.png
diff --git a/libresonic-main/src/main/webapp/icons/slick/settings.png b/airsonic-main/src/main/webapp/icons/slick/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/settings.png
rename to airsonic-main/src/main/webapp/icons/slick/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/slick/status.png b/airsonic-main/src/main/webapp/icons/slick/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/status.png
rename to airsonic-main/src/main/webapp/icons/slick/status.png
diff --git a/libresonic-main/src/main/webapp/icons/slick/top_bg.jpg b/airsonic-main/src/main/webapp/icons/slick/top_bg.jpg
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/slick/top_bg.jpg
rename to airsonic-main/src/main/webapp/icons/slick/top_bg.jpg
diff --git a/libresonic-main/src/main/webapp/icons/sonic/add.png b/airsonic-main/src/main/webapp/icons/sonic/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/add.png
rename to airsonic-main/src/main/webapp/icons/sonic/add.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/back.png b/airsonic-main/src/main/webapp/icons/sonic/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/back.png
rename to airsonic-main/src/main/webapp/icons/sonic/back.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/clear_rating.png b/airsonic-main/src/main/webapp/icons/sonic/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/sonic/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/donate.png b/airsonic-main/src/main/webapp/icons/sonic/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/donate.png
rename to airsonic-main/src/main/webapp/icons/sonic/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/down.png b/airsonic-main/src/main/webapp/icons/sonic/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/down.png
rename to airsonic-main/src/main/webapp/icons/sonic/down.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/download.png b/airsonic-main/src/main/webapp/icons/sonic/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/download.png
rename to airsonic-main/src/main/webapp/icons/sonic/download.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/error.png b/airsonic-main/src/main/webapp/icons/sonic/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/error.png
rename to airsonic-main/src/main/webapp/icons/sonic/error.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/favicon.ico b/airsonic-main/src/main/webapp/icons/sonic/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/favicon.ico
rename to airsonic-main/src/main/webapp/icons/sonic/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/sonic/forward.png b/airsonic-main/src/main/webapp/icons/sonic/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/forward.png
rename to airsonic-main/src/main/webapp/icons/sonic/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/help.png b/airsonic-main/src/main/webapp/icons/sonic/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/help.png
rename to airsonic-main/src/main/webapp/icons/sonic/help.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/help_small.png b/airsonic-main/src/main/webapp/icons/sonic/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/help_small.png
rename to airsonic-main/src/main/webapp/icons/sonic/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/home.png b/airsonic-main/src/main/webapp/icons/sonic/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/home.png
rename to airsonic-main/src/main/webapp/icons/sonic/home.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/log.png b/airsonic-main/src/main/webapp/icons/sonic/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/log.png
rename to airsonic-main/src/main/webapp/icons/sonic/log.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/logo.png b/airsonic-main/src/main/webapp/icons/sonic/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/logo.png
rename to airsonic-main/src/main/webapp/icons/sonic/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/more.png b/airsonic-main/src/main/webapp/icons/sonic/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/more.png
rename to airsonic-main/src/main/webapp/icons/sonic/more.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/now_playing.png b/airsonic-main/src/main/webapp/icons/sonic/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/now_playing.png
rename to airsonic-main/src/main/webapp/icons/sonic/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/paypal.gif b/airsonic-main/src/main/webapp/icons/sonic/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/paypal.gif
rename to airsonic-main/src/main/webapp/icons/sonic/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/sonic/phone.png b/airsonic-main/src/main/webapp/icons/sonic/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/phone.png
rename to airsonic-main/src/main/webapp/icons/sonic/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/play.png b/airsonic-main/src/main/webapp/icons/sonic/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/play.png
rename to airsonic-main/src/main/webapp/icons/sonic/play.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/playing.png b/airsonic-main/src/main/webapp/icons/sonic/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/playing.png
rename to airsonic-main/src/main/webapp/icons/sonic/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/podcast.png b/airsonic-main/src/main/webapp/icons/sonic/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/podcast.png
rename to airsonic-main/src/main/webapp/icons/sonic/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/podcast_small.png b/airsonic-main/src/main/webapp/icons/sonic/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/sonic/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/progress.png b/airsonic-main/src/main/webapp/icons/sonic/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/progress.png
rename to airsonic-main/src/main/webapp/icons/sonic/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/random.png b/airsonic-main/src/main/webapp/icons/sonic/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/random.png
rename to airsonic-main/src/main/webapp/icons/sonic/random.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/rating_half.png b/airsonic-main/src/main/webapp/icons/sonic/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/rating_half.png
rename to airsonic-main/src/main/webapp/icons/sonic/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/rating_off.png b/airsonic-main/src/main/webapp/icons/sonic/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/rating_off.png
rename to airsonic-main/src/main/webapp/icons/sonic/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/rating_on.png b/airsonic-main/src/main/webapp/icons/sonic/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/rating_on.png
rename to airsonic-main/src/main/webapp/icons/sonic/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/remove.png b/airsonic-main/src/main/webapp/icons/sonic/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/remove.png
rename to airsonic-main/src/main/webapp/icons/sonic/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/search.png b/airsonic-main/src/main/webapp/icons/sonic/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/search.png
rename to airsonic-main/src/main/webapp/icons/sonic/search.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/settings.png b/airsonic-main/src/main/webapp/icons/sonic/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/settings.png
rename to airsonic-main/src/main/webapp/icons/sonic/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/status.png b/airsonic-main/src/main/webapp/icons/sonic/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/status.png
rename to airsonic-main/src/main/webapp/icons/sonic/status.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/up.png b/airsonic-main/src/main/webapp/icons/sonic/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/up.png
rename to airsonic-main/src/main/webapp/icons/sonic/up.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic/upload.png b/airsonic-main/src/main/webapp/icons/sonic/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic/upload.png
rename to airsonic-main/src/main/webapp/icons/sonic/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/add.png b/airsonic-main/src/main/webapp/icons/sonic_blue/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/add.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/add.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/back.png b/airsonic-main/src/main/webapp/icons/sonic_blue/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/back.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/back.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/clear_rating.png b/airsonic-main/src/main/webapp/icons/sonic_blue/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/donate.png b/airsonic-main/src/main/webapp/icons/sonic_blue/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/donate.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/down.png b/airsonic-main/src/main/webapp/icons/sonic_blue/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/down.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/down.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/download.png b/airsonic-main/src/main/webapp/icons/sonic_blue/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/download.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/download.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/error.png b/airsonic-main/src/main/webapp/icons/sonic_blue/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/error.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/error.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/favicon.ico b/airsonic-main/src/main/webapp/icons/sonic_blue/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/favicon.ico
rename to airsonic-main/src/main/webapp/icons/sonic_blue/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/forward.png b/airsonic-main/src/main/webapp/icons/sonic_blue/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/forward.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/help.png b/airsonic-main/src/main/webapp/icons/sonic_blue/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/help.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/help.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/help_small.png b/airsonic-main/src/main/webapp/icons/sonic_blue/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/help_small.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/home.png b/airsonic-main/src/main/webapp/icons/sonic_blue/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/home.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/home.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/log.png b/airsonic-main/src/main/webapp/icons/sonic_blue/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/log.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/log.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png b/airsonic-main/src/main/webapp/icons/sonic_blue/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/more.png b/airsonic-main/src/main/webapp/icons/sonic_blue/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/more.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/more.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/now_playing.png b/airsonic-main/src/main/webapp/icons/sonic_blue/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/now_playing.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/paypal.gif b/airsonic-main/src/main/webapp/icons/sonic_blue/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/paypal.gif
rename to airsonic-main/src/main/webapp/icons/sonic_blue/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/phone.png b/airsonic-main/src/main/webapp/icons/sonic_blue/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/phone.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/play.png b/airsonic-main/src/main/webapp/icons/sonic_blue/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/play.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/play.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/playing.png b/airsonic-main/src/main/webapp/icons/sonic_blue/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/playing.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/podcast.png b/airsonic-main/src/main/webapp/icons/sonic_blue/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/podcast.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/podcast_small.png b/airsonic-main/src/main/webapp/icons/sonic_blue/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/progress.png b/airsonic-main/src/main/webapp/icons/sonic_blue/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/progress.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/random.png b/airsonic-main/src/main/webapp/icons/sonic_blue/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/random.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/random.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/rating_half.png b/airsonic-main/src/main/webapp/icons/sonic_blue/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/rating_half.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/rating_off.png b/airsonic-main/src/main/webapp/icons/sonic_blue/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/rating_off.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/rating_on.png b/airsonic-main/src/main/webapp/icons/sonic_blue/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/rating_on.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/remove.png b/airsonic-main/src/main/webapp/icons/sonic_blue/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/remove.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/search.png b/airsonic-main/src/main/webapp/icons/sonic_blue/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/search.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/search.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/settings.png b/airsonic-main/src/main/webapp/icons/sonic_blue/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/settings.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/status.png b/airsonic-main/src/main/webapp/icons/sonic_blue/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/status.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/status.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/up.png b/airsonic-main/src/main/webapp/icons/sonic_blue/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/up.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/up.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_blue/upload.png b/airsonic-main/src/main/webapp/icons/sonic_blue/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_blue/upload.png
rename to airsonic-main/src/main/webapp/icons/sonic_blue/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/add.png b/airsonic-main/src/main/webapp/icons/sonic_white/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/add.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/add.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/back.png b/airsonic-main/src/main/webapp/icons/sonic_white/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/back.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/back.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/clear_rating.png b/airsonic-main/src/main/webapp/icons/sonic_white/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/donate.png b/airsonic-main/src/main/webapp/icons/sonic_white/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/donate.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/down.png b/airsonic-main/src/main/webapp/icons/sonic_white/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/down.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/down.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/download.png b/airsonic-main/src/main/webapp/icons/sonic_white/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/download.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/download.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/error.png b/airsonic-main/src/main/webapp/icons/sonic_white/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/error.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/error.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/favicon.ico b/airsonic-main/src/main/webapp/icons/sonic_white/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/favicon.ico
rename to airsonic-main/src/main/webapp/icons/sonic_white/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/forward.png b/airsonic-main/src/main/webapp/icons/sonic_white/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/forward.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/help.png b/airsonic-main/src/main/webapp/icons/sonic_white/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/help.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/help.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/help_small.png b/airsonic-main/src/main/webapp/icons/sonic_white/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/help_small.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/home.png b/airsonic-main/src/main/webapp/icons/sonic_white/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/home.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/home.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/log.png b/airsonic-main/src/main/webapp/icons/sonic_white/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/log.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/log.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/logo.png b/airsonic-main/src/main/webapp/icons/sonic_white/logo.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/logo.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/logo.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/more.png b/airsonic-main/src/main/webapp/icons/sonic_white/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/more.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/more.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/now_playing.png b/airsonic-main/src/main/webapp/icons/sonic_white/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/now_playing.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/paypal.gif b/airsonic-main/src/main/webapp/icons/sonic_white/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/paypal.gif
rename to airsonic-main/src/main/webapp/icons/sonic_white/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/phone.png b/airsonic-main/src/main/webapp/icons/sonic_white/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/phone.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/play.png b/airsonic-main/src/main/webapp/icons/sonic_white/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/play.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/play.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/playing.png b/airsonic-main/src/main/webapp/icons/sonic_white/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/playing.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/podcast.png b/airsonic-main/src/main/webapp/icons/sonic_white/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/podcast.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/podcast_small.png b/airsonic-main/src/main/webapp/icons/sonic_white/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/progress.png b/airsonic-main/src/main/webapp/icons/sonic_white/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/progress.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/random.png b/airsonic-main/src/main/webapp/icons/sonic_white/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/random.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/random.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/rating_half.png b/airsonic-main/src/main/webapp/icons/sonic_white/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/rating_half.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/rating_off.png b/airsonic-main/src/main/webapp/icons/sonic_white/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/rating_off.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/rating_on.png b/airsonic-main/src/main/webapp/icons/sonic_white/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/rating_on.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/remove.png b/airsonic-main/src/main/webapp/icons/sonic_white/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/remove.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/search.png b/airsonic-main/src/main/webapp/icons/sonic_white/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/search.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/search.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/settings.png b/airsonic-main/src/main/webapp/icons/sonic_white/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/settings.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/status.png b/airsonic-main/src/main/webapp/icons/sonic_white/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/status.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/status.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/up.png b/airsonic-main/src/main/webapp/icons/sonic_white/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/up.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/up.png
diff --git a/libresonic-main/src/main/webapp/icons/sonic_white/upload.png b/airsonic-main/src/main/webapp/icons/sonic_white/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/sonic_white/upload.png
rename to airsonic-main/src/main/webapp/icons/sonic_white/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/add.png b/airsonic-main/src/main/webapp/icons/subStandard/add.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/add.png
rename to airsonic-main/src/main/webapp/icons/subStandard/add.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/android.png b/airsonic-main/src/main/webapp/icons/subStandard/android.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/android.png
rename to airsonic-main/src/main/webapp/icons/subStandard/android.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/back.png b/airsonic-main/src/main/webapp/icons/subStandard/back.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/back.png
rename to airsonic-main/src/main/webapp/icons/subStandard/back.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/background_main.png b/airsonic-main/src/main/webapp/icons/subStandard/background_main.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/background_main.png
rename to airsonic-main/src/main/webapp/icons/subStandard/background_main.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/clear_rating.png b/airsonic-main/src/main/webapp/icons/subStandard/clear_rating.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/clear_rating.png
rename to airsonic-main/src/main/webapp/icons/subStandard/clear_rating.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/donate.png b/airsonic-main/src/main/webapp/icons/subStandard/donate.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/donate.png
rename to airsonic-main/src/main/webapp/icons/subStandard/donate.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/donate_small.png b/airsonic-main/src/main/webapp/icons/subStandard/donate_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/donate_small.png
rename to airsonic-main/src/main/webapp/icons/subStandard/donate_small.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/down.png b/airsonic-main/src/main/webapp/icons/subStandard/down.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/down.png
rename to airsonic-main/src/main/webapp/icons/subStandard/down.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/download.png b/airsonic-main/src/main/webapp/icons/subStandard/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/download.png
rename to airsonic-main/src/main/webapp/icons/subStandard/download.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/error.png b/airsonic-main/src/main/webapp/icons/subStandard/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/error.png
rename to airsonic-main/src/main/webapp/icons/subStandard/error.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/facebook.png b/airsonic-main/src/main/webapp/icons/subStandard/facebook.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/facebook.png
rename to airsonic-main/src/main/webapp/icons/subStandard/facebook.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/favicon.ico b/airsonic-main/src/main/webapp/icons/subStandard/favicon.ico
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/favicon.ico
rename to airsonic-main/src/main/webapp/icons/subStandard/favicon.ico
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/forward.png b/airsonic-main/src/main/webapp/icons/subStandard/forward.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/forward.png
rename to airsonic-main/src/main/webapp/icons/subStandard/forward.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/googleplus.png b/airsonic-main/src/main/webapp/icons/subStandard/googleplus.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/googleplus.png
rename to airsonic-main/src/main/webapp/icons/subStandard/googleplus.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/help.png b/airsonic-main/src/main/webapp/icons/subStandard/help.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/help.png
rename to airsonic-main/src/main/webapp/icons/subStandard/help.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/help_small.png b/airsonic-main/src/main/webapp/icons/subStandard/help_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/help_small.png
rename to airsonic-main/src/main/webapp/icons/subStandard/help_small.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/home.png b/airsonic-main/src/main/webapp/icons/subStandard/home.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/home.png
rename to airsonic-main/src/main/webapp/icons/subStandard/home.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/log.png b/airsonic-main/src/main/webapp/icons/subStandard/log.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/log.png
rename to airsonic-main/src/main/webapp/icons/subStandard/log.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/logo_light.png b/airsonic-main/src/main/webapp/icons/subStandard/logo_light.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/logo_light.png
rename to airsonic-main/src/main/webapp/icons/subStandard/logo_light.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/more.png b/airsonic-main/src/main/webapp/icons/subStandard/more.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/more.png
rename to airsonic-main/src/main/webapp/icons/subStandard/more.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/now_playing.png b/airsonic-main/src/main/webapp/icons/subStandard/now_playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/now_playing.png
rename to airsonic-main/src/main/webapp/icons/subStandard/now_playing.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/paypal.gif b/airsonic-main/src/main/webapp/icons/subStandard/paypal.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/paypal.gif
rename to airsonic-main/src/main/webapp/icons/subStandard/paypal.gif
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/phone.png b/airsonic-main/src/main/webapp/icons/subStandard/phone.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/phone.png
rename to airsonic-main/src/main/webapp/icons/subStandard/phone.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/play.png b/airsonic-main/src/main/webapp/icons/subStandard/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/play.png
rename to airsonic-main/src/main/webapp/icons/subStandard/play.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/playing.png b/airsonic-main/src/main/webapp/icons/subStandard/playing.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/playing.png
rename to airsonic-main/src/main/webapp/icons/subStandard/playing.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/podcast.png b/airsonic-main/src/main/webapp/icons/subStandard/podcast.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/podcast.png
rename to airsonic-main/src/main/webapp/icons/subStandard/podcast.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/podcast_small.png b/airsonic-main/src/main/webapp/icons/subStandard/podcast_small.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/podcast_small.png
rename to airsonic-main/src/main/webapp/icons/subStandard/podcast_small.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/progress.png b/airsonic-main/src/main/webapp/icons/subStandard/progress.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/progress.png
rename to airsonic-main/src/main/webapp/icons/subStandard/progress.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/random.png b/airsonic-main/src/main/webapp/icons/subStandard/random.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/random.png
rename to airsonic-main/src/main/webapp/icons/subStandard/random.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/rating_half.png b/airsonic-main/src/main/webapp/icons/subStandard/rating_half.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/rating_half.png
rename to airsonic-main/src/main/webapp/icons/subStandard/rating_half.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/rating_off.png b/airsonic-main/src/main/webapp/icons/subStandard/rating_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/rating_off.png
rename to airsonic-main/src/main/webapp/icons/subStandard/rating_off.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/rating_on.png b/airsonic-main/src/main/webapp/icons/subStandard/rating_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/rating_on.png
rename to airsonic-main/src/main/webapp/icons/subStandard/rating_on.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/remove.png b/airsonic-main/src/main/webapp/icons/subStandard/remove.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/remove.png
rename to airsonic-main/src/main/webapp/icons/subStandard/remove.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/search.png b/airsonic-main/src/main/webapp/icons/subStandard/search.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/search.png
rename to airsonic-main/src/main/webapp/icons/subStandard/search.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/settings.png b/airsonic-main/src/main/webapp/icons/subStandard/settings.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/settings.png
rename to airsonic-main/src/main/webapp/icons/subStandard/settings.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/starred.png b/airsonic-main/src/main/webapp/icons/subStandard/starred.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/starred.png
rename to airsonic-main/src/main/webapp/icons/subStandard/starred.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/status.png b/airsonic-main/src/main/webapp/icons/subStandard/status.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/status.png
rename to airsonic-main/src/main/webapp/icons/subStandard/status.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/twitter.png b/airsonic-main/src/main/webapp/icons/subStandard/twitter.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/twitter.png
rename to airsonic-main/src/main/webapp/icons/subStandard/twitter.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/up.png b/airsonic-main/src/main/webapp/icons/subStandard/up.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/up.png
rename to airsonic-main/src/main/webapp/icons/subStandard/up.png
diff --git a/libresonic-main/src/main/webapp/icons/subStandard/upload.png b/airsonic-main/src/main/webapp/icons/subStandard/upload.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/subStandard/upload.png
rename to airsonic-main/src/main/webapp/icons/subStandard/upload.png
diff --git a/libresonic-main/src/main/webapp/icons/video/audio_off.png b/airsonic-main/src/main/webapp/icons/video/audio_off.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/video/audio_off.png
rename to airsonic-main/src/main/webapp/icons/video/audio_off.png
diff --git a/libresonic-main/src/main/webapp/icons/video/audio_on.png b/airsonic-main/src/main/webapp/icons/video/audio_on.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/video/audio_on.png
rename to airsonic-main/src/main/webapp/icons/video/audio_on.png
diff --git a/libresonic-main/src/main/webapp/icons/video/cast_active.png b/airsonic-main/src/main/webapp/icons/video/cast_active.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/video/cast_active.png
rename to airsonic-main/src/main/webapp/icons/video/cast_active.png
diff --git a/libresonic-main/src/main/webapp/icons/video/cast_idle.png b/airsonic-main/src/main/webapp/icons/video/cast_idle.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/video/cast_idle.png
rename to airsonic-main/src/main/webapp/icons/video/cast_idle.png
diff --git a/libresonic-main/src/main/webapp/icons/video/download.png b/airsonic-main/src/main/webapp/icons/video/download.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/video/download.png
rename to airsonic-main/src/main/webapp/icons/video/download.png
diff --git a/libresonic-main/src/main/webapp/icons/video/pause.png b/airsonic-main/src/main/webapp/icons/video/pause.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/video/pause.png
rename to airsonic-main/src/main/webapp/icons/video/pause.png
diff --git a/libresonic-main/src/main/webapp/icons/video/play.png b/airsonic-main/src/main/webapp/icons/video/play.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/video/play.png
rename to airsonic-main/src/main/webapp/icons/video/play.png
diff --git a/libresonic-main/src/main/webapp/icons/video/share.png b/airsonic-main/src/main/webapp/icons/video/share.png
similarity index 100%
rename from libresonic-main/src/main/webapp/icons/video/share.png
rename to airsonic-main/src/main/webapp/icons/video/share.png
diff --git a/libresonic-main/src/main/webapp/index.html b/airsonic-main/src/main/webapp/index.html
similarity index 100%
rename from libresonic-main/src/main/webapp/index.html
rename to airsonic-main/src/main/webapp/index.html
diff --git a/libresonic-main/src/main/webapp/index.jsp b/airsonic-main/src/main/webapp/index.jsp
similarity index 100%
rename from libresonic-main/src/main/webapp/index.jsp
rename to airsonic-main/src/main/webapp/index.jsp
diff --git a/libresonic-main/src/main/webapp/script/AC_OETags.js b/airsonic-main/src/main/webapp/script/AC_OETags.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/AC_OETags.js
rename to airsonic-main/src/main/webapp/script/AC_OETags.js
diff --git a/libresonic-main/src/main/webapp/script/builder.js b/airsonic-main/src/main/webapp/script/builder.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/builder.js
rename to airsonic-main/src/main/webapp/script/builder.js
diff --git a/libresonic-main/src/main/webapp/script/controls.js b/airsonic-main/src/main/webapp/script/controls.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/controls.js
rename to airsonic-main/src/main/webapp/script/controls.js
diff --git a/libresonic-main/src/main/webapp/script/effects.js b/airsonic-main/src/main/webapp/script/effects.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/effects.js
rename to airsonic-main/src/main/webapp/script/effects.js
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/FancyZoom.js b/airsonic-main/src/main/webapp/script/fancyzoom/FancyZoom.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/FancyZoom.js
rename to airsonic-main/src/main/webapp/script/fancyzoom/FancyZoom.js
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/FancyZoomHTML.js b/airsonic-main/src/main/webapp/script/fancyzoom/FancyZoomHTML.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/FancyZoomHTML.js
rename to airsonic-main/src/main/webapp/script/fancyzoom/FancyZoomHTML.js
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/closebox.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/closebox.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/closebox.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/closebox.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/spacer.gif b/airsonic-main/src/main/webapp/script/fancyzoom/images/spacer.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/spacer.gif
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/spacer.gif
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-fill.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-fill.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-fill.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-fill.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-l.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-l.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-l.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-l.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-r.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-r.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-r.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-caption-r.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow1.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow1.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow1.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow1.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow2.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow2.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow2.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow2.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow3.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow3.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow3.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow3.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow4.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow4.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow4.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow4.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow5.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow5.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow5.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow5.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow6.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow6.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow6.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow6.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow7.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow7.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow7.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow7.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow8.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow8.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow8.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-shadow8.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-1.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-1.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-1.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-1.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-10.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-10.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-10.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-10.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-11.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-11.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-11.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-11.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-12.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-12.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-12.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-12.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-2.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-2.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-2.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-2.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-3.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-3.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-3.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-3.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-4.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-4.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-4.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-4.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-5.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-5.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-5.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-5.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-6.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-6.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-6.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-6.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-7.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-7.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-7.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-7.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-8.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-8.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-8.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-8.png
diff --git a/libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-9.png b/airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-9.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-9.png
rename to airsonic-main/src/main/webapp/script/fancyzoom/images/zoom-spin-9.png
diff --git a/libresonic-main/src/main/webapp/script/jquery-1.7.1.min.js b/airsonic-main/src/main/webapp/script/jquery-1.7.1.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery-1.7.1.min.js
rename to airsonic-main/src/main/webapp/script/jquery-1.7.1.min.js
diff --git a/libresonic-main/src/main/webapp/script/jquery-ui-1.11.1.min.js b/airsonic-main/src/main/webapp/script/jquery-ui-1.11.1.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery-ui-1.11.1.min.js
rename to airsonic-main/src/main/webapp/script/jquery-ui-1.11.1.min.js
diff --git a/libresonic-main/src/main/webapp/script/jquery.contextMenu.js b/airsonic-main/src/main/webapp/script/jquery.contextMenu.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery.contextMenu.js
rename to airsonic-main/src/main/webapp/script/jquery.contextMenu.js
diff --git a/libresonic-main/src/main/webapp/script/jquery.toastmessage/css/jquery.toastmessage.css b/airsonic-main/src/main/webapp/script/jquery.toastmessage/css/jquery.toastmessage.css
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery.toastmessage/css/jquery.toastmessage.css
rename to airsonic-main/src/main/webapp/script/jquery.toastmessage/css/jquery.toastmessage.css
diff --git a/libresonic-main/src/main/webapp/script/jquery.toastmessage/images/close.gif b/airsonic-main/src/main/webapp/script/jquery.toastmessage/images/close.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery.toastmessage/images/close.gif
rename to airsonic-main/src/main/webapp/script/jquery.toastmessage/images/close.gif
diff --git a/libresonic-main/src/main/webapp/script/jquery.toastmessage/images/error.png b/airsonic-main/src/main/webapp/script/jquery.toastmessage/images/error.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery.toastmessage/images/error.png
rename to airsonic-main/src/main/webapp/script/jquery.toastmessage/images/error.png
diff --git a/libresonic-main/src/main/webapp/script/jquery.toastmessage/images/notice.png b/airsonic-main/src/main/webapp/script/jquery.toastmessage/images/notice.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery.toastmessage/images/notice.png
rename to airsonic-main/src/main/webapp/script/jquery.toastmessage/images/notice.png
diff --git a/libresonic-main/src/main/webapp/script/jquery.toastmessage/images/success.png b/airsonic-main/src/main/webapp/script/jquery.toastmessage/images/success.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery.toastmessage/images/success.png
rename to airsonic-main/src/main/webapp/script/jquery.toastmessage/images/success.png
diff --git a/libresonic-main/src/main/webapp/script/jquery.toastmessage/images/warning.png b/airsonic-main/src/main/webapp/script/jquery.toastmessage/images/warning.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery.toastmessage/images/warning.png
rename to airsonic-main/src/main/webapp/script/jquery.toastmessage/images/warning.png
diff --git a/libresonic-main/src/main/webapp/script/jquery.toastmessage/jquery.toastmessage.js b/airsonic-main/src/main/webapp/script/jquery.toastmessage/jquery.toastmessage.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jquery.toastmessage/jquery.toastmessage.js
rename to airsonic-main/src/main/webapp/script/jquery.toastmessage/jquery.toastmessage.js
diff --git a/libresonic-main/src/main/webapp/script/jwplayer-5.10.min.js b/airsonic-main/src/main/webapp/script/jwplayer-5.10.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/jwplayer-5.10.min.js
rename to airsonic-main/src/main/webapp/script/jwplayer-5.10.min.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/jquery.js b/airsonic-main/src/main/webapp/script/mediaelement/jquery.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/jquery.js
rename to airsonic-main/src/main/webapp/script/mediaelement/jquery.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/ca.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/ca.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/ca.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/ca.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/cs.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/cs.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/cs.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/cs.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/de.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/de.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/de.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/de.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/es.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/es.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/es.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/es.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/fr.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/fr.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/fr.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/fr.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/hr.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/hr.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/hr.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/hr.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/hu.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/hu.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/hu.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/hu.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/it.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/it.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/it.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/it.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/ja.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/ja.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/ja.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/ja.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/ko.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/ko.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/ko.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/ko.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/nl.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/nl.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/nl.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/nl.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/pl.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/pl.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/pl.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/pl.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/pt-br.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/pt-br.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/pt-br.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/pt-br.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/pt.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/pt.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/pt.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/pt.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/ro.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/ro.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/ro.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/ro.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/ru.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/ru.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/ru.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/ru.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/sk.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/sk.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/sk.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/sk.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/sv.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/sv.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/sv.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/sv.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/uk.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/uk.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/uk.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/uk.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/zh-cn.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/zh-cn.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/zh-cn.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/zh-cn.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/lang/zh.js b/airsonic-main/src/main/webapp/script/mediaelement/lang/zh.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/lang/zh.js
rename to airsonic-main/src/main/webapp/script/mediaelement/lang/zh.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelement-and-player.js b/airsonic-main/src/main/webapp/script/mediaelement/mediaelement-and-player.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelement-and-player.js
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelement-and-player.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelement-and-player.min.js b/airsonic-main/src/main/webapp/script/mediaelement/mediaelement-and-player.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelement-and-player.min.js
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelement-and-player.min.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-audio-ogg.swf b/airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-audio-ogg.swf
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-audio-ogg.swf
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-audio-ogg.swf
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-audio.swf b/airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-audio.swf
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-audio.swf
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-audio.swf
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video-hls.swf b/airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video-hls.swf
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video-hls.swf
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video-hls.swf
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video-mdash.swf b/airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video-mdash.swf
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video-mdash.swf
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video-mdash.swf
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video.swf b/airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video.swf
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video.swf
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelement-flash-video.swf
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelement.js b/airsonic-main/src/main/webapp/script/mediaelement/mediaelement.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelement.js
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelement.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelement.min.js b/airsonic-main/src/main/webapp/script/mediaelement/mediaelement.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelement.min.js
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelement.min.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer-legacy.css b/airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer-legacy.css
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer-legacy.css
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer-legacy.css
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer-legacy.min.css b/airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer-legacy.min.css
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer-legacy.min.css
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer-legacy.min.css
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.css b/airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.css
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.css
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.css
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.js b/airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.js
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.min.css b/airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.min.css
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.min.css
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.min.css
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.min.js b/airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.min.js
rename to airsonic-main/src/main/webapp/script/mediaelement/mediaelementplayer.min.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mejs-controls.png b/airsonic-main/src/main/webapp/script/mediaelement/mejs-controls.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mejs-controls.png
rename to airsonic-main/src/main/webapp/script/mediaelement/mejs-controls.png
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/mejs-controls.svg b/airsonic-main/src/main/webapp/script/mediaelement/mejs-controls.svg
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/mejs-controls.svg
rename to airsonic-main/src/main/webapp/script/mediaelement/mejs-controls.svg
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/dailymotion.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/dailymotion.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/dailymotion.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/dailymotion.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/dailymotion.min.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/dailymotion.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/dailymotion.min.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/dailymotion.min.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/facebook.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/facebook.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/facebook.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/facebook.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/facebook.min.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/facebook.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/facebook.min.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/facebook.min.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/soundcloud.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/soundcloud.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/soundcloud.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/soundcloud.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/soundcloud.min.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/soundcloud.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/soundcloud.min.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/soundcloud.min.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/twitch.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/twitch.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/twitch.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/twitch.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/twitch.min.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/twitch.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/twitch.min.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/twitch.min.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/vimeo.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/vimeo.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/vimeo.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/vimeo.js
diff --git a/libresonic-main/src/main/webapp/script/mediaelement/renderers/vimeo.min.js b/airsonic-main/src/main/webapp/script/mediaelement/renderers/vimeo.min.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mediaelement/renderers/vimeo.min.js
rename to airsonic-main/src/main/webapp/script/mediaelement/renderers/vimeo.min.js
diff --git a/libresonic-main/src/main/webapp/script/mousetrap-1.6.0.js b/airsonic-main/src/main/webapp/script/mousetrap-1.6.0.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/mousetrap-1.6.0.js
rename to airsonic-main/src/main/webapp/script/mousetrap-1.6.0.js
diff --git a/libresonic-main/src/main/webapp/script/pngfix.js b/airsonic-main/src/main/webapp/script/pngfix.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/pngfix.js
rename to airsonic-main/src/main/webapp/script/pngfix.js
diff --git a/libresonic-main/src/main/webapp/script/prototype.js b/airsonic-main/src/main/webapp/script/prototype.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/prototype.js
rename to airsonic-main/src/main/webapp/script/prototype.js
diff --git a/libresonic-main/src/main/webapp/script/scripts-2.0.js b/airsonic-main/src/main/webapp/script/scripts-2.0.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/scripts-2.0.js
rename to airsonic-main/src/main/webapp/script/scripts-2.0.js
diff --git a/libresonic-main/src/main/webapp/script/swfobject.js b/airsonic-main/src/main/webapp/script/swfobject.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/swfobject.js
rename to airsonic-main/src/main/webapp/script/swfobject.js
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon.js b/airsonic-main/src/main/webapp/script/tip_balloon.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon.js
rename to airsonic-main/src/main/webapp/script/tip_balloon.js
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/b.gif b/airsonic-main/src/main/webapp/script/tip_balloon/b.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/b.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/b.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/background.gif b/airsonic-main/src/main/webapp/script/tip_balloon/background.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/background.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/background.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/l.gif b/airsonic-main/src/main/webapp/script/tip_balloon/l.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/l.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/l.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/lb.gif b/airsonic-main/src/main/webapp/script/tip_balloon/lb.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/lb.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/lb.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/lt.gif b/airsonic-main/src/main/webapp/script/tip_balloon/lt.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/lt.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/lt.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/r.gif b/airsonic-main/src/main/webapp/script/tip_balloon/r.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/r.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/r.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/rb.gif b/airsonic-main/src/main/webapp/script/tip_balloon/rb.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/rb.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/rb.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/rt.gif b/airsonic-main/src/main/webapp/script/tip_balloon/rt.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/rt.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/rt.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/stemb.gif b/airsonic-main/src/main/webapp/script/tip_balloon/stemb.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/stemb.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/stemb.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/stemt.gif b/airsonic-main/src/main/webapp/script/tip_balloon/stemt.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/stemt.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/stemt.gif
diff --git a/libresonic-main/src/main/webapp/script/tip_balloon/t.gif b/airsonic-main/src/main/webapp/script/tip_balloon/t.gif
similarity index 100%
rename from libresonic-main/src/main/webapp/script/tip_balloon/t.gif
rename to airsonic-main/src/main/webapp/script/tip_balloon/t.gif
diff --git a/libresonic-main/src/main/webapp/script/util.js b/airsonic-main/src/main/webapp/script/util.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/util.js
rename to airsonic-main/src/main/webapp/script/util.js
diff --git a/libresonic-main/src/main/webapp/script/webfx/boxsizing.htc b/airsonic-main/src/main/webapp/script/webfx/boxsizing.htc
similarity index 100%
rename from libresonic-main/src/main/webapp/script/webfx/boxsizing.htc
rename to airsonic-main/src/main/webapp/script/webfx/boxsizing.htc
diff --git a/libresonic-main/src/main/webapp/script/webfx/handle.horizontal.hover.png b/airsonic-main/src/main/webapp/script/webfx/handle.horizontal.hover.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/webfx/handle.horizontal.hover.png
rename to airsonic-main/src/main/webapp/script/webfx/handle.horizontal.hover.png
diff --git a/libresonic-main/src/main/webapp/script/webfx/handle.horizontal.png b/airsonic-main/src/main/webapp/script/webfx/handle.horizontal.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/webfx/handle.horizontal.png
rename to airsonic-main/src/main/webapp/script/webfx/handle.horizontal.png
diff --git a/libresonic-main/src/main/webapp/script/webfx/handle.vertical.hover.png b/airsonic-main/src/main/webapp/script/webfx/handle.vertical.hover.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/webfx/handle.vertical.hover.png
rename to airsonic-main/src/main/webapp/script/webfx/handle.vertical.hover.png
diff --git a/libresonic-main/src/main/webapp/script/webfx/handle.vertical.png b/airsonic-main/src/main/webapp/script/webfx/handle.vertical.png
similarity index 100%
rename from libresonic-main/src/main/webapp/script/webfx/handle.vertical.png
rename to airsonic-main/src/main/webapp/script/webfx/handle.vertical.png
diff --git a/libresonic-main/src/main/webapp/script/webfx/luna.css b/airsonic-main/src/main/webapp/script/webfx/luna.css
similarity index 100%
rename from libresonic-main/src/main/webapp/script/webfx/luna.css
rename to airsonic-main/src/main/webapp/script/webfx/luna.css
diff --git a/libresonic-main/src/main/webapp/script/webfx/range.js b/airsonic-main/src/main/webapp/script/webfx/range.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/webfx/range.js
rename to airsonic-main/src/main/webapp/script/webfx/range.js
diff --git a/libresonic-main/src/main/webapp/script/webfx/slider.js b/airsonic-main/src/main/webapp/script/webfx/slider.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/webfx/slider.js
rename to airsonic-main/src/main/webapp/script/webfx/slider.js
diff --git a/libresonic-main/src/main/webapp/script/webfx/timer.js b/airsonic-main/src/main/webapp/script/webfx/timer.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/webfx/timer.js
rename to airsonic-main/src/main/webapp/script/webfx/timer.js
diff --git a/libresonic-main/src/main/webapp/script/wz_tooltip.js b/airsonic-main/src/main/webapp/script/wz_tooltip.js
similarity index 100%
rename from libresonic-main/src/main/webapp/script/wz_tooltip.js
rename to airsonic-main/src/main/webapp/script/wz_tooltip.js
diff --git a/libresonic-main/src/main/webapp/sonos/presentationMap.xml b/airsonic-main/src/main/webapp/sonos/presentationMap.xml
similarity index 100%
rename from libresonic-main/src/main/webapp/sonos/presentationMap.xml
rename to airsonic-main/src/main/webapp/sonos/presentationMap.xml
diff --git a/libresonic-main/src/main/webapp/sonos/presentationMap.xsd b/airsonic-main/src/main/webapp/sonos/presentationMap.xsd
similarity index 100%
rename from libresonic-main/src/main/webapp/sonos/presentationMap.xsd
rename to airsonic-main/src/main/webapp/sonos/presentationMap.xsd
diff --git a/libresonic-main/src/main/webapp/sonos/strings.xml b/airsonic-main/src/main/webapp/sonos/strings.xml
similarity index 100%
rename from libresonic-main/src/main/webapp/sonos/strings.xml
rename to airsonic-main/src/main/webapp/sonos/strings.xml
diff --git a/libresonic-main/src/main/webapp/style/barents.css b/airsonic-main/src/main/webapp/style/barents.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/barents.css
rename to airsonic-main/src/main/webapp/style/barents.css
diff --git a/libresonic-main/src/main/webapp/style/black.css b/airsonic-main/src/main/webapp/style/black.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/black.css
rename to airsonic-main/src/main/webapp/style/black.css
diff --git a/libresonic-main/src/main/webapp/style/buuftheme.css b/airsonic-main/src/main/webapp/style/buuftheme.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/buuftheme.css
rename to airsonic-main/src/main/webapp/style/buuftheme.css
diff --git a/libresonic-main/src/main/webapp/style/coolandclean.css b/airsonic-main/src/main/webapp/style/coolandclean.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/coolandclean.css
rename to airsonic-main/src/main/webapp/style/coolandclean.css
diff --git a/libresonic-main/src/main/webapp/style/default.css b/airsonic-main/src/main/webapp/style/default.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/default.css
rename to airsonic-main/src/main/webapp/style/default.css
diff --git a/libresonic-main/src/main/webapp/style/denim.css b/airsonic-main/src/main/webapp/style/denim.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/denim.css
rename to airsonic-main/src/main/webapp/style/denim.css
diff --git a/libresonic-main/src/main/webapp/style/groove.css b/airsonic-main/src/main/webapp/style/groove.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/groove.css
rename to airsonic-main/src/main/webapp/style/groove.css
diff --git a/libresonic-main/src/main/webapp/style/groove_simple.css b/airsonic-main/src/main/webapp/style/groove_simple.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/groove_simple.css
rename to airsonic-main/src/main/webapp/style/groove_simple.css
diff --git a/libresonic-main/src/main/webapp/style/hd.css b/airsonic-main/src/main/webapp/style/hd.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/hd.css
rename to airsonic-main/src/main/webapp/style/hd.css
diff --git a/libresonic-main/src/main/webapp/style/hd1080.css b/airsonic-main/src/main/webapp/style/hd1080.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/hd1080.css
rename to airsonic-main/src/main/webapp/style/hd1080.css
diff --git a/libresonic-main/src/main/webapp/style/hd720.css b/airsonic-main/src/main/webapp/style/hd720.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/hd720.css
rename to airsonic-main/src/main/webapp/style/hd720.css
diff --git a/libresonic-main/src/main/webapp/style/hd768.css b/airsonic-main/src/main/webapp/style/hd768.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/hd768.css
rename to airsonic-main/src/main/webapp/style/hd768.css
diff --git a/libresonic-main/src/main/webapp/style/hicon.css b/airsonic-main/src/main/webapp/style/hicon.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/hicon.css
rename to airsonic-main/src/main/webapp/style/hicon.css
diff --git a/libresonic-main/src/main/webapp/style/hiconi.css b/airsonic-main/src/main/webapp/style/hiconi.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/hiconi.css
rename to airsonic-main/src/main/webapp/style/hiconi.css
diff --git a/libresonic-main/src/main/webapp/style/hitech.css b/airsonic-main/src/main/webapp/style/hitech.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/hitech.css
rename to airsonic-main/src/main/webapp/style/hitech.css
diff --git a/libresonic-main/src/main/webapp/style/jquery.contextMenu.css b/airsonic-main/src/main/webapp/style/jquery.contextMenu.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/jquery.contextMenu.css
rename to airsonic-main/src/main/webapp/style/jquery.contextMenu.css
diff --git a/libresonic-main/src/main/webapp/style/midnight.css b/airsonic-main/src/main/webapp/style/midnight.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/midnight.css
rename to airsonic-main/src/main/webapp/style/midnight.css
diff --git a/libresonic-main/src/main/webapp/style/midnightfun.css b/airsonic-main/src/main/webapp/style/midnightfun.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/midnightfun.css
rename to airsonic-main/src/main/webapp/style/midnightfun.css
diff --git a/libresonic-main/src/main/webapp/style/monochrome.css b/airsonic-main/src/main/webapp/style/monochrome.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/monochrome.css
rename to airsonic-main/src/main/webapp/style/monochrome.css
diff --git a/libresonic-main/src/main/webapp/style/monochrome_black.css b/airsonic-main/src/main/webapp/style/monochrome_black.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/monochrome_black.css
rename to airsonic-main/src/main/webapp/style/monochrome_black.css
diff --git a/libresonic-main/src/main/webapp/style/pinkpanther.css b/airsonic-main/src/main/webapp/style/pinkpanther.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/pinkpanther.css
rename to airsonic-main/src/main/webapp/style/pinkpanther.css
diff --git a/libresonic-main/src/main/webapp/style/ripserver.css b/airsonic-main/src/main/webapp/style/ripserver.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/ripserver.css
rename to airsonic-main/src/main/webapp/style/ripserver.css
diff --git a/libresonic-main/src/main/webapp/style/sandstorm.css b/airsonic-main/src/main/webapp/style/sandstorm.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/sandstorm.css
rename to airsonic-main/src/main/webapp/style/sandstorm.css
diff --git a/libresonic-main/src/main/webapp/style/simplify.css b/airsonic-main/src/main/webapp/style/simplify.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/simplify.css
rename to airsonic-main/src/main/webapp/style/simplify.css
diff --git a/libresonic-main/src/main/webapp/style/slick.css b/airsonic-main/src/main/webapp/style/slick.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/slick.css
rename to airsonic-main/src/main/webapp/style/slick.css
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_222222_256x240.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_222222_256x240.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_222222_256x240.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_2e83ff_256x240.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_2e83ff_256x240.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_454545_256x240.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_454545_256x240.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_454545_256x240.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_454545_256x240.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_888888_256x240.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_888888_256x240.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_888888_256x240.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_888888_256x240.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_cd0a0a_256x240.png b/airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/images/ui-icons_cd0a0a_256x240.png
rename to airsonic-main/src/main/webapp/style/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/libresonic-main/src/main/webapp/style/smoothness/jquery-ui-1.8.18.custom.css b/airsonic-main/src/main/webapp/style/smoothness/jquery-ui-1.8.18.custom.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/smoothness/jquery-ui-1.8.18.custom.css
rename to airsonic-main/src/main/webapp/style/smoothness/jquery-ui-1.8.18.custom.css
diff --git a/libresonic-main/src/main/webapp/style/sonic.css b/airsonic-main/src/main/webapp/style/sonic.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/sonic.css
rename to airsonic-main/src/main/webapp/style/sonic.css
diff --git a/libresonic-main/src/main/webapp/style/sonic_blue.css b/airsonic-main/src/main/webapp/style/sonic_blue.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/sonic_blue.css
rename to airsonic-main/src/main/webapp/style/sonic_blue.css
diff --git a/libresonic-main/src/main/webapp/style/sonic_white.css b/airsonic-main/src/main/webapp/style/sonic_white.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/sonic_white.css
rename to airsonic-main/src/main/webapp/style/sonic_white.css
diff --git a/libresonic-main/src/main/webapp/style/subStandard.css b/airsonic-main/src/main/webapp/style/subStandard.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/subStandard.css
rename to airsonic-main/src/main/webapp/style/subStandard.css
diff --git a/libresonic-main/src/main/webapp/style/videoPlayer.css b/airsonic-main/src/main/webapp/style/videoPlayer.css
similarity index 100%
rename from libresonic-main/src/main/webapp/style/videoPlayer.css
rename to airsonic-main/src/main/webapp/style/videoPlayer.css
diff --git a/libresonic-main/src/test/java/org/libresonic/player/MissingTranslations.java b/airsonic-main/src/test/java/org/airsonic/player/MissingTranslations.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/MissingTranslations.java
rename to airsonic-main/src/test/java/org/airsonic/player/MissingTranslations.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/TestCaseUtils.java b/airsonic-main/src/test/java/org/airsonic/player/TestCaseUtils.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/TestCaseUtils.java
rename to airsonic-main/src/test/java/org/airsonic/player/TestCaseUtils.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/controller/HLSControllerTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/controller/HLSControllerTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/controller/HLSControllerTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/controller/HLSControllerTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/controller/StreamControllerTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/controller/StreamControllerTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/controller/StreamControllerTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/controller/StreamControllerTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/dao/DaoTestCaseBean2.java b/airsonic-main/src/test/java/org/airsonic/player/dao/DaoTestCaseBean2.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/dao/DaoTestCaseBean2.java
rename to airsonic-main/src/test/java/org/airsonic/player/dao/DaoTestCaseBean2.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/dao/InternetRadioDaoTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/dao/InternetRadioDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/dao/InternetRadioDaoTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/dao/InternetRadioDaoTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/dao/MusicFolderDaoTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/dao/MusicFolderDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/dao/MusicFolderDaoTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/dao/MusicFolderDaoTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/dao/MusicFolderTestData.java b/airsonic-main/src/test/java/org/airsonic/player/dao/MusicFolderTestData.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/dao/MusicFolderTestData.java
rename to airsonic-main/src/test/java/org/airsonic/player/dao/MusicFolderTestData.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/dao/PlayerDaoTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/dao/PlayerDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/dao/PlayerDaoTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/dao/PlayerDaoTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/dao/PodcastDaoTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/dao/PodcastDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/dao/PodcastDaoTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/dao/PodcastDaoTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/dao/TranscodingDaoTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/dao/TranscodingDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/dao/TranscodingDaoTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/dao/TranscodingDaoTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/dao/UserDaoTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/dao/UserDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/dao/UserDaoTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/dao/UserDaoTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/domain/CacheElementTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/domain/CacheElementTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/domain/CacheElementTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/domain/CacheElementTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/domain/MediaFileComparatorTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/domain/MediaFileComparatorTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/domain/MediaFileComparatorTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/domain/MediaFileComparatorTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/domain/PlayQueueTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/domain/PlayQueueTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/domain/PlayQueueTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/domain/PlayQueueTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/domain/SortableArtistTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/domain/SortableArtistTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/domain/SortableArtistTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/domain/SortableArtistTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/domain/TranscodeSchemeTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/domain/TranscodeSchemeTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/domain/TranscodeSchemeTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/domain/TranscodeSchemeTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/domain/VersionTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/domain/VersionTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/domain/VersionTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/domain/VersionTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/io/RangeOutputStreamTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/io/RangeOutputStreamTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/io/RangeOutputStreamTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/io/RangeOutputStreamTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/JWTSecurityServiceTest.java b/airsonic-main/src/test/java/org/airsonic/player/service/JWTSecurityServiceTest.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/JWTSecurityServiceTest.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/JWTSecurityServiceTest.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/LegacyDatabaseStartupTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/service/LegacyDatabaseStartupTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/LegacyDatabaseStartupTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/LegacyDatabaseStartupTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/MediaScannerServiceTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/service/MediaScannerServiceTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/MediaScannerServiceTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/MediaScannerServiceTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/MusicIndexServiceTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/service/MusicIndexServiceTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/MusicIndexServiceTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/MusicIndexServiceTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/PlaylistServiceTestExport.java b/airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestExport.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/PlaylistServiceTestExport.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestExport.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/PlaylistServiceTestImport.java b/airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestImport.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/PlaylistServiceTestImport.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/PlaylistServiceTestImport.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/SecurityServiceTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/service/SecurityServiceTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/SecurityServiceTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/SecurityServiceTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/SettingsServiceTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/service/SettingsServiceTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/SettingsServiceTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/SettingsServiceTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/SonosServiceTest.java b/airsonic-main/src/test/java/org/airsonic/player/service/SonosServiceTest.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/SonosServiceTest.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/SonosServiceTest.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/StatusServiceTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/service/StatusServiceTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/StatusServiceTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/StatusServiceTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/metadata/MediaFileTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/service/metadata/MediaFileTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/metadata/MediaFileTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/metadata/MediaFileTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/service/metadata/MetaDataParserTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/service/metadata/MetaDataParserTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/service/metadata/MetaDataParserTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/service/metadata/MetaDataParserTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/util/FileUtils.java b/airsonic-main/src/test/java/org/airsonic/player/util/FileUtils.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/util/FileUtils.java
rename to airsonic-main/src/test/java/org/airsonic/player/util/FileUtils.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/util/LibresonicHomeRule.java b/airsonic-main/src/test/java/org/airsonic/player/util/HomeRule.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/util/LibresonicHomeRule.java
rename to airsonic-main/src/test/java/org/airsonic/player/util/HomeRule.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/util/HttpRangeTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/util/HttpRangeTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/util/HttpRangeTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/util/HttpRangeTestCase.java
diff --git a/libresonic-main/src/test/java/org/libresonic/player/util/StringUtilTestCase.java b/airsonic-main/src/test/java/org/airsonic/player/util/StringUtilTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/org/libresonic/player/util/StringUtilTestCase.java
rename to airsonic-main/src/test/java/org/airsonic/player/util/StringUtilTestCase.java
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/.ignore/ignorefile.txt b/airsonic-main/src/test/resources/MEDIAS/Music/.ignore/ignorefile.txt
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/.ignore/ignorefile.txt
rename to airsonic-main/src/test/resources/MEDIAS/Music/.ignore/ignorefile.txt
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/01 - Bach- Goldberg Variations, BWV 988 - Aria.flac b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/01 - Bach- Goldberg Variations, BWV 988 - Aria.flac
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/01 - Bach- Goldberg Variations, BWV 988 - Aria.flac
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/01 - Bach- Goldberg Variations, BWV 988 - Aria.flac
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/02 - Bach- Goldberg Variations, BWV 988 - Variatio 1 A 1 Clav..flac b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/02 - Bach- Goldberg Variations, BWV 988 - Variatio 1 A 1 Clav..flac
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/02 - Bach- Goldberg Variations, BWV 988 - Variatio 1 A 1 Clav..flac
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/02 - Bach- Goldberg Variations, BWV 988 - Variatio 1 A 1 Clav..flac
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/Folder.jpg b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/Folder.jpg
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/Folder.jpg
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Céline Frisch- Café Zimmermann - Bach- Goldberg Variations, Canons [Disc 1]/Folder.jpg
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/01 - Sonata Violin & Cello I. Allegro.ogg b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/01 - Sonata Violin & Cello I. Allegro.ogg
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/01 - Sonata Violin & Cello I. Allegro.ogg
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/01 - Sonata Violin & Cello I. Allegro.ogg
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/02 - Sonata Violin & Cello II. Tres Vif.ogg b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/02 - Sonata Violin & Cello II. Tres Vif.ogg
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/02 - Sonata Violin & Cello II. Tres Vif.ogg
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/02 - Sonata Violin & Cello II. Tres Vif.ogg
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/Folder.jpg b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/Folder.jpg
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/Folder.jpg
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Chamber Music With Voice/Folder.jpg
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/01 - Gaspard de la Nuit - i. Ondine.mp3 b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/01 - Gaspard de la Nuit - i. Ondine.mp3
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/01 - Gaspard de la Nuit - i. Ondine.mp3
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/01 - Gaspard de la Nuit - i. Ondine.mp3
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/02 - Gaspard de la Nuit - ii. Le Gibet.mp3 b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/02 - Gaspard de la Nuit - ii. Le Gibet.mp3
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/02 - Gaspard de la Nuit - ii. Le Gibet.mp3
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/02 - Gaspard de la Nuit - ii. Le Gibet.mp3
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/Folder.jpeg b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/Folder.jpeg
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/Folder.jpeg
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Ravel/_DIR_ Ravel - Complete Piano Works/Folder.jpeg
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 01 I Seen What I Saw.mp3 b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 01 I Seen What I Saw.mp3
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 01 I Seen What I Saw.mp3
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 01 I Seen What I Saw.mp3
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 02 Black Soul Choir.mp3 b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 02 Black Soul Choir.mp3
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 02 Black Soul Choir.mp3
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 02 Black Soul Choir.mp3
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 10 Reed Neck Reel.mp3 b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 10 Reed Neck Reel.mp3
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 10 Reed Neck Reel.mp3
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/Sixteen Horsepower - 10 Reed Neck Reel.mp3
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/cover.jpg b/airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/cover.jpg
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/cover.jpg
rename to airsonic-main/src/test/resources/MEDIAS/Music/_DIR_ Sixteen Horsepower/_DIR_ Sackcloth 'n' Ashes/cover.jpg
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/02 eyes like dull hazlenuts.mp3 b/airsonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/02 eyes like dull hazlenuts.mp3
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/02 eyes like dull hazlenuts.mp3
rename to airsonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/02 eyes like dull hazlenuts.mp3
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/10 telegraph hill.mp3 b/airsonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/10 telegraph hill.mp3
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/10 telegraph hill.mp3
rename to airsonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/10 telegraph hill.mp3
diff --git a/libresonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/Folder.jpg b/airsonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/Folder.jpg
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/Folder.jpg
rename to airsonic-main/src/test/resources/MEDIAS/Music2/_DIR_ chrome hoof - 2004/Folder.jpg
diff --git a/libresonic-main/src/test/resources/MEDIAS/piano.mp3 b/airsonic-main/src/test/resources/MEDIAS/piano.mp3
similarity index 100%
rename from libresonic-main/src/test/resources/MEDIAS/piano.mp3
rename to airsonic-main/src/test/resources/MEDIAS/piano.mp3
diff --git a/libresonic-main/src/test/resources/PLAYLISTS/23.m3u b/airsonic-main/src/test/resources/PLAYLISTS/23.m3u
similarity index 100%
rename from libresonic-main/src/test/resources/PLAYLISTS/23.m3u
rename to airsonic-main/src/test/resources/PLAYLISTS/23.m3u
diff --git a/libresonic-main/src/test/resources/PLAYLISTS/23.pls b/airsonic-main/src/test/resources/PLAYLISTS/23.pls
similarity index 100%
rename from libresonic-main/src/test/resources/PLAYLISTS/23.pls
rename to airsonic-main/src/test/resources/PLAYLISTS/23.pls
diff --git a/libresonic-main/src/test/resources/PLAYLISTS/23.xspf b/airsonic-main/src/test/resources/PLAYLISTS/23.xspf
similarity index 100%
rename from libresonic-main/src/test/resources/PLAYLISTS/23.xspf
rename to airsonic-main/src/test/resources/PLAYLISTS/23.xspf
diff --git a/libresonic-main/src/test/resources/libresonic-rest-api-soapui-project.xml b/airsonic-main/src/test/resources/airsonic-rest-api-soapui-project.xml
similarity index 100%
rename from libresonic-main/src/test/resources/libresonic-rest-api-soapui-project.xml
rename to airsonic-main/src/test/resources/airsonic-rest-api-soapui-project.xml
diff --git a/libresonic-main/src/test/resources/applicationContext-mockSonos.xml b/airsonic-main/src/test/resources/applicationContext-mockSonos.xml
similarity index 100%
rename from libresonic-main/src/test/resources/applicationContext-mockSonos.xml
rename to airsonic-main/src/test/resources/applicationContext-mockSonos.xml
diff --git a/libresonic-main/src/test/resources/applicationContext-testdb.xml b/airsonic-main/src/test/resources/applicationContext-testdb.xml
similarity index 100%
rename from libresonic-main/src/test/resources/applicationContext-testdb.xml
rename to airsonic-main/src/test/resources/applicationContext-testdb.xml
diff --git a/libresonic-main/src/test/resources/db/pre-liquibase/db/libresonic.data b/airsonic-main/src/test/resources/db/pre-liquibase/db/libresonic.data
similarity index 100%
rename from libresonic-main/src/test/resources/db/pre-liquibase/db/libresonic.data
rename to airsonic-main/src/test/resources/db/pre-liquibase/db/libresonic.data
diff --git a/libresonic-main/src/test/resources/db/pre-liquibase/db/libresonic.lck b/airsonic-main/src/test/resources/db/pre-liquibase/db/libresonic.lck
similarity index 100%
rename from libresonic-main/src/test/resources/db/pre-liquibase/db/libresonic.lck
rename to airsonic-main/src/test/resources/db/pre-liquibase/db/libresonic.lck
diff --git a/libresonic-main/src/test/resources/db/pre-liquibase/db/libresonic.log b/airsonic-main/src/test/resources/db/pre-liquibase/db/libresonic.log
similarity index 100%
rename from libresonic-main/src/test/resources/db/pre-liquibase/db/libresonic.log
rename to airsonic-main/src/test/resources/db/pre-liquibase/db/libresonic.log
diff --git a/libresonic-main/src/test/resources/db/pre-liquibase/db/libresonic.properties b/airsonic-main/src/test/resources/db/pre-liquibase/db/libresonic.properties
similarity index 100%
rename from libresonic-main/src/test/resources/db/pre-liquibase/db/libresonic.properties
rename to airsonic-main/src/test/resources/db/pre-liquibase/db/libresonic.properties
diff --git a/libresonic-main/src/test/resources/jmeter/libresonicMainTestPlan.jmx b/airsonic-main/src/test/resources/jmeter/airsonicMainTestPlan.jmx
similarity index 100%
rename from libresonic-main/src/test/resources/jmeter/libresonicMainTestPlan.jmx
rename to airsonic-main/src/test/resources/jmeter/airsonicMainTestPlan.jmx
diff --git a/libresonic-main/src/test/resources/logback.xml b/airsonic-main/src/test/resources/logback.xml
similarity index 100%
rename from libresonic-main/src/test/resources/logback.xml
rename to airsonic-main/src/test/resources/logback.xml
diff --git a/libresonic-sonos-api/pom.xml b/airsonic-sonos-api/pom.xml
similarity index 100%
rename from libresonic-sonos-api/pom.xml
rename to airsonic-sonos-api/pom.xml
diff --git a/libresonic-sonos-api/src/main/resources/sonos-1.1.wsdl b/airsonic-sonos-api/src/main/resources/sonos-1.1.wsdl
similarity index 100%
rename from libresonic-sonos-api/src/main/resources/sonos-1.1.wsdl
rename to airsonic-sonos-api/src/main/resources/sonos-1.1.wsdl
diff --git a/contrib/assets/icons/png/flat/libresonic_blue_48x48.png b/contrib/assets/icons/png/flat/airsonic_blue_48x48.png
similarity index 100%
rename from contrib/assets/icons/png/flat/libresonic_blue_48x48.png
rename to contrib/assets/icons/png/flat/airsonic_blue_48x48.png
diff --git a/contrib/assets/icons/png/flat/libresonic_blue_512x512.png b/contrib/assets/icons/png/flat/airsonic_blue_512x512.png
similarity index 100%
rename from contrib/assets/icons/png/flat/libresonic_blue_512x512.png
rename to contrib/assets/icons/png/flat/airsonic_blue_512x512.png
diff --git a/contrib/assets/icons/png/flat/libresonic_dark_512x512.png b/contrib/assets/icons/png/flat/airsonic_dark_512x512.png
similarity index 100%
rename from contrib/assets/icons/png/flat/libresonic_dark_512x512.png
rename to contrib/assets/icons/png/flat/airsonic_dark_512x512.png
diff --git a/contrib/assets/icons/png/flat/libresonic_grey_512x512.png b/contrib/assets/icons/png/flat/airsonic_grey_512x512.png
similarity index 100%
rename from contrib/assets/icons/png/flat/libresonic_grey_512x512.png
rename to contrib/assets/icons/png/flat/airsonic_grey_512x512.png
diff --git a/contrib/assets/icons/png/flat/libresonic_light_512x512.png b/contrib/assets/icons/png/flat/airsonic_light_512x512.png
similarity index 100%
rename from contrib/assets/icons/png/flat/libresonic_light_512x512.png
rename to contrib/assets/icons/png/flat/airsonic_light_512x512.png
diff --git a/contrib/assets/icons/png/shadows/libresonic_blue_shadows_512x512.png b/contrib/assets/icons/png/shadows/airsonic_blue_shadows_512x512.png
similarity index 100%
rename from contrib/assets/icons/png/shadows/libresonic_blue_shadows_512x512.png
rename to contrib/assets/icons/png/shadows/airsonic_blue_shadows_512x512.png
diff --git a/contrib/assets/icons/png/shadows/libresonic_dark_shadows_512x512.png b/contrib/assets/icons/png/shadows/airsonic_dark_shadows_512x512.png
similarity index 100%
rename from contrib/assets/icons/png/shadows/libresonic_dark_shadows_512x512.png
rename to contrib/assets/icons/png/shadows/airsonic_dark_shadows_512x512.png
diff --git a/contrib/assets/icons/png/shadows/libresonic_grey_shadows_512x512.png b/contrib/assets/icons/png/shadows/airsonic_grey_shadows_512x512.png
similarity index 100%
rename from contrib/assets/icons/png/shadows/libresonic_grey_shadows_512x512.png
rename to contrib/assets/icons/png/shadows/airsonic_grey_shadows_512x512.png
diff --git a/contrib/assets/icons/png/shadows/libresonic_light_shadows_512x512.png b/contrib/assets/icons/png/shadows/airsonic_light_shadows_512x512.png
similarity index 100%
rename from contrib/assets/icons/png/shadows/libresonic_light_shadows_512x512.png
rename to contrib/assets/icons/png/shadows/airsonic_light_shadows_512x512.png
diff --git a/contrib/assets/icons/svg/flat/libresonic_blue_512x512.svg b/contrib/assets/icons/svg/flat/airsonic_blue_512x512.svg
similarity index 100%
rename from contrib/assets/icons/svg/flat/libresonic_blue_512x512.svg
rename to contrib/assets/icons/svg/flat/airsonic_blue_512x512.svg
diff --git a/contrib/assets/icons/svg/flat/libresonic_dark_512x512.svg b/contrib/assets/icons/svg/flat/airsonic_dark_512x512.svg
similarity index 100%
rename from contrib/assets/icons/svg/flat/libresonic_dark_512x512.svg
rename to contrib/assets/icons/svg/flat/airsonic_dark_512x512.svg
diff --git a/contrib/assets/icons/svg/flat/libresonic_grey_512x512.svg b/contrib/assets/icons/svg/flat/airsonic_grey_512x512.svg
similarity index 100%
rename from contrib/assets/icons/svg/flat/libresonic_grey_512x512.svg
rename to contrib/assets/icons/svg/flat/airsonic_grey_512x512.svg
diff --git a/contrib/assets/icons/svg/flat/libresonic_light_512x512.svg b/contrib/assets/icons/svg/flat/airsonic_light_512x512.svg
similarity index 100%
rename from contrib/assets/icons/svg/flat/libresonic_light_512x512.svg
rename to contrib/assets/icons/svg/flat/airsonic_light_512x512.svg
diff --git a/contrib/assets/icons/svg/shadows/libresonic_blue_shadows_512x512.svg b/contrib/assets/icons/svg/shadows/airsonic_blue_shadows_512x512.svg
similarity index 100%
rename from contrib/assets/icons/svg/shadows/libresonic_blue_shadows_512x512.svg
rename to contrib/assets/icons/svg/shadows/airsonic_blue_shadows_512x512.svg
diff --git a/contrib/assets/icons/svg/shadows/libresonic_dark_shadows_512x512.svg b/contrib/assets/icons/svg/shadows/airsonic_dark_shadows_512x512.svg
similarity index 100%
rename from contrib/assets/icons/svg/shadows/libresonic_dark_shadows_512x512.svg
rename to contrib/assets/icons/svg/shadows/airsonic_dark_shadows_512x512.svg
diff --git a/contrib/assets/icons/svg/shadows/libresonic_grey_shadows_512x512.svg b/contrib/assets/icons/svg/shadows/airsonic_grey_shadows_512x512.svg
similarity index 100%
rename from contrib/assets/icons/svg/shadows/libresonic_grey_shadows_512x512.svg
rename to contrib/assets/icons/svg/shadows/airsonic_grey_shadows_512x512.svg
diff --git a/contrib/assets/icons/svg/shadows/libresonic_light_shadows_512x512.svg b/contrib/assets/icons/svg/shadows/airsonic_light_shadows_512x512.svg
similarity index 100%
rename from contrib/assets/icons/svg/shadows/libresonic_light_shadows_512x512.svg
rename to contrib/assets/icons/svg/shadows/airsonic_light_shadows_512x512.svg
diff --git a/contrib/assets/logos/png/flat/libresonic_dark_1600x512.png b/contrib/assets/logos/png/flat/airsonic_dark_1600x512.png
similarity index 100%
rename from contrib/assets/logos/png/flat/libresonic_dark_1600x512.png
rename to contrib/assets/logos/png/flat/airsonic_dark_1600x512.png
diff --git a/contrib/assets/logos/png/flat/libresonic_dark_196x63.png b/contrib/assets/logos/png/flat/airsonic_dark_196x63.png
similarity index 100%
rename from contrib/assets/logos/png/flat/libresonic_dark_196x63.png
rename to contrib/assets/logos/png/flat/airsonic_dark_196x63.png
diff --git a/contrib/assets/logos/png/flat/libresonic_grey_1600x512.png b/contrib/assets/logos/png/flat/airsonic_grey_1600x512.png
similarity index 100%
rename from contrib/assets/logos/png/flat/libresonic_grey_1600x512.png
rename to contrib/assets/logos/png/flat/airsonic_grey_1600x512.png
diff --git a/contrib/assets/logos/png/flat/libresonic_greyscale_1600x512.png b/contrib/assets/logos/png/flat/airsonic_greyscale_1600x512.png
similarity index 100%
rename from contrib/assets/logos/png/flat/libresonic_greyscale_1600x512.png
rename to contrib/assets/logos/png/flat/airsonic_greyscale_1600x512.png
diff --git a/contrib/assets/logos/png/flat/libresonic_light_1600x512.png b/contrib/assets/logos/png/flat/airsonic_light_1600x512.png
similarity index 100%
rename from contrib/assets/logos/png/flat/libresonic_light_1600x512.png
rename to contrib/assets/logos/png/flat/airsonic_light_1600x512.png
diff --git a/contrib/assets/logos/png/flat/libresonic_light_196x63.png b/contrib/assets/logos/png/flat/airsonic_light_196x63.png
similarity index 100%
rename from contrib/assets/logos/png/flat/libresonic_light_196x63.png
rename to contrib/assets/logos/png/flat/airsonic_light_196x63.png
diff --git a/contrib/assets/logos/png/shadows/libresonic_dark_shadows_1600x512.png b/contrib/assets/logos/png/shadows/airsonic_dark_shadows_1600x512.png
similarity index 100%
rename from contrib/assets/logos/png/shadows/libresonic_dark_shadows_1600x512.png
rename to contrib/assets/logos/png/shadows/airsonic_dark_shadows_1600x512.png
diff --git a/contrib/assets/logos/png/shadows/libresonic_grey_shadows_1600x512.png b/contrib/assets/logos/png/shadows/airsonic_grey_shadows_1600x512.png
similarity index 100%
rename from contrib/assets/logos/png/shadows/libresonic_grey_shadows_1600x512.png
rename to contrib/assets/logos/png/shadows/airsonic_grey_shadows_1600x512.png
diff --git a/contrib/assets/logos/png/shadows/libresonic_greyscale_shadows_1600x512.png b/contrib/assets/logos/png/shadows/airsonic_greyscale_shadows_1600x512.png
similarity index 100%
rename from contrib/assets/logos/png/shadows/libresonic_greyscale_shadows_1600x512.png
rename to contrib/assets/logos/png/shadows/airsonic_greyscale_shadows_1600x512.png
diff --git a/contrib/assets/logos/png/shadows/libresonic_light_shadows_1600x512.png b/contrib/assets/logos/png/shadows/airsonic_light_shadows_1600x512.png
similarity index 100%
rename from contrib/assets/logos/png/shadows/libresonic_light_shadows_1600x512.png
rename to contrib/assets/logos/png/shadows/airsonic_light_shadows_1600x512.png
diff --git a/contrib/assets/logos/svg/flat/libresonic_dark_1600x512.svg b/contrib/assets/logos/svg/flat/airsonic_dark_1600x512.svg
similarity index 100%
rename from contrib/assets/logos/svg/flat/libresonic_dark_1600x512.svg
rename to contrib/assets/logos/svg/flat/airsonic_dark_1600x512.svg
diff --git a/contrib/assets/logos/svg/flat/libresonic_grey_1600x512.svg b/contrib/assets/logos/svg/flat/airsonic_grey_1600x512.svg
similarity index 100%
rename from contrib/assets/logos/svg/flat/libresonic_grey_1600x512.svg
rename to contrib/assets/logos/svg/flat/airsonic_grey_1600x512.svg
diff --git a/contrib/assets/logos/svg/flat/libresonic_greyscale_1600x512.svg b/contrib/assets/logos/svg/flat/airsonic_greyscale_1600x512.svg
similarity index 100%
rename from contrib/assets/logos/svg/flat/libresonic_greyscale_1600x512.svg
rename to contrib/assets/logos/svg/flat/airsonic_greyscale_1600x512.svg
diff --git a/contrib/assets/logos/svg/flat/libresonic_light_1600x512.svg b/contrib/assets/logos/svg/flat/airsonic_light_1600x512.svg
similarity index 100%
rename from contrib/assets/logos/svg/flat/libresonic_light_1600x512.svg
rename to contrib/assets/logos/svg/flat/airsonic_light_1600x512.svg
diff --git a/contrib/assets/logos/svg/shadows/libresonic_dark_shadows_1600x512.svg b/contrib/assets/logos/svg/shadows/airsonic_dark_shadows_1600x512.svg
similarity index 100%
rename from contrib/assets/logos/svg/shadows/libresonic_dark_shadows_1600x512.svg
rename to contrib/assets/logos/svg/shadows/airsonic_dark_shadows_1600x512.svg
diff --git a/contrib/assets/logos/svg/shadows/libresonic_grey_shadows_1600x512.svg b/contrib/assets/logos/svg/shadows/airsonic_grey_shadows_1600x512.svg
similarity index 100%
rename from contrib/assets/logos/svg/shadows/libresonic_grey_shadows_1600x512.svg
rename to contrib/assets/logos/svg/shadows/airsonic_grey_shadows_1600x512.svg
diff --git a/contrib/assets/logos/svg/shadows/libresonic_greyscale_shadows_1600x512.svg b/contrib/assets/logos/svg/shadows/airsonic_greyscale_shadows_1600x512.svg
similarity index 100%
rename from contrib/assets/logos/svg/shadows/libresonic_greyscale_shadows_1600x512.svg
rename to contrib/assets/logos/svg/shadows/airsonic_greyscale_shadows_1600x512.svg
diff --git a/contrib/assets/logos/svg/shadows/libresonic_light_shadows_1600x512.svg b/contrib/assets/logos/svg/shadows/airsonic_light_shadows_1600x512.svg
similarity index 100%
rename from contrib/assets/logos/svg/shadows/libresonic_light_shadows_1600x512.svg
rename to contrib/assets/logos/svg/shadows/airsonic_light_shadows_1600x512.svg