diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt
index 0a0403f78..0a759c47d 100644
--- a/src/libtomahawk/CMakeLists.txt
+++ b/src/libtomahawk/CMakeLists.txt
@@ -192,7 +192,6 @@ list(APPEND libSources
     SourceList.cpp
     Pipeline.cpp
 
-    AclRegistry.cpp
     Artist.cpp
     ArtistPlaylistInterface.cpp
     Album.cpp
@@ -319,6 +318,7 @@ list(APPEND libSources
     filemetadata/taghandlers/oggtag.cpp
     filemetadata/MetadataEditor.cpp
 
+    network/acl/AclRegistry.cpp
     network/BufferIoDevice.cpp
     network/Msg.cpp
     network/MsgProcessor.cpp
diff --git a/src/libtomahawk/jobview/AclJobItem.h b/src/libtomahawk/jobview/AclJobItem.h
index 53508f300..133d1fc14 100644
--- a/src/libtomahawk/jobview/AclJobItem.h
+++ b/src/libtomahawk/jobview/AclJobItem.h
@@ -20,8 +20,9 @@
 #ifndef ACLJOBITEM_H
 #define ACLJOBITEM_H
 
-#include "AclRegistry.h"
 #include "DllMacro.h"
+
+#include "network/acl/AclRegistry.h"
 #include "jobview/JobStatusItem.h"
 
 #include <QStyledItemDelegate>
diff --git a/src/libtomahawk/network/Connection.cpp b/src/libtomahawk/network/Connection.cpp
index 4981dae72..3748ae7f2 100644
--- a/src/libtomahawk/network/Connection.cpp
+++ b/src/libtomahawk/network/Connection.cpp
@@ -20,11 +20,11 @@
 
 #include "Connection_p.h"
 
+#include "network/acl/AclRegistry.h"
 #include "network/Servent.h"
 #include "network/Msg.h"
 #include "utils/Logger.h"
 
-#include "AclRegistry.h"
 #include "QTcpSocketExtra.h"
 #include "Source.h"
 
diff --git a/src/libtomahawk/network/Servent.cpp b/src/libtomahawk/network/Servent.cpp
index c2ee634d1..051ab0afa 100644
--- a/src/libtomahawk/network/Servent.cpp
+++ b/src/libtomahawk/network/Servent.cpp
@@ -24,6 +24,7 @@
 #include "accounts/AccountManager.h"
 #include "database/Database.h"
 #include "database/DatabaseImpl.h"
+#include "network/acl/AclRegistry.h"
 #include "network/Msg.h"
 #include "network/ConnectionManager.h"
 #include "network/DbSyncConnection.h"
@@ -35,7 +36,6 @@
 #include "utils/Logger.h"
 #include "utils/NetworkAccessManager.h"
 
-#include "AclRegistry.h"
 #include "Connection.h"
 #include "ControlConnection.h"
 #include "PortFwdThread.h"
diff --git a/src/libtomahawk/AclRegistry.cpp b/src/libtomahawk/network/acl/AclRegistry.cpp
similarity index 100%
rename from src/libtomahawk/AclRegistry.cpp
rename to src/libtomahawk/network/acl/AclRegistry.cpp
diff --git a/src/libtomahawk/AclRegistry.h b/src/libtomahawk/network/acl/AclRegistry.h
similarity index 100%
rename from src/libtomahawk/AclRegistry.h
rename to src/libtomahawk/network/acl/AclRegistry.h
diff --git a/src/tomahawk/AclRegistryImpl.h b/src/tomahawk/AclRegistryImpl.h
index c1bb3b8aa..dfe4ca633 100644
--- a/src/tomahawk/AclRegistryImpl.h
+++ b/src/tomahawk/AclRegistryImpl.h
@@ -20,7 +20,7 @@
 #ifndef TOMAHAWK_ACLREGISTRYIMPL_H
 #define TOMAHAWK_ACLREGISTRYIMPL_H
 
-#include "AclRegistry.h"
+#include "network/acl/AclRegistry.h"
 #include "HeadlessCheck.h"
 
 #include <QObject>
diff --git a/src/tomahawk/SettingsDialog.cpp b/src/tomahawk/SettingsDialog.cpp
index 3d082ceec..427763ee3 100644
--- a/src/tomahawk/SettingsDialog.cpp
+++ b/src/tomahawk/SettingsDialog.cpp
@@ -28,7 +28,7 @@
 #include "config.h"
 
 #include "AtticaManager.h"
-#include "AclRegistry.h"
+#include "network/acl/AclRegistry.h"
 #include "TomahawkApp.h"
 #include "TomahawkSettings.h"
 #include "accounts/DelegateConfigWrapper.h"