diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a44a4f7d..36b23f777 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,12 +47,12 @@ SET( tomahawkSources ${tomahawkSources}
      infosystem/infoplugins/echonestplugin.cpp
      infosystem/infoplugins/musixmatchplugin.cpp
 
-     bufferiodevice.cpp
-     msgprocessor.cpp
      collection.cpp
      musicscanner.cpp
      scriptresolver.cpp
 
+     network/bufferiodevice.cpp
+     network/msgprocessor.cpp
      network/connection.cpp
      network/controlconnection.cpp
      network/filetransferconnection.cpp
@@ -88,7 +88,6 @@ SET( tomahawkSources ${tomahawkSources}
      database/databasecollection.cpp
 
      scrobbler.cpp
-
      xmppbot/xmppbot.cpp
      web/api_v1.cpp
 
@@ -203,13 +202,8 @@ SET( tomahawkHeaders ${tomahawkHeaders}
      infosystem/infoplugins/echonestplugin.h
      infosystem/infoplugins/musixmatchplugin.h
 
-     bufferiodevice.h
-     msgprocessor.h
-     musicscanner.h
-     scriptresolver.h
-     tomahawksettings.h
-     tomahawkzeroconf.h 
-
+     network/bufferiodevice.h
+     network/msgprocessor.h
      network/remotecollection.h
      network/servent.h
      network/connection.h
@@ -217,8 +211,12 @@ SET( tomahawkHeaders ${tomahawkHeaders}
      network/filetransferconnection.h
      network/dbsyncconnection.h
 
-     scrobbler.h
+     musicscanner.h
+     scriptresolver.h
+     tomahawksettings.h
+     tomahawkzeroconf.h 
 
+     scrobbler.h
      xmppbot/xmppbot.h
      web/api_v1.h
 )
diff --git a/src/bufferiodevice.cpp b/src/network/bufferiodevice.cpp
similarity index 100%
rename from src/bufferiodevice.cpp
rename to src/network/bufferiodevice.cpp
diff --git a/src/bufferiodevice.h b/src/network/bufferiodevice.h
similarity index 100%
rename from src/bufferiodevice.h
rename to src/network/bufferiodevice.h
diff --git a/src/msg.h b/src/network/msg.h
similarity index 100%
rename from src/msg.h
rename to src/network/msg.h
diff --git a/src/msgprocessor.cpp b/src/network/msgprocessor.cpp
similarity index 100%
rename from src/msgprocessor.cpp
rename to src/network/msgprocessor.cpp
diff --git a/src/msgprocessor.h b/src/network/msgprocessor.h
similarity index 100%
rename from src/msgprocessor.h
rename to src/network/msgprocessor.h