diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/MissingTranslations.java b/libresonic-main/src/test/java/org/libresonic/player/MissingTranslations.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/MissingTranslations.java
rename to libresonic-main/src/test/java/org/libresonic/player/MissingTranslations.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/HLSControllerTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/controller/HLSControllerTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/controller/HLSControllerTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/controller/HLSControllerTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/controller/StreamControllerTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/controller/StreamControllerTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/controller/StreamControllerTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/controller/StreamControllerTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/DaoTestCaseBase.java b/libresonic-main/src/test/java/org/libresonic/player/dao/DaoTestCaseBase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/dao/DaoTestCaseBase.java
rename to libresonic-main/src/test/java/org/libresonic/player/dao/DaoTestCaseBase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/InternetRadioDaoTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/dao/InternetRadioDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/dao/InternetRadioDaoTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/dao/InternetRadioDaoTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/MusicFolderDaoTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/dao/MusicFolderDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/dao/MusicFolderDaoTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/dao/MusicFolderDaoTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/PlayerDaoTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/dao/PlayerDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/dao/PlayerDaoTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/dao/PlayerDaoTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/PodcastDaoTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/dao/PodcastDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/dao/PodcastDaoTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/dao/PodcastDaoTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/TranscodingDaoTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/dao/TranscodingDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/dao/TranscodingDaoTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/dao/TranscodingDaoTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/dao/UserDaoTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/dao/UserDaoTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/dao/UserDaoTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/dao/UserDaoTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/CacheElementTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/domain/CacheElementTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/domain/CacheElementTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/domain/CacheElementTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/MediaFileComparatorTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/domain/MediaFileComparatorTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/domain/MediaFileComparatorTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/domain/MediaFileComparatorTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/PlayQueueTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/domain/PlayQueueTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/domain/PlayQueueTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/domain/PlayQueueTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/SortableArtistTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/domain/SortableArtistTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/domain/SortableArtistTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/domain/SortableArtistTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/TranscodeSchemeTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/domain/TranscodeSchemeTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/domain/TranscodeSchemeTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/domain/TranscodeSchemeTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/domain/VersionTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/domain/VersionTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/domain/VersionTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/domain/VersionTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/io/RangeOutputStreamTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/io/RangeOutputStreamTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/io/RangeOutputStreamTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/io/RangeOutputStreamTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/MusicIndexServiceTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/service/MusicIndexServiceTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/service/MusicIndexServiceTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/service/MusicIndexServiceTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SecurityServiceTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/service/SecurityServiceTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/service/SecurityServiceTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/service/SecurityServiceTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SettingsServiceTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/service/SettingsServiceTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/service/SettingsServiceTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/service/SettingsServiceTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/SonosServiceTest.java b/libresonic-main/src/test/java/org/libresonic/player/service/SonosServiceTest.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/service/SonosServiceTest.java
rename to libresonic-main/src/test/java/org/libresonic/player/service/SonosServiceTest.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/StatusServiceTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/service/StatusServiceTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/service/StatusServiceTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/service/StatusServiceTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MediaFileTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/service/metadata/MediaFileTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MediaFileTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/service/metadata/MediaFileTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MetaDataParserTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/service/metadata/MetaDataParserTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/service/metadata/MetaDataParserTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/service/metadata/MetaDataParserTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/util/HttpRangeTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/util/HttpRangeTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/util/HttpRangeTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/util/HttpRangeTestCase.java
diff --git a/libresonic-main/src/test/java/net/sourceforge/libresonic/util/StringUtilTestCase.java b/libresonic-main/src/test/java/org/libresonic/player/util/StringUtilTestCase.java
similarity index 100%
rename from libresonic-main/src/test/java/net/sourceforge/libresonic/util/StringUtilTestCase.java
rename to libresonic-main/src/test/java/org/libresonic/player/util/StringUtilTestCase.java