diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 334e5e23f..69cf49e0a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -165,49 +165,49 @@ set(SOURCES
   globalsearch/suggestionwidget.cpp
   globalsearch/urlsearchprovider.cpp
 
-  internet/cloudfilesearchprovider.cpp
-  internet/cloudfileservice.cpp
-  internet/digitallyimportedclient.cpp
-  internet/digitallyimportedservicebase.cpp
-  internet/digitallyimportedsettingspage.cpp
-  internet/digitallyimportedurlhandler.cpp
-  internet/geolocator.cpp
-  internet/groovesharkradio.cpp
-  internet/groovesharkservice.cpp
-  internet/groovesharksettingspage.cpp
-  internet/groovesharkurlhandler.cpp
-  internet/icecastbackend.cpp
-  internet/icecastfilterwidget.cpp
-  internet/icecastmodel.cpp
-  internet/icecastservice.cpp
-  internet/internetmodel.cpp
-  internet/internetplaylistitem.cpp
-  internet/internetservice.cpp
-  internet/internetshowsettingspage.cpp
-  internet/internetview.cpp
-  internet/internetviewcontainer.cpp
-  internet/jamendodynamicplaylist.cpp
-  internet/jamendoplaylistitem.cpp
-  internet/jamendoservice.cpp
-  internet/localredirectserver.cpp
-  internet/magnatunedownloaddialog.cpp
-  internet/magnatuneplaylistitem.cpp
-  internet/magnatuneservice.cpp
-  internet/magnatunesettingspage.cpp
-  internet/magnatuneurlhandler.cpp
-  internet/oauthenticator.cpp
-  internet/savedradio.cpp
-  internet/searchboxwidget.cpp
-  internet/somafmservice.cpp
-  internet/somafmurlhandler.cpp
-  internet/soundcloudservice.cpp
-  internet/soundcloudsettingspage.cpp
-  internet/spotifyserver.cpp
-  internet/spotifyservice.cpp
-  internet/spotifysettingspage.cpp
-  internet/subsonicservice.cpp
-  internet/subsonicsettingspage.cpp
-  internet/subsonicurlhandler.cpp
+  internet/core/cloudfilesearchprovider.cpp
+  internet/core/cloudfileservice.cpp
+  internet/digitally/digitallyimportedclient.cpp
+  internet/digitally/digitallyimportedservicebase.cpp
+  internet/digitally/digitallyimportedsettingspage.cpp
+  internet/digitally/digitallyimportedurlhandler.cpp
+  internet/core/geolocator.cpp
+  internet/grooveshark/groovesharkradio.cpp
+  internet/grooveshark/groovesharkservice.cpp
+  internet/grooveshark/groovesharksettingspage.cpp
+  internet/grooveshark/groovesharkurlhandler.cpp
+  internet/icecast/icecastbackend.cpp
+  internet/icecast/icecastfilterwidget.cpp
+  internet/icecast/icecastmodel.cpp
+  internet/icecast/icecastservice.cpp
+  internet/core/internetmodel.cpp
+  internet/core/internetplaylistitem.cpp
+  internet/core/internetservice.cpp
+  internet/core/internetshowsettingspage.cpp
+  internet/core/internetview.cpp
+  internet/core/internetviewcontainer.cpp
+  internet/jamendo/jamendodynamicplaylist.cpp
+  internet/jamendo/jamendoplaylistitem.cpp
+  internet/jamendo/jamendoservice.cpp
+  internet/core/localredirectserver.cpp
+  internet/magnatune/magnatunedownloaddialog.cpp
+  internet/magnatune/magnatuneplaylistitem.cpp
+  internet/magnatune/magnatuneservice.cpp
+  internet/magnatune/magnatunesettingspage.cpp
+  internet/magnatune/magnatuneurlhandler.cpp
+  internet/core/oauthenticator.cpp
+  internet/internetradio/savedradio.cpp
+  internet/core/searchboxwidget.cpp
+  internet/somafm/somafmservice.cpp
+  internet/somafm/somafmurlhandler.cpp
+  internet/soundcloud/soundcloudservice.cpp
+  internet/soundcloud/soundcloudsettingspage.cpp
+  internet/spotify/spotifyserver.cpp
+  internet/spotify/spotifyservice.cpp
+  internet/spotify/spotifysettingspage.cpp
+  internet/subsonic/subsonicservice.cpp
+  internet/subsonic/subsonicsettingspage.cpp
+  internet/subsonic/subsonicurlhandler.cpp
 
   library/groupbydialog.cpp
   library/library.cpp
@@ -270,28 +270,28 @@ set(SOURCES
   playlistparsers/xmlparser.cpp
   playlistparsers/xspfparser.cpp
 
-  podcasts/addpodcastbyurl.cpp
-  podcasts/addpodcastdialog.cpp
-  podcasts/addpodcastpage.cpp
-  podcasts/fixedopmlpage.cpp
-  podcasts/gpoddersearchpage.cpp
-  podcasts/gpoddersync.cpp
-  podcasts/gpoddertoptagsmodel.cpp
-  podcasts/gpoddertoptagspage.cpp
-  podcasts/itunessearchpage.cpp
-  podcasts/podcast.cpp
-  podcasts/podcastbackend.cpp
-  podcasts/podcastdiscoverymodel.cpp
-  podcasts/podcastdeleter.cpp
-  podcasts/podcastdownloader.cpp
-  podcasts/podcastepisode.cpp
-  podcasts/podcastinfowidget.cpp
-  podcasts/podcastservice.cpp
-  podcasts/podcastservicemodel.cpp
-  podcasts/podcastsettingspage.cpp
-  podcasts/podcastparser.cpp
-  podcasts/podcastupdater.cpp
-  podcasts/podcasturlloader.cpp
+  internet/podcasts/addpodcastbyurl.cpp
+  internet/podcasts/addpodcastdialog.cpp
+  internet/podcasts/addpodcastpage.cpp
+  internet/podcasts/fixedopmlpage.cpp
+  internet/podcasts/gpoddersearchpage.cpp
+  internet/podcasts/gpoddersync.cpp
+  internet/podcasts/gpoddertoptagsmodel.cpp
+  internet/podcasts/gpoddertoptagspage.cpp
+  internet/podcasts/itunessearchpage.cpp
+  internet/podcasts/podcast.cpp
+  internet/podcasts/podcastbackend.cpp
+  internet/podcasts/podcastdiscoverymodel.cpp
+  internet/podcasts/podcastdeleter.cpp
+  internet/podcasts/podcastdownloader.cpp
+  internet/podcasts/podcastepisode.cpp
+  internet/podcasts/podcastinfowidget.cpp
+  internet/podcasts/podcastservice.cpp
+  internet/podcasts/podcastservicemodel.cpp
+  internet/podcasts/podcastsettingspage.cpp
+  internet/podcasts/podcastparser.cpp
+  internet/podcasts/podcastupdater.cpp
+  internet/podcasts/podcasturlloader.cpp
 
   smartplaylists/generator.cpp
   smartplaylists/generatorinserter.cpp
@@ -476,45 +476,45 @@ set(HEADERS
   globalsearch/spotifysearchprovider.h
   globalsearch/suggestionwidget.h
 
-  internet/cloudfileservice.h
-  internet/digitallyimportedclient.h
-  internet/digitallyimportedservicebase.h
-  internet/digitallyimportedsettingspage.h
-  internet/geolocator.h
-  internet/groovesharkservice.h
-  internet/groovesharksettingspage.h
-  internet/groovesharkurlhandler.h
-  internet/icecastbackend.h
-  internet/icecastfilterwidget.h
-  internet/icecastmodel.h
-  internet/icecastservice.h
-  internet/internetmimedata.h
-  internet/internetmodel.h
-  internet/internetservice.h
-  internet/internetshowsettingspage.h
-  internet/internetsongmimedata.h
-  internet/internetview.h
-  internet/internetviewcontainer.h
-  internet/jamendodynamicplaylist.h
-  internet/jamendoservice.h
-  internet/localredirectserver.h
-  internet/magnatunedownloaddialog.h
-  internet/magnatuneservice.h
-  internet/magnatunesettingspage.h
-  internet/oauthenticator.h
-  internet/savedradio.h
-  internet/scrobbler.h
-  internet/searchboxwidget.h
-  internet/somafmservice.h
-  internet/somafmurlhandler.h
-  internet/soundcloudservice.h
-  internet/soundcloudsettingspage.h
-  internet/spotifyserver.h
-  internet/spotifyservice.h
-  internet/spotifysettingspage.h
-  internet/subsonicservice.h
-  internet/subsonicsettingspage.h
-  internet/subsonicurlhandler.h
+  internet/core/cloudfileservice.h
+  internet/digitally/digitallyimportedclient.h
+  internet/digitally/digitallyimportedservicebase.h
+  internet/digitally/digitallyimportedsettingspage.h
+  internet/core/geolocator.h
+  internet/grooveshark/groovesharkservice.h
+  internet/grooveshark/groovesharksettingspage.h
+  internet/grooveshark/groovesharkurlhandler.h
+  internet/icecast/icecastbackend.h
+  internet/icecast/icecastfilterwidget.h
+  internet/icecast/icecastmodel.h
+  internet/icecast/icecastservice.h
+  internet/core/internetmimedata.h
+  internet/core/internetmodel.h
+  internet/core/internetservice.h
+  internet/core/internetshowsettingspage.h
+  internet/core/internetsongmimedata.h
+  internet/core/internetview.h
+  internet/core/internetviewcontainer.h
+  internet/jamendo/jamendodynamicplaylist.h
+  internet/jamendo/jamendoservice.h
+  internet/core/localredirectserver.h
+  internet/magnatune/magnatunedownloaddialog.h
+  internet/magnatune/magnatuneservice.h
+  internet/magnatune/magnatunesettingspage.h
+  internet/core/oauthenticator.h
+  internet/internetradio/savedradio.h
+  internet/core/scrobbler.h
+  internet/core/searchboxwidget.h
+  internet/somafm/somafmservice.h
+  internet/somafm/somafmurlhandler.h
+  internet/soundcloud/soundcloudservice.h
+  internet/soundcloud/soundcloudsettingspage.h
+  internet/spotify/spotifyserver.h
+  internet/spotify/spotifyservice.h
+  internet/spotify/spotifysettingspage.h
+  internet/subsonic/subsonicservice.h
+  internet/subsonic/subsonicsettingspage.h
+  internet/subsonic/subsonicurlhandler.h
 
   library/groupbydialog.h
   library/library.h
@@ -568,25 +568,25 @@ set(HEADERS
   playlistparsers/plsparser.h
   playlistparsers/xspfparser.h
 
-  podcasts/addpodcastbyurl.h
-  podcasts/addpodcastdialog.h
-  podcasts/addpodcastpage.h
-  podcasts/fixedopmlpage.h
-  podcasts/gpoddersearchpage.h
-  podcasts/gpoddersync.h
-  podcasts/gpoddertoptagsmodel.h
-  podcasts/gpoddertoptagspage.h
-  podcasts/itunessearchpage.h
-  podcasts/podcastbackend.h
-  podcasts/podcastdiscoverymodel.h
-  podcasts/podcastdeleter.h
-  podcasts/podcastdownloader.h
-  podcasts/podcastinfowidget.h
-  podcasts/podcastservice.h
-  podcasts/podcastservicemodel.h
-  podcasts/podcastsettingspage.h
-  podcasts/podcastupdater.h
-  podcasts/podcasturlloader.h
+  internet/podcasts/addpodcastbyurl.h
+  internet/podcasts/addpodcastdialog.h
+  internet/podcasts/addpodcastpage.h
+  internet/podcasts/fixedopmlpage.h
+  internet/podcasts/gpoddersearchpage.h
+  internet/podcasts/gpoddersync.h
+  internet/podcasts/gpoddertoptagsmodel.h
+  internet/podcasts/gpoddertoptagspage.h
+  internet/podcasts/itunessearchpage.h
+  internet/podcasts/podcastbackend.h
+  internet/podcasts/podcastdiscoverymodel.h
+  internet/podcasts/podcastdeleter.h
+  internet/podcasts/podcastdownloader.h
+  internet/podcasts/podcastinfowidget.h
+  internet/podcasts/podcastservice.h
+  internet/podcasts/podcastservicemodel.h
+  internet/podcasts/podcastsettingspage.h
+  internet/podcasts/podcastupdater.h
+  internet/podcasts/podcasturlloader.h
 
   smartplaylists/generator.h
   smartplaylists/generatorinserter.h
@@ -697,17 +697,17 @@ set(UI
   globalsearch/searchproviderstatuswidget.ui
   globalsearch/suggestionwidget.ui
 
-  internet/digitallyimportedsettingspage.ui
-  internet/groovesharksettingspage.ui
-  internet/icecastfilterwidget.ui
-  internet/internetshowsettingspage.ui
-  internet/internetviewcontainer.ui
-  internet/magnatunedownloaddialog.ui
-  internet/magnatunesettingspage.ui
-  internet/searchboxwidget.ui
-  internet/soundcloudsettingspage.ui
-  internet/spotifysettingspage.ui
-  internet/subsonicsettingspage.ui
+  internet/digitally/digitallyimportedsettingspage.ui
+  internet/grooveshark/groovesharksettingspage.ui
+  internet/icecast/icecastfilterwidget.ui
+  internet/core/internetshowsettingspage.ui
+  internet/core/internetviewcontainer.ui
+  internet/magnatune/magnatunedownloaddialog.ui
+  internet/magnatune/magnatunesettingspage.ui
+  internet/core/searchboxwidget.ui
+  internet/soundcloud/soundcloudsettingspage.ui
+  internet/spotify/spotifysettingspage.ui
+  internet/subsonic/subsonicsettingspage.ui
 
   library/groupbydialog.ui
   library/libraryfilterwidget.ui
@@ -721,12 +721,12 @@ set(UI
   playlist/playlistsequence.ui
   playlist/queuemanager.ui
 
-  podcasts/addpodcastbyurl.ui
-  podcasts/addpodcastdialog.ui
-  podcasts/gpoddersearchpage.ui
-  podcasts/itunessearchpage.ui
-  podcasts/podcastinfowidget.ui
-  podcasts/podcastsettingspage.ui
+  internet/podcasts/addpodcastbyurl.ui
+  internet/podcasts/addpodcastdialog.ui
+  internet/podcasts/gpoddersearchpage.ui
+  internet/podcasts/itunessearchpage.ui
+  internet/podcasts/podcastinfowidget.ui
+  internet/podcasts/podcastsettingspage.ui
 
   smartplaylists/querysearchpage.ui
   smartplaylists/querysortpage.ui
@@ -832,32 +832,32 @@ optional_source(ENABLE_VISUALISATIONS
 optional_source(HAVE_LIBLASTFM
   SOURCES
     covers/lastfmcoverprovider.cpp
-    internet/fixlastfm.cpp
-    internet/lastfmcompat.cpp
-    internet/lastfmservice.cpp
-    internet/lastfmsettingspage.cpp
+    internet/lastfm/fixlastfm.cpp
+    internet/lastfm/lastfmcompat.cpp
+    internet/lastfm/lastfmservice.cpp
+    internet/lastfm/lastfmsettingspage.cpp
     songinfo/echonestsimilarartists.cpp
     songinfo/echonesttags.cpp
     songinfo/lastfmtrackinfoprovider.cpp
     songinfo/tagwidget.cpp
   HEADERS
     covers/lastfmcoverprovider.h
-    internet/lastfmservice.h
-    internet/lastfmsettingspage.h
+    internet/lastfm/lastfmservice.h
+    internet/lastfm/lastfmsettingspage.h
     songinfo/echonestsimilarartists.h
     songinfo/echonesttags.h
     songinfo/lastfmtrackinfoprovider.h
     songinfo/tagwidget.h
   UI
-    internet/lastfmsettingspage.ui
+    internet/lastfm/lastfmsettingspage.ui
 )
 
 
 optional_source(HAVE_SPOTIFY_DOWNLOADER
   SOURCES
-    internet/spotifyblobdownloader.cpp
+    internet/spotify/spotifyblobdownloader.cpp
   HEADERS
-    internet/spotifyblobdownloader.h
+    internet/spotify/spotifyblobdownloader.h
   INCLUDE_DIRECTORIES
     ${QCA_INCLUDE_DIRS}
 )
@@ -1085,47 +1085,47 @@ optional_source(HAVE_MOODBAR
 # Google Drive support
 optional_source(HAVE_GOOGLE_DRIVE
   SOURCES
-    internet/googledriveclient.cpp
-    internet/googledriveservice.cpp
-    internet/googledrivesettingspage.cpp
-    internet/googledriveurlhandler.cpp
+    internet/googledrive/googledriveclient.cpp
+    internet/googledrive/googledriveservice.cpp
+    internet/googledrive/googledrivesettingspage.cpp
+    internet/googledrive/googledriveurlhandler.cpp
   HEADERS
-    internet/googledriveclient.h
-    internet/googledriveservice.h
-    internet/googledrivesettingspage.h
-    internet/googledriveurlhandler.h
+    internet/googledrive/googledriveclient.h
+    internet/googledrive/googledriveservice.h
+    internet/googledrive/googledrivesettingspage.h
+    internet/googledrive/googledriveurlhandler.h
   UI
-    internet/googledrivesettingspage.ui
+    internet/googledrive/googledrivesettingspage.ui
 )
 
 # Dropbox support
 optional_source(HAVE_DROPBOX
   SOURCES
-    internet/dropboxauthenticator.cpp
-    internet/dropboxservice.cpp
-    internet/dropboxsettingspage.cpp
-    internet/dropboxurlhandler.cpp
+    internet/dropbox/dropboxauthenticator.cpp
+    internet/dropbox/dropboxservice.cpp
+    internet/dropbox/dropboxsettingspage.cpp
+    internet/dropbox/dropboxurlhandler.cpp
   HEADERS
-    internet/dropboxauthenticator.h
-    internet/dropboxservice.h
-    internet/dropboxsettingspage.h
-    internet/dropboxurlhandler.h
+    internet/dropbox/dropboxauthenticator.h
+    internet/dropbox/dropboxservice.h
+    internet/dropbox/dropboxsettingspage.h
+    internet/dropbox/dropboxurlhandler.h
   UI
-    internet/dropboxsettingspage.ui
+    internet/dropbox/dropboxsettingspage.ui
 )
 
 # Skydrive support
 optional_source(HAVE_SKYDRIVE
   SOURCES
-    internet/skydriveservice.cpp
-    internet/skydrivesettingspage.cpp
-    internet/skydriveurlhandler.cpp
+    internet/skydrive/skydriveservice.cpp
+    internet/skydrive/skydrivesettingspage.cpp
+    internet/skydrive/skydriveurlhandler.cpp
   HEADERS
-    internet/skydriveservice.h
-    internet/skydrivesettingspage.h
-    internet/skydriveurlhandler.h
+    internet/skydrive/skydriveservice.h
+    internet/skydrive/skydrivesettingspage.h
+    internet/skydrive/skydriveurlhandler.h
   UI
-    internet/skydrivesettingspage.ui
+    internet/skydrive/skydrivesettingspage.ui
 )
 
 # Box support
@@ -1148,39 +1148,39 @@ optional_source(HAVE_VK
     ${VREEN_INCLUDE_DIRS}
   SOURCES
     globalsearch/vksearchprovider.cpp
-    internet/vkconnection.cpp
-    internet/vkmusiccache.cpp
-    internet/vksearchdialog.cpp
-    internet/vkservice.cpp
-    internet/vksettingspage.cpp
-    internet/vkurlhandler.cpp
+    internet/vk/vkconnection.cpp
+    internet/vk/vkmusiccache.cpp
+    internet/vk/vksearchdialog.cpp
+    internet/vk/vkservice.cpp
+    internet/vk/vksettingspage.cpp
+    internet/vk/vkurlhandler.cpp
   HEADERS
     globalsearch/vksearchprovider.h
-    internet/vkconnection.h
-    internet/vkmusiccache.h
-    internet/vksearchdialog.h
-    internet/vkservice.h
-    internet/vksettingspage.h
-    internet/vkurlhandler.h
+    internet/vk/vkconnection.h
+    internet/vk/vkmusiccache.h
+    internet/vk/vksearchdialog.h
+    internet/vk/vkservice.h
+    internet/vk/vksettingspage.h
+    internet/vk/vkurlhandler.h
   UI
-    internet/vksearchdialog.ui
-    internet/vksettingspage.ui
+    internet/vk/vksearchdialog.ui
+    internet/vk/vksettingspage.ui
 )
 
 # Seafile support
 optional_source(HAVE_SEAFILE
   SOURCES
-    internet/seafileservice.cpp
-    internet/seafilesettingspage.cpp
-    internet/seafileurlhandler.cpp
-    internet/seafiletree.cpp
+    internet/seafile/seafileservice.cpp
+    internet/seafile/seafilesettingspage.cpp
+    internet/seafile/seafileurlhandler.cpp
+    internet/seafile/seafiletree.cpp
   HEADERS
-    internet/seafileservice.h
-    internet/seafilesettingspage.h
-    internet/seafileurlhandler.h
-    internet/seafiletree.h
+    internet/seafile/seafileservice.h
+    internet/seafile/seafilesettingspage.h
+    internet/seafile/seafileurlhandler.h
+    internet/seafile/seafiletree.h
   UI
-    internet/seafilesettingspage.ui
+    internet/seafile/seafilesettingspage.ui
 )
 
 
diff --git a/src/core/application.cpp b/src/core/application.cpp
index 6f39b866e..1e902a3d4 100644
--- a/src/core/application.cpp
+++ b/src/core/application.cpp
@@ -31,7 +31,7 @@
 #include "covers/coverproviders.h"
 #include "covers/currentartloader.h"
 #include "devices/devicemanager.h"
-#include "internet/internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "globalsearch/globalsearch.h"
 #include "library/library.h"
 #include "library/librarybackend.h"
@@ -39,14 +39,14 @@
 #include "networkremote/networkremotehelper.h"
 #include "playlist/playlistbackend.h"
 #include "playlist/playlistmanager.h"
-#include "podcasts/gpoddersync.h"
-#include "podcasts/podcastbackend.h"
-#include "podcasts/podcastdeleter.h"
-#include "podcasts/podcastdownloader.h"
-#include "podcasts/podcastupdater.h"
+#include "internet/podcasts/gpoddersync.h"
+#include "internet/podcasts/podcastbackend.h"
+#include "internet/podcasts/podcastdeleter.h"
+#include "internet/podcasts/podcastdownloader.h"
+#include "internet/podcasts/podcastupdater.h"
 
 #ifdef HAVE_LIBLASTFM
-#include "internet/lastfmservice.h"
+#include "internet/lastfm/lastfmservice.h"
 #endif  // HAVE_LIBLASTFM
 
 #ifdef HAVE_MOODBAR
diff --git a/src/core/metatypes.cpp b/src/core/metatypes.cpp
index 22ac238f2..daf5b71f7 100644
--- a/src/core/metatypes.cpp
+++ b/src/core/metatypes.cpp
@@ -30,17 +30,17 @@
 #include "engines/enginebase.h"
 #include "engines/gstengine.h"
 #include "globalsearch/searchprovider.h"
-#include "internet/digitallyimportedclient.h"
-#include "internet/geolocator.h"
-#include "internet/somafmservice.h"
+#include "internet/digitally/digitallyimportedclient.h"
+#include "internet/core/geolocator.h"
+#include "internet/somafm/somafmservice.h"
 #include "library/directory.h"
 #include "playlist/playlist.h"
-#include "podcasts/podcastepisode.h"
-#include "podcasts/podcast.h"
+#include "internet/podcasts/podcastepisode.h"
+#include "internet/podcasts/podcast.h"
 #include "ui/equalizer.h"
 
 #ifdef HAVE_VK
-#include "internet/vkservice.h"
+#include "internet/vk/vkservice.h"
 #endif
 
 #ifdef HAVE_DBUS
diff --git a/src/core/player.cpp b/src/core/player.cpp
index b2c6af130..80e01cd9a 100644
--- a/src/core/player.cpp
+++ b/src/core/player.cpp
@@ -45,7 +45,7 @@
 #include "playlist/playlistmanager.h"
 
 #ifdef HAVE_LIBLASTFM
-#include "internet/lastfmservice.h"
+#include "internet/lastfm/lastfmservice.h"
 #endif
 
 using std::shared_ptr;
diff --git a/src/core/song.cpp b/src/core/song.cpp
index 9ecc895e6..0034d6b16 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -43,7 +43,7 @@
 #include <QtConcurrentRun>
 
 #ifdef HAVE_LIBLASTFM
-#include "internet/fixlastfm.h"
+#include "internet/lastfm/fixlastfm.h"
 #ifdef HAVE_LIBLASTFM1
 #include <lastfm/Track.h>
 #else
diff --git a/src/core/songloader.cpp b/src/core/songloader.cpp
index 03d761be2..d2c13f6c0 100644
--- a/src/core/songloader.cpp
+++ b/src/core/songloader.cpp
@@ -38,16 +38,16 @@
 #include "core/song.h"
 #include "core/tagreaderclient.h"
 #include "core/timeconstants.h"
-#include "internet/fixlastfm.h"
-#include "internet/internetmodel.h"
+#include "internet/lastfm/fixlastfm.h"
+#include "internet/core/internetmodel.h"
 #include "library/librarybackend.h"
 #include "library/sqlrow.h"
 #include "playlistparsers/cueparser.h"
 #include "playlistparsers/parserbase.h"
 #include "playlistparsers/playlistparser.h"
-#include "podcasts/podcastparser.h"
-#include "podcasts/podcastservice.h"
-#include "podcasts/podcasturlloader.h"
+#include "internet/podcasts/podcastparser.h"
+#include "internet/podcasts/podcastservice.h"
+#include "internet/podcasts/podcasturlloader.h"
 
 #ifdef HAVE_AUDIOCD
 #include <gst/audio/gstaudiocdsrc.h>
diff --git a/src/covers/albumcoverloader.cpp b/src/covers/albumcoverloader.cpp
index 03c3f5491..6b3d35b9c 100644
--- a/src/covers/albumcoverloader.cpp
+++ b/src/covers/albumcoverloader.cpp
@@ -29,8 +29,8 @@
 #include "core/network.h"
 #include "core/tagreaderclient.h"
 #include "core/utilities.h"
-#include "internet/internetmodel.h"
-#include "internet/spotifyservice.h"
+#include "internet/core/internetmodel.h"
+#include "internet/spotify/spotifyservice.h"
 
 AlbumCoverLoader::AlbumCoverLoader(QObject* parent)
     : QObject(parent),
diff --git a/src/covers/lastfmcoverprovider.cpp b/src/covers/lastfmcoverprovider.cpp
index 1eef40ad9..a6ffd8396 100644
--- a/src/covers/lastfmcoverprovider.cpp
+++ b/src/covers/lastfmcoverprovider.cpp
@@ -22,7 +22,7 @@
 #include "albumcoverfetcher.h"
 #include "coverprovider.h"
 #include "core/closure.h"
-#include "internet/lastfmcompat.h"
+#include "internet/lastfm/lastfmcompat.h"
 
 LastFmCoverProvider::LastFmCoverProvider(QObject* parent)
     : CoverProvider("last.fm", parent) {}
diff --git a/src/engines/gstenginepipeline.cpp b/src/engines/gstenginepipeline.cpp
index a713efd92..7f48f1fb2 100644
--- a/src/engines/gstenginepipeline.cpp
+++ b/src/engines/gstenginepipeline.cpp
@@ -31,9 +31,9 @@
 #include "core/mac_startup.h"
 #include "core/signalchecker.h"
 #include "core/utilities.h"
-#include "internet/internetmodel.h"
-#include "internet/spotifyserver.h"
-#include "internet/spotifyservice.h"
+#include "internet/core/internetmodel.h"
+#include "internet/spotify/spotifyserver.h"
+#include "internet/spotify/spotifyservice.h"
 
 const int GstEnginePipeline::kGstStateTimeoutNanosecs = 10000000;
 const int GstEnginePipeline::kFaderFudgeMsec = 2000;
diff --git a/src/globalsearch/digitallyimportedsearchprovider.h b/src/globalsearch/digitallyimportedsearchprovider.h
index f3346a0cb..092c344ba 100644
--- a/src/globalsearch/digitallyimportedsearchprovider.h
+++ b/src/globalsearch/digitallyimportedsearchprovider.h
@@ -19,7 +19,7 @@
 #define DIGITALLYIMPORTEDSEARCHPROVIDER_H
 
 #include "simplesearchprovider.h"
-#include "internet/digitallyimportedservicebase.h"
+#include "internet/digitally/digitallyimportedservicebase.h"
 
 class DigitallyImportedSearchProvider : public SimpleSearchProvider {
  public:
diff --git a/src/globalsearch/groovesharksearchprovider.cpp b/src/globalsearch/groovesharksearchprovider.cpp
index 522e7db33..aa96a1c7b 100644
--- a/src/globalsearch/groovesharksearchprovider.cpp
+++ b/src/globalsearch/groovesharksearchprovider.cpp
@@ -22,7 +22,7 @@
 #include "core/application.h"
 #include "core/logging.h"
 #include "covers/albumcoverloader.h"
-#include "internet/groovesharkservice.h"
+#include "internet/grooveshark/groovesharkservice.h"
 
 GroovesharkSearchProvider::GroovesharkSearchProvider(Application* app,
                                                      QObject* parent)
diff --git a/src/globalsearch/groovesharksearchprovider.h b/src/globalsearch/groovesharksearchprovider.h
index 4627e902b..c4aedd119 100644
--- a/src/globalsearch/groovesharksearchprovider.h
+++ b/src/globalsearch/groovesharksearchprovider.h
@@ -20,7 +20,7 @@
 
 #include "searchprovider.h"
 #include "covers/albumcoverloaderoptions.h"
-#include "internet/groovesharkservice.h"
+#include "internet/grooveshark/groovesharkservice.h"
 
 class AlbumCoverLoader;
 
diff --git a/src/globalsearch/icecastsearchprovider.cpp b/src/globalsearch/icecastsearchprovider.cpp
index ab78db194..763533f3b 100644
--- a/src/globalsearch/icecastsearchprovider.cpp
+++ b/src/globalsearch/icecastsearchprovider.cpp
@@ -16,7 +16,7 @@
 */
 
 #include "icecastsearchprovider.h"
-#include "internet/icecastbackend.h"
+#include "internet/icecast/icecastbackend.h"
 
 IcecastSearchProvider::IcecastSearchProvider(IcecastBackend* backend,
                                              Application* app, QObject* parent)
diff --git a/src/globalsearch/savedradiosearchprovider.h b/src/globalsearch/savedradiosearchprovider.h
index 9d5ce2498..0623eedee 100644
--- a/src/globalsearch/savedradiosearchprovider.h
+++ b/src/globalsearch/savedradiosearchprovider.h
@@ -19,7 +19,7 @@
 #define SAVEDRADIOSEARCHPROVIDER_H
 
 #include "simplesearchprovider.h"
-#include "internet/savedradio.h"
+#include "internet/internetradio/savedradio.h"
 
 class SavedRadioSearchProvider : public SimpleSearchProvider {
  public:
diff --git a/src/globalsearch/searchprovider.cpp b/src/globalsearch/searchprovider.cpp
index fe67c552d..da6acb51e 100644
--- a/src/globalsearch/searchprovider.cpp
+++ b/src/globalsearch/searchprovider.cpp
@@ -17,7 +17,7 @@
 
 #include "searchprovider.h"
 #include "core/boundfuturewatcher.h"
-#include "internet/internetsongmimedata.h"
+#include "internet/core/internetsongmimedata.h"
 #include "playlist/songmimedata.h"
 
 #include <QPainter>
diff --git a/src/globalsearch/somafmsearchprovider.h b/src/globalsearch/somafmsearchprovider.h
index d5b06c9f2..0e231abbf 100644
--- a/src/globalsearch/somafmsearchprovider.h
+++ b/src/globalsearch/somafmsearchprovider.h
@@ -19,7 +19,7 @@
 #define SOMAFMSEARCHPROVIDER_H
 
 #include "simplesearchprovider.h"
-#include "internet/somafmservice.h"
+#include "internet/somafm/somafmservice.h"
 
 class SomaFMSearchProvider : public SimpleSearchProvider {
  public:
diff --git a/src/globalsearch/soundcloudsearchprovider.cpp b/src/globalsearch/soundcloudsearchprovider.cpp
index 296c0c4d3..4284f4ef6 100644
--- a/src/globalsearch/soundcloudsearchprovider.cpp
+++ b/src/globalsearch/soundcloudsearchprovider.cpp
@@ -22,7 +22,7 @@
 #include "core/application.h"
 #include "core/logging.h"
 #include "covers/albumcoverloader.h"
-#include "internet/soundcloudservice.h"
+#include "internet/soundcloud/soundcloudservice.h"
 
 SoundCloudSearchProvider::SoundCloudSearchProvider(Application* app,
                                                    QObject* parent)
diff --git a/src/globalsearch/soundcloudsearchprovider.h b/src/globalsearch/soundcloudsearchprovider.h
index 062b69c55..9942aff27 100644
--- a/src/globalsearch/soundcloudsearchprovider.h
+++ b/src/globalsearch/soundcloudsearchprovider.h
@@ -20,7 +20,7 @@
 
 #include "searchprovider.h"
 #include "covers/albumcoverloaderoptions.h"
-#include "internet/soundcloudservice.h"
+#include "internet/soundcloud/soundcloudservice.h"
 
 class AlbumCoverLoader;
 
diff --git a/src/globalsearch/spotifysearchprovider.cpp b/src/globalsearch/spotifysearchprovider.cpp
index 20e6d963e..7622b4d71 100644
--- a/src/globalsearch/spotifysearchprovider.cpp
+++ b/src/globalsearch/spotifysearchprovider.cpp
@@ -21,8 +21,8 @@
 #include <random>
 
 #include "core/logging.h"
-#include "internet/internetmodel.h"
-#include "internet/spotifyserver.h"
+#include "internet/core/internetmodel.h"
+#include "internet/spotify/spotifyserver.h"
 #include "playlist/songmimedata.h"
 
 namespace {
diff --git a/src/globalsearch/spotifysearchprovider.h b/src/globalsearch/spotifysearchprovider.h
index 99cc392fb..f5c32e263 100644
--- a/src/globalsearch/spotifysearchprovider.h
+++ b/src/globalsearch/spotifysearchprovider.h
@@ -20,7 +20,7 @@
 
 #include "searchprovider.h"
 #include "spotifymessages.pb.h"
-#include "internet/spotifyservice.h"
+#include "internet/spotify/spotifyservice.h"
 
 class SpotifyServer;
 
diff --git a/src/globalsearch/vksearchprovider.h b/src/globalsearch/vksearchprovider.h
index 4a4e91067..38b3aa5d9 100644
--- a/src/globalsearch/vksearchprovider.h
+++ b/src/globalsearch/vksearchprovider.h
@@ -19,7 +19,7 @@
 #ifndef VKSEARCHPROVIDER_H
 #define VKSEARCHPROVIDER_H
 
-#include "internet/vkservice.h"
+#include "internet/vk/vkservice.h"
 
 #include "searchprovider.h"
 
diff --git a/src/internet/box/boxservice.cpp b/src/internet/box/boxservice.cpp
index 86c4ea68d..3a39caaad 100644
--- a/src/internet/box/boxservice.cpp
+++ b/src/internet/box/boxservice.cpp
@@ -23,8 +23,8 @@
 #include "core/application.h"
 #include "core/player.h"
 #include "core/waitforsignal.h"
-#include "internet/boxurlhandler.h"
-#include "internet/oauthenticator.h"
+#include "internet/box/boxurlhandler.h"
+#include "internet/core/oauthenticator.h"
 #include "library/librarybackend.h"
 
 const char* BoxService::kServiceName = "Box";
diff --git a/src/internet/box/boxservice.h b/src/internet/box/boxservice.h
index a0cd5cdda..d7c54d8f2 100644
--- a/src/internet/box/boxservice.h
+++ b/src/internet/box/boxservice.h
@@ -19,7 +19,7 @@
 #ifndef INTERNET_BOXSERVICE_H_
 #define INTERNET_BOXSERVICE_H_
 
-#include "cloudfileservice.h"
+#include "internet/core/cloudfileservice.h"
 
 #include <QDateTime>
 
diff --git a/src/internet/box/boxsettingspage.cpp b/src/internet/box/boxsettingspage.cpp
index fb46c1c56..c1c860bea 100644
--- a/src/internet/box/boxsettingspage.cpp
+++ b/src/internet/box/boxsettingspage.cpp
@@ -23,7 +23,7 @@
 #include "ui_boxsettingspage.h"
 #include "core/application.h"
 #include "internet/box/boxservice.h"
-#include "internet/internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "ui/settingsdialog.h"
 
 BoxSettingsPage::BoxSettingsPage(SettingsDialog* parent)
diff --git a/src/internet/cloudfile/cloudfilesearchprovider.cpp b/src/internet/core/cloudfilesearchprovider.cpp
similarity index 91%
rename from src/internet/cloudfile/cloudfilesearchprovider.cpp
rename to src/internet/core/cloudfilesearchprovider.cpp
index e07c76f75..d1950afdd 100644
--- a/src/internet/cloudfile/cloudfilesearchprovider.cpp
+++ b/src/internet/core/cloudfilesearchprovider.cpp
@@ -16,9 +16,9 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "internet/cloudfilesearchprovider.h"
-#include "internet/cloudfileservice.h"
-#include "internet/internetmodel.h"
+#include "internet/core/cloudfilesearchprovider.h"
+#include "internet/core/cloudfileservice.h"
+#include "internet/core/internetmodel.h"
 
 CloudFileSearchProvider::CloudFileSearchProvider(
     LibraryBackendInterface* backend, const QString& id, const QIcon& icon,
diff --git a/src/internet/cloudfile/cloudfilesearchprovider.h b/src/internet/core/cloudfilesearchprovider.h
similarity index 100%
rename from src/internet/cloudfile/cloudfilesearchprovider.h
rename to src/internet/core/cloudfilesearchprovider.h
diff --git a/src/internet/cloudfile/cloudfileservice.cpp b/src/internet/core/cloudfileservice.cpp
similarity index 98%
rename from src/internet/cloudfile/cloudfileservice.cpp
rename to src/internet/core/cloudfileservice.cpp
index f46c62559..08e4de771 100644
--- a/src/internet/cloudfile/cloudfileservice.cpp
+++ b/src/internet/core/cloudfileservice.cpp
@@ -18,7 +18,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "cloudfileservice.h"
+#include "internet/core/cloudfileservice.h"
 
 #include <QMenu>
 #include <QSortFilterProxyModel>
@@ -30,8 +30,8 @@
 #include "core/player.h"
 #include "core/taskmanager.h"
 #include "globalsearch/globalsearch.h"
-#include "internet/cloudfilesearchprovider.h"
-#include "internet/internetmodel.h"
+#include "internet/core/cloudfilesearchprovider.h"
+#include "internet/core/internetmodel.h"
 #include "library/librarybackend.h"
 #include "library/librarymodel.h"
 #include "playlist/playlist.h"
diff --git a/src/internet/cloudfile/cloudfileservice.h b/src/internet/core/cloudfileservice.h
similarity index 98%
rename from src/internet/cloudfile/cloudfileservice.h
rename to src/internet/core/cloudfileservice.h
index 6d78e484c..d6fce75fb 100644
--- a/src/internet/cloudfile/cloudfileservice.h
+++ b/src/internet/core/cloudfileservice.h
@@ -20,7 +20,7 @@
 #ifndef INTERNET_CLOUDFILESERVICE_H_
 #define INTERNET_CLOUDFILESERVICE_H_
 
-#include "internetservice.h"
+#include "internet/core/internetservice.h"
 
 #include <memory>
 
diff --git a/src/internet/core/internetmodel.cpp b/src/internet/core/internetmodel.cpp
index 2bf5f606e..32e0a58a7 100644
--- a/src/internet/core/internetmodel.cpp
+++ b/src/internet/core/internetmodel.cpp
@@ -23,46 +23,46 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 
 #include <QMimeData>
 #include <QtDebug>
 
-#include "digitallyimportedservicebase.h"
-#include "groovesharkservice.h"
-#include "icecastservice.h"
-#include "internetmimedata.h"
-#include "internetservice.h"
-#include "jamendoservice.h"
-#include "magnatuneservice.h"
-#include "savedradio.h"
-#include "somafmservice.h"
-#include "soundcloudservice.h"
-#include "spotifyservice.h"
-#include "subsonicservice.h"
+#include "internet/digitally/digitallyimportedservicebase.h"
+#include "internet/grooveshark/groovesharkservice.h"
+#include "internet/icecast/icecastservice.h"
+#include "internet/core/internetmimedata.h"
+#include "internet/core/internetservice.h"
+#include "internet/jamendo/jamendoservice.h"
+#include "internet/magnatune/magnatuneservice.h"
+#include "internet/internetradio/savedradio.h"
+#include "internet/somafm/somafmservice.h"
+#include "internet/soundcloud/soundcloudservice.h"
+#include "internet/spotify/spotifyservice.h"
+#include "internet/subsonic/subsonicservice.h"
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/mergedproxymodel.h"
-#include "podcasts/podcastservice.h"
+#include "internet/podcasts/podcastservice.h"
 #include "smartplaylists/generatormimedata.h"
 
 #ifdef HAVE_GOOGLE_DRIVE
-#include "googledriveservice.h"
+#include "internet/googledrive/googledriveservice.h"
 #endif
 #ifdef HAVE_DROPBOX
-#include "dropboxservice.h"
+#include "internet/dropbox/dropboxservice.h"
 #endif
 #ifdef HAVE_SKYDRIVE
-#include "skydriveservice.h"
+#include "internet/skydrive/skydriveservice.h"
 #endif
 #ifdef HAVE_BOX
 #include "internet/box/boxservice.h"
 #endif
 #ifdef HAVE_VK
-#include "vkservice.h"
+#include "internet/vk/vkservice.h"
 #endif
 #ifdef HAVE_SEAFILE
-#include "seafileservice.h"
+#include "internet/seafile/seafileservice.h"
 #endif
 
 using smart_playlists::Generator;
diff --git a/src/internet/core/internetplaylistitem.cpp b/src/internet/core/internetplaylistitem.cpp
index 6781ffa6b..d1430dca1 100644
--- a/src/internet/core/internetplaylistitem.cpp
+++ b/src/internet/core/internetplaylistitem.cpp
@@ -19,9 +19,9 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "internetplaylistitem.h"
-#include "internetservice.h"
-#include "internetmodel.h"
+#include "internet/core/internetplaylistitem.h"
+#include "internet/core/internetservice.h"
+#include "internet/core/internetmodel.h"
 #include "core/settingsprovider.h"
 #include "library/sqlrow.h"
 #include "playlist/playlistbackend.h"
diff --git a/src/internet/core/internetservice.cpp b/src/internet/core/internetservice.cpp
index d15642b81..18b3e967e 100644
--- a/src/internet/core/internetservice.cpp
+++ b/src/internet/core/internetservice.cpp
@@ -20,8 +20,8 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "internetservice.h"
-#include "internetmodel.h"
+#include "internet/core/internetservice.h"
+#include "internet/core/internetmodel.h"
 #include "core/logging.h"
 #include "core/mergedproxymodel.h"
 #include "core/mimedata.h"
diff --git a/src/internet/core/internetshowsettingspage.cpp b/src/internet/core/internetshowsettingspage.cpp
index 59d4b17f2..6df377921 100644
--- a/src/internet/core/internetshowsettingspage.cpp
+++ b/src/internet/core/internetshowsettingspage.cpp
@@ -20,8 +20,8 @@
 
 #include "core/application.h"
 #include "ui/settingsdialog.h"
-#include "internetservice.h"
-#include "internetmodel.h"
+#include "internet/core/internetservice.h"
+#include "internet/core/internetmodel.h"
 
 #include <QSettings>
 
diff --git a/src/internet/core/internetview.cpp b/src/internet/core/internetview.cpp
index a3343b5a2..353eff276 100644
--- a/src/internet/core/internetview.cpp
+++ b/src/internet/core/internetview.cpp
@@ -20,7 +20,7 @@
 */
 
 #include "internetview.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/mergedproxymodel.h"
 #include "library/libraryview.h"
 
diff --git a/src/internet/core/internetviewcontainer.cpp b/src/internet/core/internetviewcontainer.cpp
index 38284db2f..2b7634074 100644
--- a/src/internet/core/internetviewcontainer.cpp
+++ b/src/internet/core/internetviewcontainer.cpp
@@ -19,8 +19,8 @@
 */
 
 #include "internetviewcontainer.h"
-#include "internetmodel.h"
-#include "internetservice.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetservice.h"
 #include "ui_internetviewcontainer.h"
 #include "core/application.h"
 #include "core/mergedproxymodel.h"
diff --git a/src/internet/core/internetviewcontainer.ui b/src/internet/core/internetviewcontainer.ui
index 27c9d4c63..23b5cd24e 100644
--- a/src/internet/core/internetviewcontainer.ui
+++ b/src/internet/core/internetviewcontainer.ui
@@ -69,7 +69,7 @@
   <customwidget>
    <class>InternetView</class>
    <extends>QTreeView</extends>
-   <header>internet/internetview.h</header>
+   <header>internet/core/internetview.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/internet/core/oauthenticator.cpp b/src/internet/core/oauthenticator.cpp
index ba8dc9144..8996da5f4 100644
--- a/src/internet/core/oauthenticator.cpp
+++ b/src/internet/core/oauthenticator.cpp
@@ -18,7 +18,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "oauthenticator.h"
+#include "internet/core/oauthenticator.h"
 
 #include <QDesktopServices>
 #include <QStringList>
@@ -28,7 +28,7 @@
 
 #include "core/closure.h"
 #include "core/logging.h"
-#include "internet/localredirectserver.h"
+#include "internet/core/localredirectserver.h"
 
 const char* OAuthenticator::kRemoteURL =
     "https://clementine-data.appspot.com/skydrive";
diff --git a/src/internet/core/searchboxwidget.cpp b/src/internet/core/searchboxwidget.cpp
index 6d0207df0..6c80e2db8 100644
--- a/src/internet/core/searchboxwidget.cpp
+++ b/src/internet/core/searchboxwidget.cpp
@@ -18,8 +18,8 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "internetservice.h"
-#include "searchboxwidget.h"
+#include "internet/core/internetservice.h"
+#include "internet/core/searchboxwidget.h"
 #include "ui_searchboxwidget.h"
 #include "ui/iconloader.h"
 #include "widgets/didyoumean.h"
diff --git a/src/internet/digitally/digitallyimportedservicebase.cpp b/src/internet/digitally/digitallyimportedservicebase.cpp
index a9266d4ee..0fafa8eec 100644
--- a/src/internet/digitally/digitallyimportedservicebase.cpp
+++ b/src/internet/digitally/digitallyimportedservicebase.cpp
@@ -27,7 +27,7 @@
 
 #include "digitallyimportedclient.h"
 #include "digitallyimportedurlhandler.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/logging.h"
diff --git a/src/internet/digitally/digitallyimportedservicebase.h b/src/internet/digitally/digitallyimportedservicebase.h
index 6cb91a4fb..fca9176b9 100644
--- a/src/internet/digitally/digitallyimportedservicebase.h
+++ b/src/internet/digitally/digitallyimportedservicebase.h
@@ -1,3 +1,4 @@
+
 /* This file is part of Clementine.
    Copyright 2011-2012, David Sansome <me@davidsansome.com>
    Copyright 2012, 2014, John Maguire <john.maguire@gmail.com>
@@ -23,7 +24,7 @@
 #include <memory>
 
 #include "digitallyimportedclient.h"
-#include "internetservice.h"
+#include "internet/core/internetservice.h"
 #include "core/cachedlist.h"
 
 class DigitallyImportedClient;
diff --git a/src/internet/digitally/digitallyimportedurlhandler.cpp b/src/internet/digitally/digitallyimportedurlhandler.cpp
index 457c53b54..d52a94a9c 100644
--- a/src/internet/digitally/digitallyimportedurlhandler.cpp
+++ b/src/internet/digitally/digitallyimportedurlhandler.cpp
@@ -20,7 +20,7 @@
 
 #include "digitallyimportedservicebase.h"
 #include "digitallyimportedurlhandler.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/application.h"
 #include "core/logging.h"
 #include "core/taskmanager.h"
diff --git a/src/internet/dropbox/dropboxauthenticator.cpp b/src/internet/dropbox/dropboxauthenticator.cpp
index c69a702d7..22284ff32 100644
--- a/src/internet/dropbox/dropboxauthenticator.cpp
+++ b/src/internet/dropbox/dropboxauthenticator.cpp
@@ -29,7 +29,7 @@
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/network.h"
-#include "internet/localredirectserver.h"
+#include "internet/core/localredirectserver.h"
 
 namespace {
 static const char* kAppKey = "qh6ca27eclt9p2k";
diff --git a/src/internet/dropbox/dropboxservice.cpp b/src/internet/dropbox/dropboxservice.cpp
index dcff95c9f..666dbc6e7 100644
--- a/src/internet/dropbox/dropboxservice.cpp
+++ b/src/internet/dropbox/dropboxservice.cpp
@@ -30,8 +30,8 @@
 #include "core/player.h"
 #include "core/utilities.h"
 #include "core/waitforsignal.h"
-#include "internet/dropboxauthenticator.h"
-#include "internet/dropboxurlhandler.h"
+#include "internet/dropbox/dropboxauthenticator.h"
+#include "internet/dropbox/dropboxurlhandler.h"
 #include "library/librarybackend.h"
 
 using Utilities::ParseRFC822DateTime;
diff --git a/src/internet/dropbox/dropboxservice.h b/src/internet/dropbox/dropboxservice.h
index 6df5caf74..aa4720c97 100644
--- a/src/internet/dropbox/dropboxservice.h
+++ b/src/internet/dropbox/dropboxservice.h
@@ -19,7 +19,7 @@
 #ifndef INTERNET_DROPBOXSERVICE_H_
 #define INTERNET_DROPBOXSERVICE_H_
 
-#include "internet/cloudfileservice.h"
+#include "internet/core/cloudfileservice.h"
 
 #include "core/tagreaderclient.h"
 
diff --git a/src/internet/dropbox/dropboxsettingspage.cpp b/src/internet/dropbox/dropboxsettingspage.cpp
index 340b4d1f1..bddd0debf 100644
--- a/src/internet/dropbox/dropboxsettingspage.cpp
+++ b/src/internet/dropbox/dropboxsettingspage.cpp
@@ -20,9 +20,9 @@
 #include "ui_dropboxsettingspage.h"
 
 #include "core/application.h"
-#include "internet/dropboxauthenticator.h"
-#include "internet/dropboxservice.h"
-#include "internet/internetmodel.h"
+#include "internet/dropbox/dropboxauthenticator.h"
+#include "internet/dropbox/dropboxservice.h"
+#include "internet/core/internetmodel.h"
 #include "ui/settingsdialog.h"
 
 DropboxSettingsPage::DropboxSettingsPage(SettingsDialog* parent)
diff --git a/src/internet/dropbox/dropboxurlhandler.cpp b/src/internet/dropbox/dropboxurlhandler.cpp
index dd5b8e568..a7239089c 100644
--- a/src/internet/dropbox/dropboxurlhandler.cpp
+++ b/src/internet/dropbox/dropboxurlhandler.cpp
@@ -18,7 +18,7 @@
 
 #include "dropboxurlhandler.h"
 
-#include "internet/dropboxservice.h"
+#include "internet/dropbox/dropboxservice.h"
 
 DropboxUrlHandler::DropboxUrlHandler(DropboxService* service, QObject* parent)
     : UrlHandler(parent), service_(service) {}
diff --git a/src/internet/googledrive/googledriveclient.cpp b/src/internet/googledrive/googledriveclient.cpp
index 7684264e6..e93cae44f 100644
--- a/src/internet/googledrive/googledriveclient.cpp
+++ b/src/internet/googledrive/googledriveclient.cpp
@@ -21,7 +21,7 @@
 
 #include <qjson/parser.h>
 
-#include "oauthenticator.h"
+#include "internet/core/oauthenticator.h"
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/network.h"
diff --git a/src/internet/googledrive/googledriveservice.cpp b/src/internet/googledrive/googledriveservice.cpp
index 0704fb299..d7b106677 100644
--- a/src/internet/googledrive/googledriveservice.cpp
+++ b/src/internet/googledrive/googledriveservice.cpp
@@ -42,7 +42,7 @@
 #include "ui/iconloader.h"
 #include "googledriveclient.h"
 #include "googledriveurlhandler.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 
 const char* GoogleDriveService::kServiceName = "Google Drive";
 const char* GoogleDriveService::kSettingsGroup = "GoogleDrive";
diff --git a/src/internet/googledrive/googledriveservice.h b/src/internet/googledrive/googledriveservice.h
index b204aa0c1..6d08a5061 100644
--- a/src/internet/googledrive/googledriveservice.h
+++ b/src/internet/googledrive/googledriveservice.h
@@ -20,7 +20,7 @@
 #ifndef INTERNET_GOOGLEDRIVESERVICE_H_
 #define INTERNET_GOOGLEDRIVESERVICE_H_
 
-#include "cloudfileservice.h"
+#include "internet/core/cloudfileservice.h"
 
 namespace google_drive {
 class Client;
diff --git a/src/internet/googledrive/googledrivesettingspage.cpp b/src/internet/googledrive/googledrivesettingspage.cpp
index 3c0bb5d5f..ca05cc52f 100644
--- a/src/internet/googledrive/googledrivesettingspage.cpp
+++ b/src/internet/googledrive/googledrivesettingspage.cpp
@@ -22,7 +22,7 @@
 #include "googledrivesettingspage.h"
 #include "ui_googledrivesettingspage.h"
 #include "core/application.h"
-#include "internet/internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "ui/settingsdialog.h"
 
 #include <QSortFilterProxyModel>
diff --git a/src/internet/grooveshark/groovesharkradio.cpp b/src/internet/grooveshark/groovesharkradio.cpp
index 2ea49712c..df5326421 100644
--- a/src/internet/grooveshark/groovesharkradio.cpp
+++ b/src/internet/grooveshark/groovesharkradio.cpp
@@ -21,7 +21,7 @@
 
 #include "groovesharkservice.h"
 #include "core/logging.h"
-#include "internet/internetplaylistitem.h"
+#include "internet/core/internetplaylistitem.h"
 
 GroovesharkRadio::GroovesharkRadio(GroovesharkService* service)
     : service_(service), tag_id_(0), use_tag_(false), first_time_(true) {}
diff --git a/src/internet/grooveshark/groovesharkservice.cpp b/src/internet/grooveshark/groovesharkservice.cpp
index 6388d8a7a..0a819c7b4 100644
--- a/src/internet/grooveshark/groovesharkservice.cpp
+++ b/src/internet/grooveshark/groovesharkservice.cpp
@@ -41,10 +41,10 @@
 
 #include "qtiocompressor.h"
 
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "groovesharkradio.h"
 #include "groovesharkurlhandler.h"
-#include "searchboxwidget.h"
+#include "internet/core/searchboxwidget.h"
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/internet/grooveshark/groovesharkservice.h b/src/internet/grooveshark/groovesharkservice.h
index 59b715b4f..335fd2e15 100644
--- a/src/internet/grooveshark/groovesharkservice.h
+++ b/src/internet/grooveshark/groovesharkservice.h
@@ -21,8 +21,8 @@
 #ifndef INTERNET_GROOVESHARKSERVICE_H_
 #define INTERNET_GROOVESHARKSERVICE_H_
 
-#include "internetmodel.h"
-#include "internetservice.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetservice.h"
 
 #include <QSslError>
 
diff --git a/src/internet/grooveshark/groovesharksettingspage.cpp b/src/internet/grooveshark/groovesharksettingspage.cpp
index 9daf50df6..ed68fb69b 100644
--- a/src/internet/grooveshark/groovesharksettingspage.cpp
+++ b/src/internet/grooveshark/groovesharksettingspage.cpp
@@ -20,7 +20,7 @@
 
 #include "groovesharkservice.h"
 #include "groovesharksettingspage.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/logging.h"
 #include "core/network.h"
 #include "ui_groovesharksettingspage.h"
diff --git a/src/internet/icecast/icecastservice.cpp b/src/internet/icecast/icecastservice.cpp
index 55b38273c..c246f8b34 100644
--- a/src/internet/icecast/icecastservice.cpp
+++ b/src/internet/icecast/icecastservice.cpp
@@ -34,7 +34,7 @@
 #include "icecastbackend.h"
 #include "icecastfilterwidget.h"
 #include "icecastmodel.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/database.h"
diff --git a/src/internet/icecast/icecastservice.h b/src/internet/icecast/icecastservice.h
index ab5eaa766..94e241f13 100644
--- a/src/internet/icecast/icecastservice.h
+++ b/src/internet/icecast/icecastservice.h
@@ -21,7 +21,7 @@
 #ifndef INTERNET_ICECASTSERVICE_H_
 #define INTERNET_ICECASTSERVICE_H_
 
-#include "internetservice.h"
+#include "internet/core/internetservice.h"
 
 #include <QXmlStreamReader>
 
diff --git a/src/internet/internetradio/savedradio.cpp b/src/internet/internetradio/savedradio.cpp
index dd4d78959..53c86abe4 100644
--- a/src/internet/internetradio/savedradio.cpp
+++ b/src/internet/internetradio/savedradio.cpp
@@ -20,7 +20,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "savedradio.h"
 #include "core/application.h"
 #include "core/mimedata.h"
diff --git a/src/internet/internetradio/savedradio.h b/src/internet/internetradio/savedradio.h
index 762d09a5c..5743b0d05 100644
--- a/src/internet/internetradio/savedradio.h
+++ b/src/internet/internetradio/savedradio.h
@@ -23,7 +23,7 @@
 
 #include <memory>
 
-#include "internetservice.h"
+#include "internet/core/internetservice.h"
 
 class QMenu;
 
diff --git a/src/internet/jamendo/jamendoservice.cpp b/src/internet/jamendo/jamendoservice.cpp
index 63c1b5469..0cc2f280f 100644
--- a/src/internet/jamendo/jamendoservice.cpp
+++ b/src/internet/jamendo/jamendoservice.cpp
@@ -25,7 +25,7 @@
 
 #include "jamendodynamicplaylist.h"
 #include "jamendoplaylistitem.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/application.h"
 #include "core/database.h"
 #include "core/logging.h"
diff --git a/src/internet/jamendo/jamendoservice.h b/src/internet/jamendo/jamendoservice.h
index e5a19ed84..3dfa1a93b 100644
--- a/src/internet/jamendo/jamendoservice.h
+++ b/src/internet/jamendo/jamendoservice.h
@@ -22,7 +22,7 @@
 #ifndef INTERNET_JAMENDOSERVICE_H_
 #define INTERNET_JAMENDOSERVICE_H_
 
-#include "internetservice.h"
+#include "internet/core/internetservice.h"
 
 #include <QXmlStreamReader>
 
diff --git a/src/internet/lastfm/lastfmservice.cpp b/src/internet/lastfm/lastfmservice.cpp
index fc286f627..8ddb1de59 100644
--- a/src/internet/lastfm/lastfmservice.cpp
+++ b/src/internet/lastfm/lastfmservice.cpp
@@ -50,8 +50,8 @@
 #endif
 
 #include "lastfmcompat.h"
-#include "internetmodel.h"
-#include "internetplaylistitem.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetplaylistitem.h"
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/logging.h"
diff --git a/src/internet/lastfm/lastfmservice.h b/src/internet/lastfm/lastfmservice.h
index a5a3fa396..62a6c6b1a 100644
--- a/src/internet/lastfm/lastfmservice.h
+++ b/src/internet/lastfm/lastfmservice.h
@@ -34,7 +34,7 @@ uint qHash(const lastfm::Track& track);
 
 #include "lastfmcompat.h"
 
-#include "internet/scrobbler.h"
+#include "internet/core/scrobbler.h"
 
 class Application;
 class LastFMUrlHandler;
diff --git a/src/internet/lastfm/lastfmsettingspage.cpp b/src/internet/lastfm/lastfmsettingspage.cpp
index 8c915676a..22313aece 100644
--- a/src/internet/lastfm/lastfmsettingspage.cpp
+++ b/src/internet/lastfm/lastfmsettingspage.cpp
@@ -28,7 +28,7 @@
 #include <QSettings>
 
 #include "lastfmservice.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/application.h"
 #include "ui/iconloader.h"
 
diff --git a/src/internet/magnatune/magnatunedownloaddialog.cpp b/src/internet/magnatune/magnatunedownloaddialog.cpp
index 8e7ab4478..c502a0682 100644
--- a/src/internet/magnatune/magnatunedownloaddialog.cpp
+++ b/src/internet/magnatune/magnatunedownloaddialog.cpp
@@ -33,7 +33,7 @@
 #include <QXmlStreamReader>
 
 #include "magnatuneservice.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "ui_magnatunedownloaddialog.h"
 #include "core/logging.h"
 #include "core/network.h"
diff --git a/src/internet/magnatune/magnatuneplaylistitem.cpp b/src/internet/magnatune/magnatuneplaylistitem.cpp
index b60027509..3442ca020 100644
--- a/src/internet/magnatune/magnatuneplaylistitem.cpp
+++ b/src/internet/magnatune/magnatuneplaylistitem.cpp
@@ -19,7 +19,7 @@
 */
 
 #include "magnatuneplaylistitem.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 
 MagnatunePlaylistItem::MagnatunePlaylistItem(const QString& type)
     : LibraryPlaylistItem(type) {}
diff --git a/src/internet/magnatune/magnatuneservice.cpp b/src/internet/magnatune/magnatuneservice.cpp
index 25af13da8..9e3058dce 100644
--- a/src/internet/magnatune/magnatuneservice.cpp
+++ b/src/internet/magnatune/magnatuneservice.cpp
@@ -25,7 +25,7 @@
 #include "magnatuneplaylistitem.h"
 #include "magnatuneservice.h"
 #include "magnatuneurlhandler.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/application.h"
 #include "core/database.h"
 #include "core/logging.h"
diff --git a/src/internet/magnatune/magnatuneservice.h b/src/internet/magnatune/magnatuneservice.h
index 32f9a2789..9367cf554 100644
--- a/src/internet/magnatune/magnatuneservice.h
+++ b/src/internet/magnatune/magnatuneservice.h
@@ -22,7 +22,7 @@
 
 #include <QXmlStreamReader>
 
-#include "internetservice.h"
+#include "internet/core/internetservice.h"
 
 class QNetworkAccessManager;
 class QSortFilterProxyModel;
diff --git a/src/internet/magnatune/magnatunesettingspage.cpp b/src/internet/magnatune/magnatunesettingspage.cpp
index 1118bfca8..91c017a69 100644
--- a/src/internet/magnatune/magnatunesettingspage.cpp
+++ b/src/internet/magnatune/magnatunesettingspage.cpp
@@ -23,7 +23,7 @@
 
 #include "core/network.h"
 #include "magnatuneservice.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "ui_magnatunesettingspage.h"
 
 #include <QMessageBox>
diff --git a/src/internet/podcasts/addpodcastdialog.ui b/src/internet/podcasts/addpodcastdialog.ui
index fa7e7095d..c3977f552 100644
--- a/src/internet/podcasts/addpodcastdialog.ui
+++ b/src/internet/podcasts/addpodcastdialog.ui
@@ -211,7 +211,7 @@
   <customwidget>
    <class>PodcastInfoWidget</class>
    <extends>QWidget</extends>
-   <header>podcasts/podcastinfowidget.h</header>
+   <header>internet/podcasts/podcastinfowidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
diff --git a/src/internet/podcasts/podcastservice.cpp b/src/internet/podcasts/podcastservice.cpp
index e693b3ab4..096e2fd80 100644
--- a/src/internet/podcasts/podcastservice.cpp
+++ b/src/internet/podcasts/podcastservice.cpp
@@ -18,7 +18,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "podcastservice.h"
+#include "internet/podcasts/podcastservice.h"
 
 #include <QMenu>
 #include <QSortFilterProxyModel>
@@ -31,13 +31,13 @@
 #include "devices/devicemanager.h"
 #include "devices/devicestatefiltermodel.h"
 #include "devices/deviceview.h"
-#include "internet/internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "library/libraryview.h"
 #include "opmlcontainer.h"
 #include "podcastbackend.h"
 #include "podcastdeleter.h"
 #include "podcastdownloader.h"
-#include "podcastservicemodel.h"
+#include "internet/podcasts/podcastservicemodel.h"
 #include "podcastupdater.h"
 #include "ui/iconloader.h"
 #include "ui/organisedialog.h"
diff --git a/src/internet/podcasts/podcastservice.h b/src/internet/podcasts/podcastservice.h
index 4ab9583cf..52663bed0 100644
--- a/src/internet/podcasts/podcastservice.h
+++ b/src/internet/podcasts/podcastservice.h
@@ -23,8 +23,8 @@
 
 #include "podcastdeleter.h"
 #include "podcastdownloader.h"
-#include "internet/internetmodel.h"
-#include "internet/internetservice.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetservice.h"
 
 #include <memory>
 #include <QScopedPointer>
diff --git a/src/internet/podcasts/podcastservicemodel.cpp b/src/internet/podcasts/podcastservicemodel.cpp
index 2a5ec20e6..f9cac09ef 100644
--- a/src/internet/podcasts/podcastservicemodel.cpp
+++ b/src/internet/podcasts/podcastservicemodel.cpp
@@ -17,8 +17,8 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "podcastservice.h"
-#include "podcastservicemodel.h"
+#include "internet/podcasts/podcastservice.h"
+#include "internet/podcasts/podcastservicemodel.h"
 #include "playlist/songmimedata.h"
 
 PodcastServiceModel::PodcastServiceModel(QObject* parent)
diff --git a/src/internet/podcasts/podcastsettingspage.cpp b/src/internet/podcasts/podcastsettingspage.cpp
index 0d086f0e5..3915a7836 100644
--- a/src/internet/podcasts/podcastsettingspage.cpp
+++ b/src/internet/podcasts/podcastsettingspage.cpp
@@ -17,7 +17,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "podcastsettingspage.h"
+#include "internet/podcasts/podcastsettingspage.h"
 #include "ui_podcastsettingspage.h"
 
 #include <QFileDialog>
diff --git a/src/internet/seafile/seafileservice.cpp b/src/internet/seafile/seafileservice.cpp
index e5d5d56d1..27a5b4bed 100644
--- a/src/internet/seafile/seafileservice.cpp
+++ b/src/internet/seafile/seafileservice.cpp
@@ -28,9 +28,9 @@
 #include "core/application.h"
 #include "core/player.h"
 #include "core/waitforsignal.h"
-#include "internet/seafileurlhandler.h"
+#include "internet/seafile/seafileurlhandler.h"
 #include "library/librarybackend.h"
-#include "internet/oauthenticator.h"
+#include "internet/core/oauthenticator.h"
 
 const char* SeafileService::kServiceName = "Seafile";
 const char* SeafileService::kSettingsGroup = "Seafile";
diff --git a/src/internet/seafile/seafileservice.h b/src/internet/seafile/seafileservice.h
index ce56c8c4e..ab47dd5d2 100644
--- a/src/internet/seafile/seafileservice.h
+++ b/src/internet/seafile/seafileservice.h
@@ -45,7 +45,7 @@
 #ifndef INTERNET_SEAFILESERVICE_H_
 #define INTERNET_SEAFILESERVICE_H_
 
-#include "cloudfileservice.h"
+#include "internet/core/cloudfileservice.h"
 
 #include <QDateTime>
 #include <QMutex>
diff --git a/src/internet/seafile/seafilesettingspage.cpp b/src/internet/seafile/seafilesettingspage.cpp
index df27fbb98..c30885c54 100644
--- a/src/internet/seafile/seafilesettingspage.cpp
+++ b/src/internet/seafile/seafilesettingspage.cpp
@@ -26,7 +26,7 @@
 #include <QtDebug>
 
 #include "seafileservice.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/logging.h"
 #include "core/network.h"
 #include "ui_seafilesettingspage.h"
diff --git a/src/internet/seafile/seafiletree.h b/src/internet/seafile/seafiletree.h
index 61e4d1b7b..0c9ef139f 100644
--- a/src/internet/seafile/seafiletree.h
+++ b/src/internet/seafile/seafiletree.h
@@ -28,7 +28,7 @@
 #include <QList>
 #include <QPair>
 
-#include "cloudfileservice.h"
+#include "internet/core/cloudfileservice.h"
 
 // Reproduce the file system of Seafile server libraries
 // Analog to a tree
diff --git a/src/internet/skydrive/skydriveservice.cpp b/src/internet/skydrive/skydriveservice.cpp
index 2126a9f9f..91bfce90c 100644
--- a/src/internet/skydrive/skydriveservice.cpp
+++ b/src/internet/skydrive/skydriveservice.cpp
@@ -26,8 +26,8 @@
 #include "core/application.h"
 #include "core/player.h"
 #include "core/waitforsignal.h"
-#include "internet/oauthenticator.h"
-#include "internet/skydriveurlhandler.h"
+#include "internet/core/oauthenticator.h"
+#include "internet/skydrive/skydriveurlhandler.h"
 
 namespace {
 
diff --git a/src/internet/skydrive/skydriveservice.h b/src/internet/skydrive/skydriveservice.h
index a7f866167..0bae32d05 100644
--- a/src/internet/skydrive/skydriveservice.h
+++ b/src/internet/skydrive/skydriveservice.h
@@ -20,7 +20,7 @@
 #ifndef INTERNET_SKYDRIVESERVICE_H_
 #define INTERNET_SKYDRIVESERVICE_H_
 
-#include "cloudfileservice.h"
+#include "internet/core/cloudfileservice.h"
 
 #include <QDateTime>
 
diff --git a/src/internet/skydrive/skydrivesettingspage.cpp b/src/internet/skydrive/skydrivesettingspage.cpp
index 20f111687..7dfe83ad2 100644
--- a/src/internet/skydrive/skydrivesettingspage.cpp
+++ b/src/internet/skydrive/skydrivesettingspage.cpp
@@ -22,8 +22,8 @@
 
 #include "ui_skydrivesettingspage.h"
 #include "core/application.h"
-#include "internet/skydriveservice.h"
-#include "internet/internetmodel.h"
+#include "internet/skydrive/skydriveservice.h"
+#include "internet/core/internetmodel.h"
 #include "ui/settingsdialog.h"
 
 SkydriveSettingsPage::SkydriveSettingsPage(SettingsDialog* parent)
diff --git a/src/internet/somafm/somafmservice.cpp b/src/internet/somafm/somafmservice.cpp
index 346980078..77cdec317 100644
--- a/src/internet/somafm/somafmservice.cpp
+++ b/src/internet/somafm/somafmservice.cpp
@@ -21,7 +21,7 @@
 
 #include "somafmservice.h"
 #include "somafmurlhandler.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/logging.h"
diff --git a/src/internet/somafm/somafmservice.h b/src/internet/somafm/somafmservice.h
index 025a95fe1..9607c7a2f 100644
--- a/src/internet/somafm/somafmservice.h
+++ b/src/internet/somafm/somafmservice.h
@@ -23,7 +23,7 @@
 
 #include <QXmlStreamReader>
 
-#include "internetservice.h"
+#include "internet/core/internetservice.h"
 #include "core/cachedlist.h"
 
 class SomaFMUrlHandler;
diff --git a/src/internet/somafm/somafmurlhandler.cpp b/src/internet/somafm/somafmurlhandler.cpp
index a0ed32b59..3afda66f8 100644
--- a/src/internet/somafm/somafmurlhandler.cpp
+++ b/src/internet/somafm/somafmurlhandler.cpp
@@ -19,7 +19,7 @@
    along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "somafmservice.h"
 #include "somafmurlhandler.h"
 #include "core/application.h"
diff --git a/src/internet/soundcloud/soundcloudservice.cpp b/src/internet/soundcloud/soundcloudservice.cpp
index ba8038106..4883afa96 100644
--- a/src/internet/soundcloud/soundcloudservice.cpp
+++ b/src/internet/soundcloud/soundcloudservice.cpp
@@ -29,9 +29,9 @@
 #include <qjson/parser.h>
 #include <qjson/serializer.h>
 
-#include "internetmodel.h"
-#include "oauthenticator.h"
-#include "searchboxwidget.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/oauthenticator.h"
+#include "internet/core/searchboxwidget.h"
 
 #include "core/application.h"
 #include "core/closure.h"
diff --git a/src/internet/soundcloud/soundcloudservice.h b/src/internet/soundcloud/soundcloudservice.h
index 05340c8a3..83d335a4f 100644
--- a/src/internet/soundcloud/soundcloudservice.h
+++ b/src/internet/soundcloud/soundcloudservice.h
@@ -20,8 +20,8 @@
 #ifndef INTERNET_SOUNDCLOUDSERVICE_H_
 #define INTERNET_SOUNDCLOUDSERVICE_H_
 
-#include "internetmodel.h"
-#include "internetservice.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetservice.h"
 
 class NetworkAccessManager;
 class OAuthenticator;
diff --git a/src/internet/soundcloud/soundcloudsettingspage.cpp b/src/internet/soundcloud/soundcloudsettingspage.cpp
index 8b4eb97c9..4382a4f5e 100644
--- a/src/internet/soundcloud/soundcloudsettingspage.cpp
+++ b/src/internet/soundcloud/soundcloudsettingspage.cpp
@@ -20,7 +20,7 @@
 #include "soundcloudsettingspage.h"
 #include "ui_soundcloudsettingspage.h"
 #include "core/application.h"
-#include "internet/internetmodel.h"
+#include "internet/core/internetmodel.h"
 
 SoundCloudSettingsPage::SoundCloudSettingsPage(SettingsDialog* parent)
     : SettingsPage(parent),
diff --git a/src/internet/spotify/spotifyservice.cpp b/src/internet/spotify/spotifyservice.cpp
index 78611068f..0e93a3e16 100644
--- a/src/internet/spotify/spotifyservice.cpp
+++ b/src/internet/spotify/spotifyservice.cpp
@@ -23,8 +23,8 @@
 
 #include "blobversion.h"
 #include "config.h"
-#include "internetmodel.h"
-#include "searchboxwidget.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/searchboxwidget.h"
 #include "spotifyserver.h"
 #include "spotifyservice.h"
 #include "core/application.h"
diff --git a/src/internet/spotify/spotifyservice.h b/src/internet/spotify/spotifyservice.h
index 5c236f0ef..5d446b00d 100644
--- a/src/internet/spotify/spotifyservice.h
+++ b/src/internet/spotify/spotifyservice.h
@@ -22,8 +22,8 @@
 #ifndef INTERNET_SPOTIFYSERVICE_H_
 #define INTERNET_SPOTIFYSERVICE_H_
 
-#include "internetmodel.h"
-#include "internetservice.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetservice.h"
 #include "spotifymessages.pb.h"
 
 #include <QProcess>
diff --git a/src/internet/spotify/spotifysettingspage.cpp b/src/internet/spotify/spotifysettingspage.cpp
index 480c37ac4..31c823f22 100644
--- a/src/internet/spotify/spotifysettingspage.cpp
+++ b/src/internet/spotify/spotifysettingspage.cpp
@@ -24,7 +24,7 @@
 #include "config.h"
 #include "spotifymessages.pb.h"
 #include "spotifyservice.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "ui_spotifysettingspage.h"
 #include "core/network.h"
 #include "ui/iconloader.h"
diff --git a/src/internet/subsonic/subsonicservice.cpp b/src/internet/subsonic/subsonicservice.cpp
index 689bba31d..a67ee8298 100644
--- a/src/internet/subsonic/subsonicservice.cpp
+++ b/src/internet/subsonic/subsonicservice.cpp
@@ -41,8 +41,8 @@
 #include "core/utilities.h"
 #include "globalsearch/globalsearch.h"
 #include "globalsearch/librarysearchprovider.h"
-#include "internet/internetmodel.h"
-#include "internet/subsonicurlhandler.h"
+#include "internet/core/internetmodel.h"
+#include "internet/subsonic/subsonicurlhandler.h"
 #include "library/librarybackend.h"
 #include "library/libraryfilterwidget.h"
 #include "ui/iconloader.h"
diff --git a/src/internet/subsonic/subsonicservice.h b/src/internet/subsonic/subsonicservice.h
index 50a013a9f..a89279263 100644
--- a/src/internet/subsonic/subsonicservice.h
+++ b/src/internet/subsonic/subsonicservice.h
@@ -24,8 +24,8 @@
 
 #include <QQueue>
 
-#include "internet/internetmodel.h"
-#include "internet/internetservice.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetservice.h"
 
 class QNetworkAccessManager;
 class QNetworkReply;
diff --git a/src/internet/subsonic/subsonicsettingspage.cpp b/src/internet/subsonic/subsonicsettingspage.cpp
index 970920faf..416cc789e 100644
--- a/src/internet/subsonic/subsonicsettingspage.cpp
+++ b/src/internet/subsonic/subsonicsettingspage.cpp
@@ -21,7 +21,7 @@
 #include "subsonicsettingspage.h"
 #include "ui_subsonicsettingspage.h"
 #include "core/logging.h"
-#include "internetmodel.h"
+#include "internet/core/internetmodel.h"
 
 #include <QSettings>
 
diff --git a/src/internet/vk/vkconnection.cpp b/src/internet/vk/vkconnection.cpp
index 46523cfbb..d7029143c 100644
--- a/src/internet/vk/vkconnection.cpp
+++ b/src/internet/vk/vkconnection.cpp
@@ -24,7 +24,7 @@
 
 #include "core/closure.h"
 #include "core/logging.h"
-#include "internet/localredirectserver.h"
+#include "internet/core/localredirectserver.h"
 #include "vreen/utils.h"
 
 #include "vkservice.h"
diff --git a/src/internet/vk/vkservice.cpp b/src/internet/vk/vkservice.cpp
index 1471cf1b1..65885d546 100644
--- a/src/internet/vk/vkservice.cpp
+++ b/src/internet/vk/vkservice.cpp
@@ -44,9 +44,9 @@
 #include "widgets/didyoumean.h"
 
 #include "globalsearch/globalsearch.h"
-#include "internetmodel.h"
-#include "internetplaylistitem.h"
-#include "searchboxwidget.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetplaylistitem.h"
+#include "internet/core/searchboxwidget.h"
 
 #include "vreen/audio.h"
 #include "vreen/contact.h"
diff --git a/src/internet/vk/vkservice.h b/src/internet/vk/vkservice.h
index 9c8566d5e..02363785f 100644
--- a/src/internet/vk/vkservice.h
+++ b/src/internet/vk/vkservice.h
@@ -22,8 +22,8 @@
 
 #include <memory>
 
-#include "internetservice.h"
-#include "internetmodel.h"
+#include "internet/core/internetservice.h"
+#include "internet/core/internetmodel.h"
 #include "core/song.h"
 
 #include "vreen/audio.h"
diff --git a/src/internet/vk/vksettingspage.cpp b/src/internet/vk/vksettingspage.cpp
index fd31087ae..70f38315d 100644
--- a/src/internet/vk/vksettingspage.cpp
+++ b/src/internet/vk/vksettingspage.cpp
@@ -24,7 +24,7 @@
 #include "ui_vksettingspage.h"
 #include "core/application.h"
 #include "core/logging.h"
-#include "internet/vkservice.h"
+#include "internet/vk/vkservice.h"
 
 VkSettingsPage::VkSettingsPage(SettingsDialog* parent)
     : SettingsPage(parent),
diff --git a/src/main.cpp b/src/main.cpp
index 3eb1a9bf9..26d8a9505 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -89,7 +89,7 @@
 #endif
 
 #ifdef HAVE_LIBLASTFM
-#include "internet/lastfmservice.h"
+#include "internet/lastfm/lastfmservice.h"
 #else
 class LastFMService;
 #endif
diff --git a/src/networkremote/incomingdataparser.cpp b/src/networkremote/incomingdataparser.cpp
index d3be9cbac..e763616d6 100644
--- a/src/networkremote/incomingdataparser.cpp
+++ b/src/networkremote/incomingdataparser.cpp
@@ -21,13 +21,13 @@
 
 #include "core/logging.h"
 #include "engines/enginebase.h"
-#include "internet/internetmodel.h"
+#include "internet/core/internetmodel.h"
 #include "playlist/playlistmanager.h"
 #include "playlist/playlistsequence.h"
 #include "playlist/playlist.h"
 
 #ifdef HAVE_LIBLASTFM
-#include "internet/lastfmservice.h"
+#include "internet/lastfm/lastfmservice.h"
 #endif
 
 IncomingDataParser::IncomingDataParser(Application* app) : app_(app) {
diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index a5a04e258..bc2d2c4b6 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -51,15 +51,15 @@
 #include "core/qhash_qurl.h"
 #include "core/tagreaderclient.h"
 #include "core/timeconstants.h"
-#include "internet/jamendoplaylistitem.h"
-#include "internet/jamendoservice.h"
-#include "internet/magnatuneplaylistitem.h"
-#include "internet/magnatuneservice.h"
-#include "internet/internetmimedata.h"
-#include "internet/internetmodel.h"
-#include "internet/internetplaylistitem.h"
-#include "internet/internetsongmimedata.h"
-#include "internet/savedradio.h"
+#include "internet/jamendo/jamendoplaylistitem.h"
+#include "internet/jamendo/jamendoservice.h"
+#include "internet/magnatune/magnatuneplaylistitem.h"
+#include "internet/magnatune/magnatuneservice.h"
+#include "internet/core/internetmimedata.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetplaylistitem.h"
+#include "internet/core/internetsongmimedata.h"
+#include "internet/internetradio/savedradio.h"
 #include "library/library.h"
 #include "library/librarybackend.h"
 #include "library/librarymodel.h"
diff --git a/src/playlist/playlistitem.cpp b/src/playlist/playlistitem.cpp
index fa42cd4f1..55c7cdb03 100644
--- a/src/playlist/playlistitem.cpp
+++ b/src/playlist/playlistitem.cpp
@@ -19,11 +19,11 @@
 #include "songplaylistitem.h"
 #include "core/logging.h"
 #include "core/song.h"
-#include "internet/jamendoplaylistitem.h"
-#include "internet/jamendoservice.h"
-#include "internet/magnatuneplaylistitem.h"
-#include "internet/magnatuneservice.h"
-#include "internet/internetplaylistitem.h"
+#include "internet/jamendo/jamendoplaylistitem.h"
+#include "internet/jamendo/jamendoservice.h"
+#include "internet/magnatune/magnatuneplaylistitem.h"
+#include "internet/magnatune/magnatuneservice.h"
+#include "internet/core/internetplaylistitem.h"
 #include "library/library.h"
 #include "library/libraryplaylistitem.h"
 
diff --git a/src/playlist/playlisttabbar.cpp b/src/playlist/playlisttabbar.cpp
index f9b397a98..9bc70a593 100644
--- a/src/playlist/playlisttabbar.cpp
+++ b/src/playlist/playlisttabbar.cpp
@@ -21,7 +21,7 @@
 #include "playlistview.h"
 #include "songmimedata.h"
 #include "core/logging.h"
-#include "internet/internetmimedata.h"
+#include "internet/core/internetmimedata.h"
 #include "ui/iconloader.h"
 #include "widgets/renametablineedit.h"
 #include "widgets/favoritewidget.h"
diff --git a/src/smartplaylists/generator.cpp b/src/smartplaylists/generator.cpp
index b8a935128..961e9c4f9 100644
--- a/src/smartplaylists/generator.cpp
+++ b/src/smartplaylists/generator.cpp
@@ -18,7 +18,7 @@
 #include "generator.h"
 #include "querygenerator.h"
 #include "core/logging.h"
-#include "internet/jamendodynamicplaylist.h"
+#include "internet/jamendo/jamendodynamicplaylist.h"
 
 #include <QSettings>
 
diff --git a/src/songinfo/lastfmtrackinfoprovider.cpp b/src/songinfo/lastfmtrackinfoprovider.cpp
index 72bbbccb3..b00e98910 100644
--- a/src/songinfo/lastfmtrackinfoprovider.cpp
+++ b/src/songinfo/lastfmtrackinfoprovider.cpp
@@ -19,7 +19,7 @@
 #include "songinfotextview.h"
 #include "songplaystats.h"
 #include "tagwidget.h"
-#include "internet/lastfmcompat.h"
+#include "internet/lastfm/lastfmcompat.h"
 #include "ui/iconloader.h"
 
 void LastfmTrackInfoProvider::FetchInfo(int id, const Song& metadata) {
diff --git a/src/songinfo/songkickconcerts.h b/src/songinfo/songkickconcerts.h
index e205011f1..606909f26 100644
--- a/src/songinfo/songkickconcerts.h
+++ b/src/songinfo/songkickconcerts.h
@@ -22,7 +22,7 @@
 
 #include "core/network.h"
 #include "core/override.h"
-#include "internet/geolocator.h"
+#include "internet/core/geolocator.h"
 
 class QNetworkReply;
 class SongInfoTextView;
diff --git a/src/songinfo/tagwidget.cpp b/src/songinfo/tagwidget.cpp
index 828306291..951265d65 100644
--- a/src/songinfo/tagwidget.cpp
+++ b/src/songinfo/tagwidget.cpp
@@ -16,9 +16,9 @@
 */
 
 #include "tagwidget.h"
-#include "internet/lastfmservice.h"
-#include "internet/internetmimedata.h"
-#include "internet/internetmodel.h"
+#include "internet/lastfm/lastfmservice.h"
+#include "internet/core/internetmimedata.h"
+#include "internet/core/internetmodel.h"
 #include "playlist/playlistitemmimedata.h"
 #include "smartplaylists/generator.h"
 #include "smartplaylists/generatormimedata.h"
diff --git a/src/ui/addstreamdialog.cpp b/src/ui/addstreamdialog.cpp
index cdf90cbc5..e33837f91 100644
--- a/src/ui/addstreamdialog.cpp
+++ b/src/ui/addstreamdialog.cpp
@@ -17,8 +17,8 @@
 
 #include "addstreamdialog.h"
 #include "ui_addstreamdialog.h"
-#include "internet/internetmodel.h"
-#include "internet/savedradio.h"
+#include "internet/core/internetmodel.h"
+#include "internet/internetradio/savedradio.h"
 
 #include <QSettings>
 #include <QUrl>
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index f6d5240ce..736762b2a 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -71,11 +71,11 @@
 #include "globalsearch/globalsearch.h"
 #include "globalsearch/globalsearchview.h"
 #include "globalsearch/librarysearchprovider.h"
-#include "internet/magnatuneservice.h"
-#include "internet/internetmodel.h"
-#include "internet/internetview.h"
-#include "internet/internetviewcontainer.h"
-#include "internet/savedradio.h"
+#include "internet/magnatune/magnatuneservice.h"
+#include "internet/core/internetmodel.h"
+#include "internet/core/internetview.h"
+#include "internet/core/internetviewcontainer.h"
+#include "internet/internetradio/savedradio.h"
 #include "library/groupbydialog.h"
 #include "library/library.h"
 #include "library/librarybackend.h"
@@ -94,7 +94,7 @@
 #include "playlist/queuemanager.h"
 #include "playlist/songplaylistitem.h"
 #include "playlistparsers/playlistparser.h"
-#include "podcasts/podcastservice.h"
+#include "internet/podcasts/podcastservice.h"
 #include "smartplaylists/generator.h"
 #include "smartplaylists/generatormimedata.h"
 #include "songinfo/artistinfoview.h"
@@ -130,7 +130,7 @@
 #endif
 
 #ifdef HAVE_LIBLASTFM
-#include "internet/lastfmservice.h"
+#include "internet/lastfm/lastfmservice.h"
 #endif
 
 #ifdef HAVE_WIIMOTEDEV
@@ -147,7 +147,7 @@
 #endif
 
 #ifdef HAVE_VK
-#include "internet/vkservice.h"
+#include "internet/vk/vkservice.h"
 #endif
 
 #include <cmath>
diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp
index ab9f824d5..b82e00a27 100644
--- a/src/ui/settingsdialog.cpp
+++ b/src/ui/settingsdialog.cpp
@@ -35,16 +35,16 @@
 #include "engines/enginebase.h"
 #include "engines/gstengine.h"
 #include "globalsearch/globalsearchsettingspage.h"
-#include "internet/digitallyimportedsettingspage.h"
-#include "internet/groovesharksettingspage.h"
-#include "internet/internetshowsettingspage.h"
-#include "internet/magnatunesettingspage.h"
-#include "internet/soundcloudsettingspage.h"
-#include "internet/spotifysettingspage.h"
-#include "internet/subsonicsettingspage.h"
+#include "internet/digitally/digitallyimportedsettingspage.h"
+#include "internet/grooveshark/groovesharksettingspage.h"
+#include "internet/core/internetshowsettingspage.h"
+#include "internet/magnatune/magnatunesettingspage.h"
+#include "internet/soundcloud/soundcloudsettingspage.h"
+#include "internet/spotify/spotifysettingspage.h"
+#include "internet/subsonic/subsonicsettingspage.h"
 #include "library/librarysettingspage.h"
 #include "playlist/playlistview.h"
-#include "podcasts/podcastsettingspage.h"
+#include "internet/podcasts/podcastsettingspage.h"
 #include "songinfo/songinfosettingspage.h"
 #include "transcoder/transcodersettingspage.h"
 #include "widgets/groupediconview.h"
@@ -53,7 +53,7 @@
 #include "ui_settingsdialog.h"
 
 #ifdef HAVE_LIBLASTFM
-#include "internet/lastfmsettingspage.h"
+#include "internet/lastfm/lastfmsettingspage.h"
 #endif
 
 #ifdef HAVE_WIIMOTEDEV
@@ -61,27 +61,27 @@
 #endif
 
 #ifdef HAVE_GOOGLE_DRIVE
-#include "internet/googledrivesettingspage.h"
+#include "internet/googledrive/googledrivesettingspage.h"
 #endif
 
 #ifdef HAVE_DROPBOX
-#include "internet/dropboxsettingspage.h"
+#include "internet/dropbox/dropboxsettingspage.h"
 #endif
 
 #ifdef HAVE_BOX
-#include "internet/boxsettingspage.h"
+#include "internet/box/boxsettingspage.h"
 #endif
 
 #ifdef HAVE_VK
-#include "internet/vksettingspage.h"
+#include "internet/vk/vksettingspage.h"
 #endif
 
 #ifdef HAVE_SKYDRIVE
-#include "internet/skydrivesettingspage.h"
+#include "internet/skydrive/skydrivesettingspage.h"
 #endif
 
 #ifdef HAVE_SEAFILE
-#include "internet/seafilesettingspage.h"
+#include "internet/seafile/seafilesettingspage.h"
 #endif
 
 #include <QAbstractButton>