diff --git a/backends/frotz/main.cpp b/backends/frotz/main.cpp
index 77e4d191be4eb57ef943fa900a4c8a84e8378402..79aaced1373049b13a6ae5922fcf002464eb961c 100644
--- a/backends/frotz/main.cpp
+++ b/backends/frotz/main.cpp
@@ -8,8 +8,8 @@
  * program, but you don't have to.
  */
 
-#include "transport/config.h"
-#include "transport/networkplugin.h"
+#include "transport/Config.h"
+#include "transport/NetworkPlugin.h"
 #include "Swiften/Swiften.h"
 #include <boost/filesystem.hpp>
 #include "unistd.h"
diff --git a/backends/libcommuni/ircnetworkplugin.cpp b/backends/libcommuni/ircnetworkplugin.cpp
index c5f3c2cbc26241b511c7fce5798e52eaecc21182..17981bf6e9e024996ca6e4d514ebdff2964739f5 100644
--- a/backends/libcommuni/ircnetworkplugin.cpp
+++ b/backends/libcommuni/ircnetworkplugin.cpp
@@ -21,7 +21,7 @@
 #include "ircnetworkplugin.h"
 #include <IrcCommand>
 #include <IrcMessage>
-#include "transport/logging.h"
+#include "transport/Logging.h"
 
 DEFINE_LOGGER(logger, "IRCNetworkPlugin");
 
diff --git a/backends/libcommuni/ircnetworkplugin.h b/backends/libcommuni/ircnetworkplugin.h
index 2f19f1dc39da1b15ed41a7c638064306a55ec9b8..df8fb65b2bcfb64ba767b454a22df186644f2006 100644
--- a/backends/libcommuni/ircnetworkplugin.h
+++ b/backends/libcommuni/ircnetworkplugin.h
@@ -20,8 +20,8 @@
 
 #pragma once
 #ifndef Q_MOC_RUN
-#include "transport/config.h"
-#include "transport/networkplugin.h"
+#include "transport/Config.h"
+#include "transport/NetworkPlugin.h"
 #include "session.h"
 #include <QtCore>
 #include <QtNetwork>
diff --git a/backends/libcommuni/main.cpp b/backends/libcommuni/main.cpp
index 423ab27c20678ce1b3a40b06ff73e6c75504509b..42bc05140f50b9abed98db92053e36de1c68f212 100644
--- a/backends/libcommuni/main.cpp
+++ b/backends/libcommuni/main.cpp
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/config.h"
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
+#include "transport/Config.h"
+#include "transport/NetworkPlugin.h"
+#include "transport/Logging.h"
 #include "session.h"
 #include <QtCore>
 #include <QtNetwork>
diff --git a/backends/libcommuni/session.cpp b/backends/libcommuni/session.cpp
index c3f82f6bb273ee3af3e231e5869aa1ae28f3c9b6..de940a5c3c245861f144c9ae67e4d1bd4d1da61f 100644
--- a/backends/libcommuni/session.cpp
+++ b/backends/libcommuni/session.cpp
@@ -30,7 +30,7 @@
 #define FROM_UTF8(WHAT) QString::fromUtf8((WHAT).c_str(), (WHAT).size())
 #define TO_UTF8(WHAT) std::string((WHAT).toUtf8().data(), (WHAT).toUtf8().size())
 
-#include "transport/logging.h"
+#include "transport/Logging.h"
 
 DEFINE_LOGGER(logger, "IRCConnection");
 
diff --git a/backends/libcommuni/session.h b/backends/libcommuni/session.h
index 24d2654976a98c11c62ddafadcfed281f3cad36c..18fe6891bd0271c9b8133154fbf47c09dcdb49b9 100644
--- a/backends/libcommuni/session.h
+++ b/backends/libcommuni/session.h
@@ -23,7 +23,7 @@
 
 #ifndef Q_MOC_RUN
 #include <IrcConnection>
-#include <transport/networkplugin.h>
+#include <transport/NetworkPlugin.h>
 #include "Swiften/Swiften.h"
 #include <boost/smart_ptr/make_shared.hpp>
 #include <QTimer>
diff --git a/backends/libpurple/geventloop.cpp b/backends/libpurple/geventloop.cpp
index 7e299d7c0f6d295710bd0046acab1d24c06a3382..f6c3f7eb958f7d3e1073846698e99c6250205d37 100644
--- a/backends/libpurple/geventloop.cpp
+++ b/backends/libpurple/geventloop.cpp
@@ -30,7 +30,7 @@
 
 #include "purple_defs.h"
 
-#include "transport/logging.h"
+#include "transport/Logging.h"
 
 DEFINE_LOGGER(logger, "EventLoop");
 
diff --git a/backends/libpurple/main.cpp b/backends/libpurple/main.cpp
index cce1f000d927d54f0630108cdd5d1d4463685343..fdc309244ec0aaef89cae5447f7a22674f845b54 100644
--- a/backends/libpurple/main.cpp
+++ b/backends/libpurple/main.cpp
@@ -10,10 +10,9 @@
 #include <algorithm>
 #include <iostream>
 
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
-#include "transport/config.h"
-#include "transport/logging.h"
+#include "transport/NetworkPlugin.h"
+#include "transport/Logging.h"
+#include "transport/Config.h"
 #include "geventloop.h"
 
 // #include "valgrind/memcheck.h"
diff --git a/backends/skype/main.cpp b/backends/skype/main.cpp
index 1516dc1057f52a1fff059521129d8422bf0e2c2e..181698524d1ca4439da08da984a207ecb1059ab2 100644
--- a/backends/skype/main.cpp
+++ b/backends/skype/main.cpp
@@ -3,18 +3,18 @@
 #include "sqlite3.h"
 #include <iostream>
 
-#include "transport/config.h"
-#include "transport/logging.h"
-#include "transport/transport.h"
-#include "transport/usermanager.h"
-#include "transport/memoryusage.h"
-#include "transport/sqlite3backend.h"
-#include "transport/userregistration.h"
-#include "transport/user.h"
-#include "transport/storagebackend.h"
-#include "transport/rostermanager.h"
-#include "transport/conversation.h"
-#include "transport/networkplugin.h"
+#include "transport/Config.h"
+#include "transport/Logging.h"
+#include "transport/Transport.h"
+#include "transport/UserManager.h"
+#include "transport/MemoryUsage.h"
+#include "transport/SQLite3Backend.h"
+#include "transport/UserRegistration.h"
+#include "transport/User.h"
+#include "transport/StorageBackend.h"
+#include "transport/RosterManager.h"
+#include "transport/Conversation.h"
+#include "transport/NetworkPlugin.h"
 #include <boost/filesystem.hpp>
 #include "sys/wait.h"
 #include "sys/signal.h"
diff --git a/backends/skype/skype.cpp b/backends/skype/skype.cpp
index b33b4601c3bce244af30e514296271b9a2cf1f90..8e4de70fc8c581041c004e3bcc63fc79c7edbac9 100644
--- a/backends/skype/skype.cpp
+++ b/backends/skype/skype.cpp
@@ -22,18 +22,17 @@
 #include "skypeplugin.h"
 #include "skypedb.h"
 
-#include "transport/config.h"
-#include "transport/logging.h"
-#include "transport/transport.h"
-#include "transport/usermanager.h"
-#include "transport/memoryusage.h"
-#include "transport/sqlite3backend.h"
-#include "transport/userregistration.h"
-#include "transport/user.h"
-#include "transport/storagebackend.h"
-#include "transport/rostermanager.h"
-#include "transport/conversation.h"
-#include "transport/networkplugin.h"
+#include "transport/Logging.h"
+#include "transport/Transport.h"
+#include "transport/UserManager.h"
+#include "transport/MemoryUsage.h"
+#include "transport/SQLite3Backend.h"
+#include "transport/UserRegistration.h"
+#include "transport/User.h"
+#include "transport/StorageBackend.h"
+#include "transport/RosterManager.h"
+#include "transport/Conversation.h"
+#include "transport/NetworkPlugin.h"
 #include <boost/filesystem.hpp>
 #include "sys/wait.h"
 #include "sys/signal.h"
diff --git a/backends/skype/skypedb.cpp b/backends/skype/skypedb.cpp
index f086866f85f888f232b7b30a510e2514dad2f919..ce144a56c08ac1335ee817bfd40a49983ab6bab1 100644
--- a/backends/skype/skypedb.cpp
+++ b/backends/skype/skypedb.cpp
@@ -20,18 +20,17 @@
 
 #include "skypedb.h"
 
-#include "transport/config.h"
-#include "transport/logging.h"
-#include "transport/transport.h"
-#include "transport/usermanager.h"
-#include "transport/memoryusage.h"
-#include "transport/sqlite3backend.h"
-#include "transport/userregistration.h"
-#include "transport/user.h"
-#include "transport/storagebackend.h"
-#include "transport/rostermanager.h"
-#include "transport/conversation.h"
-#include "transport/networkplugin.h"
+#include "transport/Logging.h"
+#include "transport/Transport.h"
+#include "transport/UserManager.h"
+#include "transport/MemoryUsage.h"
+#include "transport/SQLite3Backend.h"
+#include "transport/UserRegistration.h"
+#include "transport/User.h"
+#include "transport/StorageBackend.h"
+#include "transport/RosterManager.h"
+#include "transport/Conversation.h"
+#include "transport/NetworkPlugin.h"
 #include <boost/filesystem.hpp>
 #include "sys/wait.h"
 #include "sys/signal.h"
diff --git a/backends/skype/skypeplugin.cpp b/backends/skype/skypeplugin.cpp
index 6a0f64e7679f1b380169b2208e2cf94b528cafd3..aa638e056b047ff8b28d2273fd843422fbcefb5c 100644
--- a/backends/skype/skypeplugin.cpp
+++ b/backends/skype/skypeplugin.cpp
@@ -22,18 +22,17 @@
 #include "skype.h"
 #include "skypedb.h"
 
-#include "transport/config.h"
-#include "transport/logging.h"
-#include "transport/transport.h"
-#include "transport/usermanager.h"
-#include "transport/memoryusage.h"
-#include "transport/sqlite3backend.h"
-#include "transport/userregistration.h"
-#include "transport/user.h"
-#include "transport/storagebackend.h"
-#include "transport/rostermanager.h"
-#include "transport/conversation.h"
-#include "transport/networkplugin.h"
+#include "transport/Logging.h"
+#include "transport/Transport.h"
+#include "transport/UserManager.h"
+#include "transport/MemoryUsage.h"
+#include "transport/SQLite3Backend.h"
+#include "transport/UserRegistration.h"
+#include "transport/User.h"
+#include "transport/StorageBackend.h"
+#include "transport/RosterManager.h"
+#include "transport/Conversation.h"
+#include "transport/NetworkPlugin.h"
 #include <boost/filesystem.hpp>
 #include "sys/wait.h"
 #include "sys/signal.h"
diff --git a/backends/skype/skypeplugin.h b/backends/skype/skypeplugin.h
index 782814bce76ef88161b8a3c0b1455a6306dd699e..fe426ca944791e9b71014a3a75891ed194be8561 100644
--- a/backends/skype/skypeplugin.h
+++ b/backends/skype/skypeplugin.h
@@ -25,8 +25,8 @@
 #include "sqlite3.h"
 #include <iostream>
 #include <map>
-#include "transport/networkplugin.h"
-#include "transport/config.h"
+#include "transport/NetworkPlugin.h"
+#include "transport/Config.h"
 
 class Skype;
 
diff --git a/backends/smstools3/main.cpp b/backends/smstools3/main.cpp
index f69fea53d0d49480b66366494d37b8706c1f2201..b31d496c1fc331bbb62214e987d30f21a0b9b21c 100644
--- a/backends/smstools3/main.cpp
+++ b/backends/smstools3/main.cpp
@@ -8,13 +8,13 @@
  * program, but you don't have to.
  */
 
-#include "transport/config.h"
-#include "transport/logging.h"
-#include "transport/networkplugin.h"
-#include "transport/sqlite3backend.h"
-#include "transport/mysqlbackend.h"
-#include "transport/pqxxbackend.h"
-#include "transport/storagebackend.h"
+#include "transport/Config.h"
+#include "transport/Logging.h"
+#include "transport/NetworkPlugin.h"
+#include "transport/SQLite3Backend.h"
+#include "transport/MySQLBackend.h"
+#include "transport/PQXXBackend.h"
+#include "transport/StorageBackend.h"
 #include "Swiften/Swiften.h"
 #include <boost/filesystem.hpp>
 #include "unistd.h"
diff --git a/backends/swiften/main.cpp b/backends/swiften/main.cpp
index 517da09e7fe4dd67bef1eb032d404cf3c8b4b5a6..8ccbb2d69bce7625a902490e3e7d18eb6a938278 100644
--- a/backends/swiften/main.cpp
+++ b/backends/swiften/main.cpp
@@ -1,7 +1,7 @@
 // Transport includes
-#include "transport/config.h"
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
+#include "transport/Config.h"
+#include "transport/NetworkPlugin.h"
+#include "transport/Logging.h"
 
 #include "boost/date_time/posix_time/posix_time.hpp"
 
diff --git a/backends/template/main.cpp b/backends/template/main.cpp
index 2210ad42a0bc378a0765e39d4671c89e74505078..5f9df1a81228509ab31ad7729c4ecad90941e7aa 100644
--- a/backends/template/main.cpp
+++ b/backends/template/main.cpp
@@ -1,9 +1,9 @@
 #include "plugin.h"
 
 // Transport includes
-#include "transport/config.h"
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
+#include "transport/Config.h"
+#include "transport/NetworkPlugin.h"
+#include "transport/Logging.h"
 
 // Swiften
 #include "Swiften/Swiften.h"
diff --git a/backends/template/plugin.cpp b/backends/template/plugin.cpp
index ec4e86ca6dd5946ae4c401e2e27091bb9471afb4..f761184ade04eeb0f2f908d9399eb961f561f1c5 100644
--- a/backends/template/plugin.cpp
+++ b/backends/template/plugin.cpp
@@ -1,8 +1,8 @@
 #include "plugin.h"
 // Transport includes
-#include "transport/config.h"
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
+#include "transport/Config.h"
+#include "transport/NetworkPlugin.h"
+#include "transport/Logging.h"
 
 // Swiften
 #include "Swiften/Swiften.h"
diff --git a/backends/template/plugin.h b/backends/template/plugin.h
index 6260ff9743f117fd3002d313954f2a9d29ec5012..b67ac7a9d8893d919c23a0f5cf23d64c0b606266 100644
--- a/backends/template/plugin.h
+++ b/backends/template/plugin.h
@@ -2,8 +2,8 @@
 
 #include "Swiften/Swiften.h"
 
-#include "transport/config.h"
-#include "transport/networkplugin.h"
+#include "transport/Config.h"
+#include "transport/NetworkPlugin.h"
 
 class Plugin : public Transport::NetworkPlugin {
 	public:
diff --git a/backends/twitter/HTTPRequest.h b/backends/twitter/HTTPRequest.h
index cf8447f94d261c459b0ddde40857759f92010c3e..40db66a1e078468eb2699fcd6f22e56a5c418ab5 100644
--- a/backends/twitter/HTTPRequest.h
+++ b/backends/twitter/HTTPRequest.h
@@ -2,7 +2,7 @@
 #define HTTPREQ_H
 
 #include "curl/curl.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include <iostream>
 #include <sstream>
 #include <string.h>
diff --git a/backends/twitter/Requests/CreateFriendRequest.h b/backends/twitter/Requests/CreateFriendRequest.h
index 60d8cec0d2ccc4dc75b5be27ef2cedd773dc5101..47f14308fd8b25c306a029eac046f9f115749156 100644
--- a/backends/twitter/Requests/CreateFriendRequest.h
+++ b/backends/twitter/Requests/CreateFriendRequest.h
@@ -1,10 +1,10 @@
 #ifndef CREATE_FRIEND
 #define CREATE_FRIEND
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../TwitterResponseParser.h"
 #include "../libtwitcurl/twitcurl.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include <string>
 #include <boost/function.hpp>
 #include <iostream>
diff --git a/backends/twitter/Requests/DestroyFriendRequest.h b/backends/twitter/Requests/DestroyFriendRequest.h
index 0f6ed0d827646f3a2d2f0c52b8fa09c270cdccbf..4fa8a82eb9bc304281ef51d6c67818b2af274799 100644
--- a/backends/twitter/Requests/DestroyFriendRequest.h
+++ b/backends/twitter/Requests/DestroyFriendRequest.h
@@ -1,10 +1,10 @@
 #ifndef DESTROY_FRIEND
 #define DESTROY_FRIEND
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../TwitterResponseParser.h"
 #include "../libtwitcurl/twitcurl.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include <string>
 #include <boost/function.hpp>
 #include <iostream>
diff --git a/backends/twitter/Requests/DirectMessageRequest.h b/backends/twitter/Requests/DirectMessageRequest.h
index 754c24c8fab36cbbfd505630058ee4f46c3da429..2023630089a1519f390e1088b73ae6cb83d7bdf9 100644
--- a/backends/twitter/Requests/DirectMessageRequest.h
+++ b/backends/twitter/Requests/DirectMessageRequest.h
@@ -1,10 +1,10 @@
 #ifndef DIRECT_MESSAGE
 #define DIRECT_MESSAGE
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../TwitterResponseParser.h"
 #include "../libtwitcurl/twitcurl.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include <string>
 #include <boost/function.hpp>
 #include <iostream>
diff --git a/backends/twitter/Requests/FetchFriends.h b/backends/twitter/Requests/FetchFriends.h
index 5f44a47b6d2480510dc7b72b94895ce410af3df2..4577b7961e8e1837d9c8c9a5e059789996d05fe4 100644
--- a/backends/twitter/Requests/FetchFriends.h
+++ b/backends/twitter/Requests/FetchFriends.h
@@ -1,10 +1,10 @@
 #ifndef FRIENDS_H
 #define FRIENDS_H
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "../TwitterResponseParser.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include <string>
 #include <boost/signals.hpp>
 #include <boost/function.hpp>
diff --git a/backends/twitter/Requests/HelpMessageRequest.h b/backends/twitter/Requests/HelpMessageRequest.h
index c0d86d2badfed06d0e2ba97c021ee866ab282e74..ce59a538745f3453e033712b68992491c5895c18 100644
--- a/backends/twitter/Requests/HelpMessageRequest.h
+++ b/backends/twitter/Requests/HelpMessageRequest.h
@@ -1,10 +1,9 @@
 #ifndef HELPMESSAGE_H
 #define HELPMESSAGE_H
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../libtwitcurl/twitcurl.h"
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include <string>
 #include <boost/function.hpp>
 #include <iostream>
diff --git a/backends/twitter/Requests/OAuthFlow.h b/backends/twitter/Requests/OAuthFlow.h
index cbf7d019fb06d1aae4dc6339342e1af9f342b280..75f9b657d86282bd5112c7437c533d35d3d65131 100644
--- a/backends/twitter/Requests/OAuthFlow.h
+++ b/backends/twitter/Requests/OAuthFlow.h
@@ -1,10 +1,10 @@
 #ifndef OAUTH_FLOW
 #define OAUTH_FLOW
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "../TwitterPlugin.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 
 #include <string>
 #include <iostream>
diff --git a/backends/twitter/Requests/PINExchangeProcess.h b/backends/twitter/Requests/PINExchangeProcess.h
index 8007c305e074bb378d70a52ea2ec4460f1b83454..be7b9ff8ca71a64fa25885f05de2d8abf642ff37 100644
--- a/backends/twitter/Requests/PINExchangeProcess.h
+++ b/backends/twitter/Requests/PINExchangeProcess.h
@@ -1,11 +1,10 @@
 #ifndef PIN_EXCHANGE
 #define PIN_EXCHANGE
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "../TwitterPlugin.h"
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 
 #include <string>
 #include <iostream>
diff --git a/backends/twitter/Requests/ProfileImageRequest.h b/backends/twitter/Requests/ProfileImageRequest.h
index f293a9bdbafc37e42306218cf1d8df7de685fe8e..f212219dbb8d2468dd0ba5f042429dbb8f4cffd1 100644
--- a/backends/twitter/Requests/ProfileImageRequest.h
+++ b/backends/twitter/Requests/ProfileImageRequest.h
@@ -1,10 +1,10 @@
 #ifndef PROFILEIMAGE_H
 #define PROFILEIMAGE_H
 
-#include "transport/threadpool.h"
 #include "../TwitterResponseParser.h"
-#include "transport/logging.h"
-#include "transport/config.h"
+#include "transport/ThreadPool.h"
+#include "transport/Logging.h"
+#include "transport/Config.h"
 #include <string>
 #include <boost/signals.hpp>
 #include <boost/function.hpp>
diff --git a/backends/twitter/Requests/RetweetRequest.h b/backends/twitter/Requests/RetweetRequest.h
index a096ca78ab0a5632d862b767c9afa28eebf292e9..24f568762dca2ea70118edb34bc9f609f60cd876 100644
--- a/backends/twitter/Requests/RetweetRequest.h
+++ b/backends/twitter/Requests/RetweetRequest.h
@@ -1,11 +1,10 @@
 #ifndef RETWEET_H
 #define RETWEET_H
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../TwitterResponseParser.h"
 #include "../libtwitcurl/twitcurl.h"
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include <boost/function.hpp>
 #include <string>
 #include <iostream>
diff --git a/backends/twitter/Requests/StatusUpdateRequest.h b/backends/twitter/Requests/StatusUpdateRequest.h
index 990571fbc48bfeffc3427f31dede4de642593301..32786ac8cb761f0ecd8edf573c9f7edb6f162150 100644
--- a/backends/twitter/Requests/StatusUpdateRequest.h
+++ b/backends/twitter/Requests/StatusUpdateRequest.h
@@ -1,11 +1,10 @@
 #ifndef STATUS_UPDATE
 #define STATUS_UPDATE
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "../TwitterResponseParser.h"
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include <boost/function.hpp>
 #include <string>
 #include <iostream>
diff --git a/backends/twitter/Requests/TimelineRequest.h b/backends/twitter/Requests/TimelineRequest.h
index 11b26f912c6b327d45a5cdcd97aca53f0ed02cf0..064ca8307da735954315c8f105b418bbb5135be7 100644
--- a/backends/twitter/Requests/TimelineRequest.h
+++ b/backends/twitter/Requests/TimelineRequest.h
@@ -1,10 +1,10 @@
 #ifndef TIMELINE_H
 #define TIMELINE_H
 
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
 #include "../libtwitcurl/twitcurl.h"
 #include "../TwitterResponseParser.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include <string>
 #include <iostream>
 #include <boost/function.hpp>
diff --git a/backends/twitter/TwitterPlugin.h b/backends/twitter/TwitterPlugin.h
index e33c1ed7ea587db3fe963960679b7dad69aedb79..b465563032f9dfab7acb3815b38bda3e72ea2ff6 100644
--- a/backends/twitter/TwitterPlugin.h
+++ b/backends/twitter/TwitterPlugin.h
@@ -1,14 +1,14 @@
 #ifndef TWITTER_PLUGIN
 #define TWITTER_PLUGIN
 
-#include "transport/config.h"
-#include "transport/networkplugin.h"
-#include "transport/logging.h"
-#include "transport/sqlite3backend.h"
-#include "transport/mysqlbackend.h"
-#include "transport/pqxxbackend.h"
-#include "transport/storagebackend.h"
-#include "transport/threadpool.h"
+#include "transport/Config.h"
+#include "transport/NetworkPlugin.h"
+#include "transport/Logging.h"
+#include "transport/SQLite3Backend.h"
+#include "transport/MySQLBackend.h"
+#include "transport/PQXXBackend.h"
+#include "transport/StorageBackend.h"
+#include "transport/ThreadPool.h"
 
 #include "Swiften/Swiften.h"
 #ifndef _WIN32
diff --git a/backends/twitter/TwitterResponseParser.cpp b/backends/twitter/TwitterResponseParser.cpp
index 77e8e8b1f9276e444f4ba0c68cc5fce77c58ba51..78ab1cdf89d7083d43cb4cae396dc1d62be5c3e0 100644
--- a/backends/twitter/TwitterResponseParser.cpp
+++ b/backends/twitter/TwitterResponseParser.cpp
@@ -1,5 +1,5 @@
 #include "TwitterResponseParser.h"
-#include "transport/logging.h"
+#include "transport/Logging.h"
 #include "boost/algorithm/string.hpp"
 #include <cctype>
 #include "boost/date_time/local_time/local_time.hpp"
diff --git a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h
index 785db1457f55408d110120eaebc004e61b1b32e8..2a5a9ffb378b269c2909056f57345a9a17e531f9 100644
--- a/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h
+++ b/include/Swiften/FileTransfer/CombinedOutgoingFileTransferManager.h
@@ -11,7 +11,7 @@
 
 #include <Swiften/JID/JID.h>
 
-#include "transport/presenceoracle.h"
+#include "transport/PresenceOracle.h"
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 #include <Swiften/Version.h>
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
diff --git a/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp b/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp
index c224a37a171b581f26577ba6edfbcfab3b27d8e5..b12708a180fdb55ea29bfe7e37595378ecba77dd 100644
--- a/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp
+++ b/include/Swiften/TLS/OpenSSL/OpenSSLServerContext.cpp
@@ -14,7 +14,7 @@
 #include <openssl/err.h>
 #include <openssl/pkcs12.h>
 
-#include "transport/logging.h"
+#include "transport/Logging.h"
 DEFINE_LOGGER(logger, "OpenSSLServerContext");
 
 
diff --git a/include/transport/admininterface.h b/include/transport/AdminInterface.h
similarity index 100%
rename from include/transport/admininterface.h
rename to include/transport/AdminInterface.h
diff --git a/include/transport/buddy.h b/include/transport/Buddy.h
similarity index 99%
rename from include/transport/buddy.h
rename to include/transport/Buddy.h
index c9fade98a730eda52c47383f211324c385660bf1..04dd5c0fe72029e154926f8cd5a85a0913f38491 100644
--- a/include/transport/buddy.h
+++ b/include/transport/Buddy.h
@@ -22,7 +22,6 @@
 
 #include <string>
 #include <algorithm>
-#include "transport/transport.h"
 #include "Swiften/Elements/VCard.h"
 #include "Swiften/Elements/Presence.h"
 
diff --git a/include/transport/config.h b/include/transport/Config.h
similarity index 100%
rename from include/transport/config.h
rename to include/transport/Config.h
diff --git a/include/transport/conversation.h b/include/transport/Conversation.h
similarity index 99%
rename from include/transport/conversation.h
rename to include/transport/Conversation.h
index 48e370d2d08b0afd3d8dd73c0aef50a3cf8e76c5..380e813a8fd7ef992f84fabcb8522f220dd5096f 100644
--- a/include/transport/conversation.h
+++ b/include/transport/Conversation.h
@@ -22,8 +22,7 @@
 
 #include <string>
 #include <algorithm>
-#include "transport/transport.h"
-
+#include <list>
 #include "Swiften/Elements/Message.h"
 #include "Swiften/Elements/Presence.h"
 
diff --git a/include/transport/conversationmanager.h b/include/transport/ConversationManager.h
similarity index 100%
rename from include/transport/conversationmanager.h
rename to include/transport/ConversationManager.h
diff --git a/include/transport/factory.h b/include/transport/Factory.h
similarity index 90%
rename from include/transport/factory.h
rename to include/transport/Factory.h
index 7df6e252873e851accae902abe2e3b59a5dc0944..9d24d1acaadfb9fc58b32992bc3fd757b74ada75 100644
--- a/include/transport/factory.h
+++ b/include/transport/Factory.h
@@ -22,12 +22,7 @@
 
 #include <string>
 #include <algorithm>
-#include "transport/transport.h"
-
 #include "Swiften/Elements/Message.h"
-#include "transport/conversation.h"
-#include "transport/buddy.h"
-#include "transport/storagebackend.h"
 
 namespace Transport {
 
@@ -35,6 +30,7 @@ class Conversation;
 class Buddy;
 class ConversationManager;
 class RosterManager;
+struct BuddyInfo;
 
 class Factory {
 	public:
diff --git a/include/transport/filetransfermanager.h b/include/transport/FileTransferManager.h
similarity index 100%
rename from include/transport/filetransfermanager.h
rename to include/transport/FileTransferManager.h
diff --git a/include/transport/frontend.h b/include/transport/Frontend.h
similarity index 100%
rename from include/transport/frontend.h
rename to include/transport/Frontend.h
diff --git a/include/transport/localbuddy.h b/include/transport/LocalBuddy.h
similarity index 97%
rename from include/transport/localbuddy.h
rename to include/transport/LocalBuddy.h
index ebe2c9458be415730e938fdfd42b71234a12d385..1f3481d8e68cad09d12b334e152c1b32be3dfc0b 100644
--- a/include/transport/localbuddy.h
+++ b/include/transport/LocalBuddy.h
@@ -23,8 +23,7 @@
 
 #include <string>
 #include <algorithm>
-#include "transport/buddy.h"
-#include "transport/rostermanager.h"
+#include "transport/Buddy.h"
 
 namespace Transport {
 
diff --git a/include/transport/logging.h b/include/transport/Logging.h
similarity index 100%
rename from include/transport/logging.h
rename to include/transport/Logging.h
diff --git a/include/transport/memoryreadbytestream.h b/include/transport/MemoryReadBytestream.h
similarity index 100%
rename from include/transport/memoryreadbytestream.h
rename to include/transport/MemoryReadBytestream.h
diff --git a/include/transport/memoryusage.h b/include/transport/MemoryUsage.h
similarity index 100%
rename from include/transport/memoryusage.h
rename to include/transport/MemoryUsage.h
diff --git a/include/transport/mysqlbackend.h b/include/transport/MySQLBackend.h
similarity index 98%
rename from include/transport/mysqlbackend.h
rename to include/transport/MySQLBackend.h
index 6073324079fe10fa79f6ce054595f730eef3146f..ad0f50a1c49b2c29dda832ca27e2da7371d06042 100644
--- a/include/transport/mysqlbackend.h
+++ b/include/transport/MySQLBackend.h
@@ -24,8 +24,8 @@
 
 #include <string>
 #include <map>
-#include "transport/storagebackend.h"
-#include "transport/config.h"
+#include "transport/StorageBackend.h"
+#include "transport/Config.h"
 #include "mysql.h"
 
 namespace Transport {
diff --git a/include/transport/networkplugin.h b/include/transport/NetworkPlugin.h
similarity index 100%
rename from include/transport/networkplugin.h
rename to include/transport/NetworkPlugin.h
diff --git a/include/transport/networkpluginserver.h b/include/transport/NetworkPluginServer.h
similarity index 96%
rename from include/transport/networkpluginserver.h
rename to include/transport/NetworkPluginServer.h
index 52461de919980914f51c95789c104b06bb7a8937..a579c70d831090f27d7d984fe49fac6aada08c65 100644
--- a/include/transport/networkpluginserver.h
+++ b/include/transport/NetworkPluginServer.h
@@ -20,6 +20,8 @@
 
 #pragma once
 
+#include "transport/FileTransferManager.h"
+
 #include <time.h>
 #include "Swiften/Presence/PresenceOracle.h"
 #include "Swiften/Disco/EntityCapsManager.h"
@@ -28,14 +30,17 @@
 #include "Swiften/Elements/ChatState.h"
 #include "Swiften/Elements/RosterItemPayload.h"
 #include "Swiften/Elements/VCard.h"
+#include "Swiften/Elements/Message.h"
+#include "Swiften/Elements/Presence.h"
+#include "Swiften/Elements/IQ.h"
+#include "Swiften/Network/Timer.h"
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
 #include "Swiften/Parser/XMPPParser.h"
 #include "Swiften/Parser/XMPPParserClient.h"
 #include "Swiften/Serializer/XMPPSerializer.h"
-#include "storagebackend.h"
-#include "transport/filetransfermanager.h"
 #include <Swiften/Version.h>
+#include <Swiften/FileTransfer/FileTransfer.h>
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 
 namespace Transport {
@@ -52,6 +57,8 @@ class RosterResponder;
 class BlockResponder;
 class DummyReadBytestream;
 class AdminInterface;
+class FileTransferManager;
+class FileTransfer;
 
 class NetworkPluginServer : Swift::XMPPParserClient {
 	public:
diff --git a/include/transport/pqxxbackend.h b/include/transport/PQXXBackend.h
similarity index 98%
rename from include/transport/pqxxbackend.h
rename to include/transport/PQXXBackend.h
index 5ec0c40904b07607e5c6366bc3a3e91a1f4c447a..de7937cda2f385cfc36f669e330acd2d5cfdbe5d 100644
--- a/include/transport/pqxxbackend.h
+++ b/include/transport/PQXXBackend.h
@@ -24,8 +24,8 @@
 
 #include <string>
 #include <map>
-#include "transport/storagebackend.h"
-#include "transport/config.h"
+#include "transport/StorageBackend.h"
+#include "transport/Config.h"
 #include <pqxx/pqxx>
 
 namespace Transport {
diff --git a/include/transport/presenceoracle.h b/include/transport/PresenceOracle.h
similarity index 100%
rename from include/transport/presenceoracle.h
rename to include/transport/PresenceOracle.h
diff --git a/include/transport/rostermanager.h b/include/transport/RosterManager.h
similarity index 100%
rename from include/transport/rostermanager.h
rename to include/transport/RosterManager.h
diff --git a/include/transport/rosterstorage.h b/include/transport/RosterStorage.h
similarity index 100%
rename from include/transport/rosterstorage.h
rename to include/transport/RosterStorage.h
diff --git a/include/transport/sqlite3backend.h b/include/transport/SQLite3Backend.h
similarity index 98%
rename from include/transport/sqlite3backend.h
rename to include/transport/SQLite3Backend.h
index 3c6411cacc8a40189bd24b8b9149f9335358d481..7e0dba53f37d848263bf591ca4f7a509b3cd8ea6 100644
--- a/include/transport/sqlite3backend.h
+++ b/include/transport/SQLite3Backend.h
@@ -24,12 +24,13 @@
 
 #include <string>
 #include <map>
-#include "transport/storagebackend.h"
-#include "transport/config.h"
+#include "transport/StorageBackend.h"
 #include "sqlite3.h"
 
 namespace Transport {
 
+class Config;
+
 /// Used to store transport data into SQLite3 database.
 class SQLite3Backend : public StorageBackend
 {
diff --git a/include/transport/storagebackend.h b/include/transport/StorageBackend.h
similarity index 100%
rename from include/transport/storagebackend.h
rename to include/transport/StorageBackend.h
diff --git a/include/transport/threadpool.h b/include/transport/ThreadPool.h
similarity index 98%
rename from include/transport/threadpool.h
rename to include/transport/ThreadPool.h
index 27cb1a083474a98bf4e37b9c4024dbfb419ada72..0758c232403da76851c0a2609e6b0814871f4d1a 100644
--- a/include/transport/threadpool.h
+++ b/include/transport/ThreadPool.h
@@ -6,7 +6,6 @@
 #include <boost/signals2/signal.hpp>
 #include <queue>
 #include <iostream>
-#include "transport/logging.h"
 #include "Swiften/EventLoop/EventLoop.h"
 
 
diff --git a/include/transport/transport.h b/include/transport/Transport.h
similarity index 100%
rename from include/transport/transport.h
rename to include/transport/Transport.h
diff --git a/include/transport/user.h b/include/transport/User.h
similarity index 96%
rename from include/transport/user.h
rename to include/transport/User.h
index 1f3c2a03a2b6cdbb35f22c1aa03de0211e2b483d..c845fa034edba3f3520719b3990aa2e0f27cf39c 100644
--- a/include/transport/user.h
+++ b/include/transport/User.h
@@ -21,11 +21,13 @@
 #pragma once
 
 #include <time.h>
-#include "Swiften/Disco/EntityCapsManager.h"
-#include "Swiften/Disco/EntityCapsProvider.h"
-#include "storagebackend.h"
+#include "transport/StorageBackend.h"
 #include <Swiften/FileTransfer/OutgoingFileTransfer.h>
 #include "Swiften/Elements/SpectrumErrorPayload.h"
+#include "Swiften/JID/JID.h"
+#include "Swiften/Elements/Presence.h"
+#include "Swiften/Elements/Message.h"
+#include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Network/Timer.h"
 #include "Swiften/Network/Connection.h"
 
@@ -36,7 +38,6 @@ class RosterManager;
 class ConversationManager;
 class UserManager;
 class PresenceOracle;
-struct UserInfo;
 
 /// Represents online XMPP user.
 class User {
diff --git a/include/transport/usermanager.h b/include/transport/UserManager.h
similarity index 99%
rename from include/transport/usermanager.h
rename to include/transport/UserManager.h
index ccd855e369ba1c3cce8949ba130b9089588457cc..d722970a1bf2ff148b5d41c0a5a315320613e1e6 100644
--- a/include/transport/usermanager.h
+++ b/include/transport/UserManager.h
@@ -22,9 +22,9 @@
 
 #include <string>
 #include <map>
-#include "transport/userregistry.h"
 #include "Swiften/Elements/Message.h"
 #include "Swiften/Elements/Presence.h"
+#include "Swiften/JID/JID.h"
 #include "Swiften/Disco/EntityCapsProvider.h"
 #include "Swiften/Elements/DiscoInfo.h"
 #include "Swiften/Elements/VCard.h"
@@ -38,6 +38,7 @@ class StorageBackend;
 class StorageResponder;
 class RosterResponder;
 class UserRegistration;
+class UserRegistry;
 
 /// Manages online XMPP Users.
 
diff --git a/include/transport/userregistration.h b/include/transport/UserRegistration.h
similarity index 100%
rename from include/transport/userregistration.h
rename to include/transport/UserRegistration.h
diff --git a/include/transport/userregistry.h b/include/transport/UserRegistry.h
similarity index 99%
rename from include/transport/userregistry.h
rename to include/transport/UserRegistry.h
index 58590a0185b2eb08126f48cb3a7ba729e77f5685..e4bfa299368684f2e0a750f4843d15bc2ab0096c 100644
--- a/include/transport/userregistry.h
+++ b/include/transport/UserRegistry.h
@@ -26,10 +26,11 @@
 #include "Swiften/Network/NetworkFactories.h"
 #include "Swiften/Network/Timer.h"
 #include "Swiften/Network/TimerFactory.h"
-#include "transport/config.h"
 
 namespace Transport {
 
+class Config;
+
 /// Validates passwords in Server mode.
 
 /// Normal login workflow could work like following:
diff --git a/include/transport/usersreconnecter.h b/include/transport/UsersReconnecter.h
similarity index 100%
rename from include/transport/usersreconnecter.h
rename to include/transport/UsersReconnecter.h
diff --git a/include/transport/util.h b/include/transport/Util.h
similarity index 97%
rename from include/transport/util.h
rename to include/transport/Util.h
index 490724bf37620b5d4567ef4386e2b6ecef1cf43f..13ca3df02fd1870252e4007b13cecb4ce4d21fce 100644
--- a/include/transport/util.h
+++ b/include/transport/Util.h
@@ -27,10 +27,11 @@
 #include "Swiften/StringCodecs/Base64.h"
 
 #include <boost/filesystem.hpp>
-#include "transport/config.h"
 
 namespace Transport {
 
+class Config;
+
 namespace Util {
 
 void createDirectories(Transport::Config *config, const boost::filesystem::path& ph);
diff --git a/plugin/cpp/CMakeLists.txt b/plugin/cpp/CMakeLists.txt
index 4a15ba50b0e1607e051a216aa2e3eb8ae62ea167..f5cce80f73a01694cea4889ec78b6c87f601e032 100644
--- a/plugin/cpp/CMakeLists.txt
+++ b/plugin/cpp/CMakeLists.txt
@@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB HEADERS ../include/transport/*.h)
 
-set(EXTRA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../src/memoryusage.cpp)
-set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/logging.cpp)
-set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/config.cpp)
-set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/util.cpp)
+set(EXTRA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../src/MemoryUsage.cpp)
+set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Logging.cpp)
+set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Config.cpp)
+set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Util.cpp)
 set(EXTRA_SOURCES ${EXTRA_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc)
 
 if (NOT WIN32)
diff --git a/include/transport/rosterresponder.h b/spectrum/src/frontends/xmpp/RosterResponder.h
similarity index 100%
rename from include/transport/rosterresponder.h
rename to spectrum/src/frontends/xmpp/RosterResponder.h
diff --git a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
index 54b1a08aac5eee6d6839ff637d73b7b3b8bba643..bdd217c8834c05e380c06260ca61946ed1a599f4 100644
--- a/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPFrontend.cpp
@@ -22,15 +22,15 @@
 #include "XMPPRosterManager.h"
 #include "XMPPUser.h"
 #include "XMPPUserManager.h"
-#include "transport/storagebackend.h"
 #include <boost/bind.hpp>
 #include <boost/smart_ptr/make_shared.hpp>
 #include <boost/algorithm/string/predicate.hpp>
-#include "transport/storagebackend.h"
-#include "transport/factory.h"
-#include "transport/userregistry.h"
-#include "transport/logging.h"
-#include "transport/config.h"
+#include "transport/StorageBackend.h"
+#include "transport/Factory.h"
+#include "transport/UserRegistry.h"
+#include "transport/Logging.h"
+#include "transport/Config.h"
+#include "transport/Transport.h"
 #include "discoitemsresponder.h"
 #include "storageparser.h"
 #ifdef _WIN32
diff --git a/spectrum/src/frontends/xmpp/XMPPFrontend.h b/spectrum/src/frontends/xmpp/XMPPFrontend.h
index 0516ab093acb2890812e768ad220f36b03f3d90f..f50561a955ca150bde17ae3ac6361cb17b0c74d7 100644
--- a/spectrum/src/frontends/xmpp/XMPPFrontend.h
+++ b/spectrum/src/frontends/xmpp/XMPPFrontend.h
@@ -20,8 +20,9 @@
 
 #pragma once
 
+#include "transport/Frontend.h"
+
 #include <vector>
-#include "transport/frontend.h"
 #include "Swiften/Server/Server.h"
 #include "Swiften/Disco/GetDiscoInfoRequest.h"
 #include "Swiften/Disco/EntityCapsManager.h"
diff --git a/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp b/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp
index eb063d2a1e473a72c0525e78867a4314d535736f..adea93b3be1814c9e12eb71612be2d81ad01e5ad 100644
--- a/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPRosterManager.cpp
@@ -21,16 +21,12 @@
 #include "XMPPRosterManager.h"
 #include "XMPPFrontend.h"
 #include "XMPPUser.h"
-#include "transport/rostermanager.h"
-#include "transport/rosterstorage.h"
-#include "transport/storagebackend.h"
-#include "transport/buddy.h"
-#include "transport/usermanager.h"
-#include "transport/buddy.h"
-#include "transport/user.h"
-#include "transport/logging.h"
-#include "transport/factory.h"
-#include "transport/presenceoracle.h"
+#include "transport/Buddy.h"
+#include "transport/User.h"
+#include "transport/Logging.h"
+#include "transport/Factory.h"
+#include "transport/PresenceOracle.h"
+#include "transport/Transport.h"
 #include "Swiften/Roster/SetRosterRequest.h"
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Elements/RosterItemPayload.h"
diff --git a/spectrum/src/frontends/xmpp/XMPPRosterManager.h b/spectrum/src/frontends/xmpp/XMPPRosterManager.h
index 6609ec6e5ec1ae43d5bd779eb259df44c054d6bf..4438697f75b14b74a4f5780538adb710343bf3be 100644
--- a/spectrum/src/frontends/xmpp/XMPPRosterManager.h
+++ b/spectrum/src/frontends/xmpp/XMPPRosterManager.h
@@ -20,17 +20,17 @@
 
 #pragma once
 
+#include "transport/RosterManager.h"
+
 #include <string>
 #include <algorithm>
 #include <map>
 #include <boost/pool/pool_alloc.hpp>
 #include <boost/pool/object_pool.hpp>
-// #include "rosterstorage.h"
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Queries/GenericRequest.h"
 #include "Swiften/Roster/SetRosterRequest.h"
 #include "Swiften/Elements/Presence.h"
-#include "transport/rostermanager.h"
 #include "Swiften/Network/Timer.h"
 
 namespace Transport {
diff --git a/spectrum/src/frontends/xmpp/XMPPUser.cpp b/spectrum/src/frontends/xmpp/XMPPUser.cpp
index 5a59d97dd9e597866c4cc24597d42b5ea55c387e..e0353b6dfac146f04abbc835bf30b7c3f1e26498 100644
--- a/spectrum/src/frontends/xmpp/XMPPUser.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPUser.cpp
@@ -20,12 +20,9 @@
 
 #include "XMPPUser.h"
 #include "XMPPFrontend.h"
-#include "transport/user.h"
-#include "transport/frontend.h"
-#include "transport/transport.h"
-#include "transport/rostermanager.h"
-#include "transport/usermanager.h"
-#include "transport/logging.h"
+#include "transport/Transport.h"
+#include "transport/UserManager.h"
+#include "transport/Logging.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Elements/SpectrumErrorPayload.h"
diff --git a/spectrum/src/frontends/xmpp/XMPPUser.h b/spectrum/src/frontends/xmpp/XMPPUser.h
index 5feb31a8d1de20446bd079ddbe4146e021b13976..9ecdc0ba3c3bf7169c7b5540d2fdb8a7f5d430a7 100644
--- a/spectrum/src/frontends/xmpp/XMPPUser.h
+++ b/spectrum/src/frontends/xmpp/XMPPUser.h
@@ -20,7 +20,8 @@
 
 #pragma once
 
-#include "transport/user.h"
+#include "transport/User.h"
+
 #include <time.h>
 #include "Swiften/Disco/EntityCapsManager.h"
 #include "Swiften/Disco/EntityCapsProvider.h"
diff --git a/spectrum/src/frontends/xmpp/XMPPUserManager.cpp b/spectrum/src/frontends/xmpp/XMPPUserManager.cpp
index eb29633e74cc8fa2fa6fdab4ffb1488b2684aa4a..19c4230863ac85d2eeadec94547c314ed103e05d 100644
--- a/spectrum/src/frontends/xmpp/XMPPUserManager.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPUserManager.cpp
@@ -20,18 +20,13 @@
 
 #include "XMPPUserManager.h"
 #include "XMPPUserRegistration.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/storagebackend.h"
-#include "transport/conversationmanager.h"
-#include "transport/rostermanager.h"
-#include "transport/userregistry.h"
-#include "transport/logging.h"
-#include "transport/frontend.h"
-#include "transport/presenceoracle.h"
+#include "transport/User.h"
+#include "transport/Transport.h"
+#include "transport/StorageBackend.h"
+#include "transport/Logging.h"
+#include "transport/Frontend.h"
 #include "storageresponder.h"
 #include "vcardresponder.h"
-#include "transport/frontend.h"
 #include "XMPPFrontend.h"
 #include "gatewayresponder.h"
 #include "adhocmanager.h"
diff --git a/spectrum/src/frontends/xmpp/XMPPUserManager.h b/spectrum/src/frontends/xmpp/XMPPUserManager.h
index 35e76d66aff8655ab73cb71ff72087c51f3ca23d..b63ce9051553b21ce97c6467dfbc80c8f0d745df 100644
--- a/spectrum/src/frontends/xmpp/XMPPUserManager.h
+++ b/spectrum/src/frontends/xmpp/XMPPUserManager.h
@@ -22,7 +22,7 @@
 
 #include <string>
 #include <map>
-#include "transport/usermanager.h"
+#include "transport/UserManager.h"
 #include "Swiften/Elements/Message.h"
 #include "Swiften/Elements/Presence.h"
 #include "Swiften/Disco/EntityCapsProvider.h"
diff --git a/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp b/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp
index 8995bf025d850a1ac8265e0e3a2d0f0cf9921ba5..2c08fd8a6bc608f2f565a4004b78dbf0c46efaf3 100644
--- a/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp
+++ b/spectrum/src/frontends/xmpp/XMPPUserRegistration.cpp
@@ -20,15 +20,15 @@
 
 #include "XMPPUserRegistration.h"
 #include "XMPPRosterManager.h"
-#include "transport/userregistration.h"
-#include "transport/usermanager.h"
-#include "transport/storagebackend.h"
-#include "transport/transport.h"
-#include "transport/rostermanager.h"
-#include "transport/user.h"
-#include "transport/logging.h"
+#include "transport/UserManager.h"
+#include "transport/StorageBackend.h"
+#include "transport/Transport.h"
+#include "transport/RosterManager.h"
+#include "transport/User.h"
+#include "transport/Logging.h"
 #include "formutils.h"
-#include "transport/buddy.h"
+#include "transport/Buddy.h"
+#include "transport/Config.h"
 #include "Swiften/Elements/ErrorPayload.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include "Swiften/Network/BoostNetworkFactories.h"
diff --git a/spectrum/src/frontends/xmpp/XMPPUserRegistration.h b/spectrum/src/frontends/xmpp/XMPPUserRegistration.h
index 0dfa13f1c87cc3ae73566fe4cea882fd271b4d7c..cd1dc8bd801e2d3383f8e498be0d31595bb9d0d5 100644
--- a/spectrum/src/frontends/xmpp/XMPPUserRegistration.h
+++ b/spectrum/src/frontends/xmpp/XMPPUserRegistration.h
@@ -25,7 +25,7 @@
 #include "Swiften/Elements/RosterPayload.h"
 #include <boost/signal.hpp>
 #include <Swiften/Version.h>
-#include "transport/userregistration.h"
+#include "transport/UserRegistration.h"
 #define HAVE_SWIFTEN_3  (SWIFTEN_VERSION >= 0x030000)
 
 namespace Transport {
diff --git a/spectrum/src/frontends/xmpp/adhoccommand.cpp b/spectrum/src/frontends/xmpp/adhoccommand.cpp
index 9e935aabe28ce8986cc2cba15ccb9b0f0384e393..d70fac4501effe6e555bb08358443b44f4f0e541 100644
--- a/spectrum/src/frontends/xmpp/adhoccommand.cpp
+++ b/spectrum/src/frontends/xmpp/adhoccommand.cpp
@@ -20,13 +20,9 @@
 
 #include "adhoccommand.h"
 #include "adhoccommandfactory.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/storagebackend.h"
-#include "transport/buddy.h"
-#include "transport/factory.h"
-#include "transport/user.h"
-#include "transport/logging.h"
+#include "transport/UserManager.h"
+#include "transport/StorageBackend.h"
+#include "transport/Logging.h"
 
 namespace Transport {
 
diff --git a/spectrum/src/frontends/xmpp/adhocmanager.cpp b/spectrum/src/frontends/xmpp/adhocmanager.cpp
index 6bdce6d005a5595c5d063e2b69f5232188dbee7c..d88beccf423313a6780fd8f2e12d7c03941db404 100644
--- a/spectrum/src/frontends/xmpp/adhocmanager.cpp
+++ b/spectrum/src/frontends/xmpp/adhocmanager.cpp
@@ -18,18 +18,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "XMPPFrontend.h"
-
 #include "adhocmanager.h"
 #include "adhoccommandfactory.h"
 #include "discoitemsresponder.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/buddy.h"
-#include "transport/factory.h"
-#include "transport/user.h"
-#include "transport/logging.h"
-#include "transport/storagebackend.h"
+#include "transport/UserManager.h"
+#include "transport/User.h"
+#include "transport/Logging.h"
+#include "transport/StorageBackend.h"
+#include "transport/Transport.h"
+#include "transport/Config.h"
+
+#include "XMPPFrontend.h"
 
 namespace Transport {
 
diff --git a/spectrum/src/frontends/xmpp/blockresponder.cpp b/spectrum/src/frontends/xmpp/blockresponder.cpp
index c680937b8b678d50ea8de0ea98fd0fd2cf1dfd05..0bb0416e6a424a00e09e9f97d6ef3191be18d132 100644
--- a/spectrum/src/frontends/xmpp/blockresponder.cpp
+++ b/spectrum/src/frontends/xmpp/blockresponder.cpp
@@ -24,11 +24,11 @@
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
 #include "BlockPayload.h"
-#include "transport/usermanager.h"
-#include "transport/user.h"
-#include "transport/buddy.h"
-#include "transport/rostermanager.h"
-#include "transport/logging.h"
+#include "transport/UserManager.h"
+#include "transport/User.h"
+#include "transport/Buddy.h"
+#include "transport/RosterManager.h"
+#include "transport/Logging.h"
 
 using namespace Swift;
 using namespace boost;
diff --git a/spectrum/src/frontends/xmpp/discoinforesponder.cpp b/spectrum/src/frontends/xmpp/discoinforesponder.cpp
index 4ea709dc72617d415edcacb1ce894a0574616399..897c272282cf1bc77752ac8f5c2f93f05cf364f9 100644
--- a/spectrum/src/frontends/xmpp/discoinforesponder.cpp
+++ b/spectrum/src/frontends/xmpp/discoinforesponder.cpp
@@ -26,8 +26,8 @@
 #include "Swiften/Disco/DiscoInfoResponder.h"
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Elements/DiscoInfo.h"
-#include "transport/config.h"
-#include "transport/logging.h"
+#include "transport/Config.h"
+#include "transport/Logging.h"
 #include "Swiften/Disco/CapsInfoGenerator.h"
 #include "XMPPFrontend.h"
 
diff --git a/spectrum/src/frontends/xmpp/discoitemsresponder.cpp b/spectrum/src/frontends/xmpp/discoitemsresponder.cpp
index da533307f54fada865498214b16e7bf4ac8329ba..c53e41a6d4e2bcdbab94138adfa2681decaa8a79 100644
--- a/spectrum/src/frontends/xmpp/discoitemsresponder.cpp
+++ b/spectrum/src/frontends/xmpp/discoitemsresponder.cpp
@@ -23,12 +23,12 @@
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
-#include "transport/transport.h"
-#include "transport/logging.h"
-#include "transport/config.h"
+#include "transport/Transport.h"
+#include "transport/Logging.h"
+#include "transport/Config.h"
 #include "discoinforesponder.h"
 #include "XMPPFrontend.h"
-#include "transport/frontend.h"
+#include "transport/Frontend.h"
 
 using namespace Swift;
 using namespace boost;
diff --git a/spectrum/src/frontends/xmpp/gatewayresponder.cpp b/spectrum/src/frontends/xmpp/gatewayresponder.cpp
index 825620a23a97f8a55fa02447278064afd39139e6..d42f828c0e84f3cb3750251b090b29883104a3dd 100644
--- a/spectrum/src/frontends/xmpp/gatewayresponder.cpp
+++ b/spectrum/src/frontends/xmpp/gatewayresponder.cpp
@@ -24,10 +24,11 @@
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Elements/RawXMLPayload.h"
-#include "transport/usermanager.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/logging.h"
+#include "transport/UserManager.h"
+#include "transport/User.h"
+#include "transport/Transport.h"
+#include "transport/Logging.h"
+#include "transport/Config.h"
 
 using namespace Swift;
 using namespace boost;
diff --git a/spectrum/src/frontends/xmpp/rosterresponder.cpp b/spectrum/src/frontends/xmpp/rosterresponder.cpp
index 988ce83d45aaefa097761ba0a07040b16ce0f01a..3cb39fbc75fbd0c3a8dbb7840e2b978fda25a8eb 100644
--- a/spectrum/src/frontends/xmpp/rosterresponder.cpp
+++ b/spectrum/src/frontends/xmpp/rosterresponder.cpp
@@ -18,19 +18,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/rosterresponder.h"
+#include "RosterResponder.h"
 
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
-#include "transport/user.h"
-#include "transport/usermanager.h"
-#include "transport/rostermanager.h"
-#include "transport/buddy.h"
-#include "transport/logging.h"
-#include "transport/factory.h"
+#include "transport/User.h"
+#include "transport/UserManager.h"
+#include "transport/RosterManager.h"
+#include "transport/Buddy.h"
+#include "transport/Logging.h"
+#include "transport/Factory.h"
+#include "transport/Transport.h"
 #include "XMPPFrontend.h"
-#include "transport/frontend.h"
+#include "transport/Frontend.h"
 
 using namespace Swift;
 using namespace boost;
diff --git a/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp b/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp
index cc93f34554cd504772d288ecdc9eef01e3c2af4e..f8b3e7d06476769a176a21612060b24f7749bdc8 100644
--- a/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp
+++ b/spectrum/src/frontends/xmpp/settingsadhoccommand.cpp
@@ -19,13 +19,12 @@
  */
 
 #include "settingsadhoccommand.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/buddy.h"
-#include "transport/factory.h"
-#include "transport/user.h"
-#include "transport/logging.h"
-#include "transport/storagebackend.h"
+#include "transport/UserManager.h"
+#include "transport/User.h"
+#include "transport/Logging.h"
+#include "transport/StorageBackend.h"
+#include "transport/Transport.h"
+#include "transport/Config.h"
 #include "formutils.h"
 
 
diff --git a/spectrum/src/frontends/xmpp/statsresponder.cpp b/spectrum/src/frontends/xmpp/statsresponder.cpp
index 445b76bb97491dfaedd7dd3a549e6d477ba3a4fd..594d7004baa665b5f84742f790c647a0fbb36d0e 100644
--- a/spectrum/src/frontends/xmpp/statsresponder.cpp
+++ b/spectrum/src/frontends/xmpp/statsresponder.cpp
@@ -23,18 +23,18 @@
 #include <iostream>
 #include <boost/bind.hpp>
 #include "Swiften/Queries/IQRouter.h"
-#include "transport/usermanager.h"
-#include "transport/user.h"
-#include "transport/buddy.h"
-#include "transport/rostermanager.h"
-#include "transport/memoryusage.h"
-#include "transport/conversationmanager.h"
-#include "transport/rostermanager.h"
-#include "transport/usermanager.h"
-#include "transport/networkpluginserver.h"
-#include "transport/logging.h"
-#include "transport/frontend.h"
+#include "transport/UserManager.h"
+#include "transport/User.h"
+#include "transport/RosterManager.h"
+#include "transport/MemoryUsage.h"
+#include "transport/NetworkPluginServer.h"
+#include "transport/Logging.h"
+#include "transport/Frontend.h"
+#include "transport/Transport.h"
+#include "transport/Buddy.h"
 #include "XMPPFrontend.h"
+#include <boost/foreach.hpp>
+#include <boost/lexical_cast.hpp>
 
 using namespace Swift;
 using namespace boost;
diff --git a/spectrum/src/frontends/xmpp/storageresponder.cpp b/spectrum/src/frontends/xmpp/storageresponder.cpp
index 607dca20687234556ebfd213d7c314ca69dab7a6..106ac0ac078d599fe7e077684faec7ae2fdfa2df 100644
--- a/spectrum/src/frontends/xmpp/storageresponder.cpp
+++ b/spectrum/src/frontends/xmpp/storageresponder.cpp
@@ -25,11 +25,10 @@
 #include "Swiften/Queries/IQRouter.h"
 #include "Swiften/Elements/RawXMLPayload.h"
 #include "Swiften/Elements/Storage.h"
-#include "Swiften/Elements/Storage.h"
 #include "Swiften/Serializer/PayloadSerializers/StorageSerializer.h"
-#include "transport/usermanager.h"
-#include "transport/user.h"
-#include "transport/logging.h"
+#include "transport/UserManager.h"
+#include "transport/User.h"
+#include "transport/Logging.h"
 
 using namespace Swift;
 using namespace boost;
diff --git a/spectrum/src/frontends/xmpp/vcardresponder.cpp b/spectrum/src/frontends/xmpp/vcardresponder.cpp
index cb197565dd2ba5842b3b2bd67a512fddcc4a09dd..a08ef92b4c374068fbcfb4ff484e015ad945180a 100644
--- a/spectrum/src/frontends/xmpp/vcardresponder.cpp
+++ b/spectrum/src/frontends/xmpp/vcardresponder.cpp
@@ -22,13 +22,13 @@
 
 #include <iostream>
 #include <boost/bind.hpp>
-#include "transport/user.h"
-#include "transport/buddy.h"
-#include "transport/usermanager.h"
-#include "transport/rostermanager.h"
-#include "transport/transport.h"
-#include "transport/logging.h"
+#include "transport/User.h"
+#include "transport/Buddy.h"
+#include "transport/UserManager.h"
+#include "transport/Transport.h"
+#include "transport/Logging.h"
 #include "Swiften/Queries/IQRouter.h"
+#include <boost/foreach.hpp>
 
 using namespace Swift;
 using namespace boost;
diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
index 042d0dd13b451e7091e534ed2ed41412b24940c5..bc4790b1291d0af6a5ba2a9fa73f621e1905347e 100644
--- a/spectrum/src/main.cpp
+++ b/spectrum/src/main.cpp
@@ -1,16 +1,17 @@
-#include "transport/config.h"
-#include "transport/transport.h"
-#include "transport/filetransfermanager.h"
-#include "transport/usermanager.h"
-#include "transport/sqlite3backend.h"
-#include "transport/mysqlbackend.h"
-#include "transport/pqxxbackend.h"
-#include "transport/userregistration.h"
-#include "transport/networkpluginserver.h"
-#include "transport/admininterface.h"
-#include "transport/usersreconnecter.h"
-#include "transport/util.h"
-#include "transport/logging.h"
+#include "transport/Config.h"
+#include "transport/Transport.h"
+#include "transport/FileTransferManager.h"
+#include "transport/UserManager.h"
+#include "transport/SQLite3Backend.h"
+#include "transport/MySQLBackend.h"
+#include "transport/PQXXBackend.h"
+#include "transport/UserRegistration.h"
+#include "transport/UserRegistry.h"
+#include "transport/NetworkPluginServer.h"
+#include "transport/AdminInterface.h"
+#include "transport/UsersReconnecter.h"
+#include "transport/Util.h"
+#include "transport/Logging.h"
 #include "frontends/xmpp/XMPPFrontend.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include "Swiften/Network/BoostNetworkFactories.h"
diff --git a/spectrum_manager/src/CMakeLists.txt b/spectrum_manager/src/CMakeLists.txt
index ab00811efebb8f2c9134fa840417e5d2803595f0..d0a7bdcf3526d8b12083cfc37d76957c0203fedb 100644
--- a/spectrum_manager/src/CMakeLists.txt
+++ b/spectrum_manager/src/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.6)
 FILE(GLOB SRC *.cpp *.c)
 
-ADD_EXECUTABLE(spectrum2_manager ${SRC} ../../src/config.cpp ../../src/util.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc)
+ADD_EXECUTABLE(spectrum2_manager ${SRC} ../../src/Config.cpp ../../src/Util.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc)
 
 ADD_DEPENDENCIES(spectrum2_manager pb)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
diff --git a/spectrum_manager/src/main.cpp b/spectrum_manager/src/main.cpp
index 3a267b0f380a7259133637984db5dfcadb528f28..63503ed1ffc3a1b00d6b9a1b9913a95e50725025 100644
--- a/spectrum_manager/src/main.cpp
+++ b/spectrum_manager/src/main.cpp
@@ -1,7 +1,7 @@
 #include "managerconfig.h"
 #include "methods.h"
 #include "server.h"
-#include "transport/config.h"
+#include "transport/Config.h"
 #include "transport/protocol.pb.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
diff --git a/spectrum_manager/src/methods.h b/spectrum_manager/src/methods.h
index df21ab4733c617c1080f27bf853f33e382c37699..6101acb5c432b208b2fddac0b83be1b6a9996b14 100644
--- a/spectrum_manager/src/methods.h
+++ b/spectrum_manager/src/methods.h
@@ -29,7 +29,7 @@
 #include <boost/signal.hpp>
 
 #include "managerconfig.h"
-#include "transport/config.h"
+#include "transport/Config.h"
 #include "transport/protocol.pb.h"
 #include "Swiften/Swiften.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
diff --git a/src/admininterface.cpp b/src/AdminInterface.cpp
similarity index 96%
rename from src/admininterface.cpp
rename to src/AdminInterface.cpp
index e20362c072b3f8a42c0fcabed070a38035b61730..49b9ac92b9b990451244d4638a08fb473a5cc6a1 100644
--- a/src/admininterface.cpp
+++ b/src/AdminInterface.cpp
@@ -18,20 +18,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/admininterface.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/storagebackend.h"
-#include "transport/conversationmanager.h"
-#include "transport/rostermanager.h"
-#include "transport/usermanager.h"
-#include "transport/networkpluginserver.h"
-#include "transport/logging.h"
-#include "transport/userregistration.h"
-#include "transport/frontend.h"
-#include "storageresponder.h"
-#include "transport/memoryusage.h"
+#include "transport/AdminInterface.h"
+#include "transport/User.h"
+#include "transport/Transport.h"
+#include "transport/StorageBackend.h"
+#include "transport/UserManager.h"
+#include "transport/NetworkPluginServer.h"
+#include "transport/Logging.h"
+#include "transport/UserRegistration.h"
+#include "transport/Frontend.h"
+#include "transport/MemoryUsage.h"
+#include "transport/Config.h"
+
 #include <boost/foreach.hpp>
+#include <boost/lexical_cast.hpp>
 
 namespace Transport {
 
diff --git a/src/buddy.cpp b/src/Buddy.cpp
similarity index 94%
rename from src/buddy.cpp
rename to src/Buddy.cpp
index 21951b54458cd9d90855449484cac812b68186d1..c877b6bb2c07ec6df317666bf84b068eedc9d957 100644
--- a/src/buddy.cpp
+++ b/src/Buddy.cpp
@@ -18,14 +18,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/buddy.h"
-#include "transport/rostermanager.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/usermanager.h"
-#include "transport/frontend.h"
+#include "transport/Buddy.h"
+#include "transport/RosterManager.h"
+#include "transport/User.h"
+#include "transport/Transport.h"
+#include "transport/UserManager.h"
+#include "transport/Frontend.h"
 
 #include "Swiften/Elements/VCardUpdate.h"
+#include "Swiften/Elements/Presence.h"
+
+#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
 
 namespace Transport {
 
diff --git a/src/config.cpp b/src/Config.cpp
similarity index 99%
rename from src/config.cpp
rename to src/Config.cpp
index 7df60defa0de9d2cc79239adad349d27659468b1..5d328d54a1513d712928931ea09c19acbc8ec2cb 100644
--- a/src/config.cpp
+++ b/src/Config.cpp
@@ -18,8 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/config.h"
+#include "transport/Config.h"
 #include <fstream>
+
 #ifdef _WIN32
 #include <direct.h>
 #define getcwd _getcwd
diff --git a/src/conversation.cpp b/src/Conversation.cpp
similarity index 97%
rename from src/conversation.cpp
rename to src/Conversation.cpp
index 25c17ae158289aaeb859b318e5f4ebfaac93e4eb..de7274403bc68106ac1ebd94f44e9c7652f2ca71 100644
--- a/src/conversation.cpp
+++ b/src/Conversation.cpp
@@ -19,14 +19,14 @@
  */
 
 #include <iostream>
-#include "transport/conversation.h"
-#include "transport/conversationmanager.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/buddy.h"
-#include "transport/rostermanager.h"
-#include "transport/frontend.h"
-#include "transport/config.h"
+#include "transport/Conversation.h"
+#include "transport/ConversationManager.h"
+#include "transport/User.h"
+#include "transport/Transport.h"
+#include "transport/Buddy.h"
+#include "transport/RosterManager.h"
+#include "transport/Frontend.h"
+#include "transport/Config.h"
 
 #include "Swiften/Elements/MUCItem.h"
 #include "Swiften/Elements/MUCOccupant.h"
diff --git a/src/conversationmanager.cpp b/src/ConversationManager.cpp
similarity index 95%
rename from src/conversationmanager.cpp
rename to src/ConversationManager.cpp
index e6f7e2dc2d151b6febe648c42c8d2d57505b9e25..beb0ba56c65d25ed64885a5524734a30fbba7e0a 100644
--- a/src/conversationmanager.cpp
+++ b/src/ConversationManager.cpp
@@ -18,13 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/conversationmanager.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/buddy.h"
-#include "transport/factory.h"
-#include "transport/user.h"
-#include "transport/logging.h"
+#include "transport/ConversationManager.h"
+#include "transport/Conversation.h"
+#include "transport/Buddy.h"
+#include "transport/Factory.h"
+#include "transport/User.h"
+#include "transport/Logging.h"
+#include "transport/Transport.h"
 #include "Swiften/Roster/SetRosterRequest.h"
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Elements/RosterItemPayload.h"
diff --git a/src/filetransfermanager.cpp b/src/FileTransferManager.cpp
similarity index 95%
rename from src/filetransfermanager.cpp
rename to src/FileTransferManager.cpp
index 007217abb281c8ac5d4b410883b149968c091ee4..c8c4e0b95743c5bc19dcf8f923fbfa9b42605930 100644
--- a/src/filetransfermanager.cpp
+++ b/src/FileTransferManager.cpp
@@ -18,12 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/filetransfermanager.h"
-#include "transport/transport.h"
-#include "transport/usermanager.h"
-#include "transport/user.h"
-#include "transport/buddy.h"
-#include "transport/logging.h"
+#include "transport/FileTransferManager.h"
+#include "transport/Transport.h"
+#include "transport/UserManager.h"
+#include "transport/User.h"
+#include "transport/Buddy.h"
+#include "transport/Logging.h"
 #include "Swiften/Network/ConnectionServerFactory.h"
 
 namespace Transport {
diff --git a/src/localbuddy.cpp b/src/LocalBuddy.cpp
similarity index 95%
rename from src/localbuddy.cpp
rename to src/LocalBuddy.cpp
index c4af3d0516b7d77c1ab12dc72ffca196e4e33f91..7fa2a4719ffbabbf49ea7bc222a9098c638b7a25 100644
--- a/src/localbuddy.cpp
+++ b/src/LocalBuddy.cpp
@@ -18,8 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/localbuddy.h"
-#include "transport/user.h"
+#include "transport/LocalBuddy.h"
+#include "transport/User.h"
+#include "transport/RosterManager.h"
+#include "transport/Transport.h"
 
 namespace Transport {
 
diff --git a/src/logging.cpp b/src/Logging.cpp
similarity index 98%
rename from src/logging.cpp
rename to src/Logging.cpp
index 61c584b016285cab37b9f6733665516f78bdd75d..36f5d5f12b7f3ea8e09514746f1e259524d299ce 100644
--- a/src/logging.cpp
+++ b/src/Logging.cpp
@@ -18,9 +18,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/logging.h"
-#include "transport/config.h"
-#include "transport/util.h"
+#include "transport/Logging.h"
+#include "transport/Config.h"
+#include "transport/Util.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 #include <iterator>
diff --git a/src/memoryreadbytestream.cpp b/src/MemoryReadByteStream.cpp
similarity index 98%
rename from src/memoryreadbytestream.cpp
rename to src/MemoryReadByteStream.cpp
index 83514ada59643f09000ee1de008846bdf79e53cf..5e61122f1e7daefdebc540eee9ce62abc49ccf72 100644
--- a/src/memoryreadbytestream.cpp
+++ b/src/MemoryReadByteStream.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/memoryreadbytestream.h"
+#include "transport/MemoryReadBytestream.h"
 #include <boost/foreach.hpp>
 
 namespace Transport {
diff --git a/src/memoryusage.cpp b/src/MemoryUsage.cpp
similarity index 99%
rename from src/memoryusage.cpp
rename to src/MemoryUsage.cpp
index 6f94743ee2c90fbf848f677ad80f36dc7ed2a0e3..e5383f6ecc9ae1580a973dc210af934a9722a3db 100644
--- a/src/memoryusage.cpp
+++ b/src/MemoryUsage.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/memoryusage.h"
+#include "transport/MemoryUsage.h"
 
 #include <iostream>
 #include <cstring>
diff --git a/src/mysqlbackend.cpp b/src/MySQLBackend.cpp
similarity index 99%
rename from src/mysqlbackend.cpp
rename to src/MySQLBackend.cpp
index 7d28d50622208164b5ed230d7d421d7a25fc7585..590305cbb939ed03a048bc0440dafbb78a5d2ce2 100644
--- a/src/mysqlbackend.cpp
+++ b/src/MySQLBackend.cpp
@@ -20,9 +20,9 @@
 
 #ifdef WITH_MYSQL
 
-#include "transport/mysqlbackend.h"
-#include "transport/util.h"
-#include "transport/logging.h"
+#include "transport/MySQLBackend.h"
+#include "transport/Util.h"
+#include "transport/Logging.h"
 #include <boost/bind.hpp>
 
 #define MYSQL_DB_VERSION 2
diff --git a/src/networkpluginserver.cpp b/src/NetworkPluginServer.cpp
similarity index 99%
rename from src/networkpluginserver.cpp
rename to src/NetworkPluginServer.cpp
index 3ebe7fb25b6f1809bfd871123076f7fc7330dc47..5f8ec2e8674819d20f265f241fc00de88a170a2d 100644
--- a/src/networkpluginserver.cpp
+++ b/src/NetworkPluginServer.cpp
@@ -18,23 +18,23 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/networkpluginserver.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/storagebackend.h"
-#include "transport/rostermanager.h"
-#include "transport/usermanager.h"
-#include "transport/conversationmanager.h"
-#include "transport/localbuddy.h"
-#include "transport/config.h"
-#include "transport/conversation.h"
-#include "transport/rosterresponder.h"
-#include "transport/memoryreadbytestream.h"
-#include "transport/logging.h"
-#include "transport/admininterface.h"
-#include "transport/frontend.h"
-#include "transport/factory.h"
-#include "blockresponder.h"
+#include "transport/NetworkPluginServer.h"
+#include "transport/User.h"
+#include "transport/Transport.h"
+#include "transport/RosterManager.h"
+#include "transport/UserManager.h"
+#include "transport/ConversationManager.h"
+#include "transport/LocalBuddy.h"
+#include "transport/Config.h"
+#include "transport/Conversation.h"
+#include "transport/MemoryReadBytestream.h"
+#include "transport/Logging.h"
+#include "transport/AdminInterface.h"
+#include "transport/Frontend.h"
+#include "transport/Factory.h"
+#include "transport/UserRegistry.h"
+#include "transport/protocol.pb.h"
+#include "transport/Util.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
 #include "Swiften/Network/BoostConnectionServer.h"
@@ -46,8 +46,6 @@
 #include "Swiften/Elements/DeliveryReceiptRequest.h"
 #include "Swiften/Elements/InvisiblePayload.h"
 #include "Swiften/Elements/SpectrumErrorPayload.h"
-#include "transport/protocol.pb.h"
-#include "transport/util.h"
 
 #include "boost/date_time/posix_time/posix_time.hpp"
 #include "boost/signal.hpp"
diff --git a/src/pqxxbackend.cpp b/src/PQXXBackend.cpp
similarity index 99%
rename from src/pqxxbackend.cpp
rename to src/PQXXBackend.cpp
index 73748d0866012e8269e42c1cf95d4b1a217f7abc..803d1dac9b0bec30ecb1a695cc554dbe46d3e6ad 100644
--- a/src/pqxxbackend.cpp
+++ b/src/PQXXBackend.cpp
@@ -20,8 +20,8 @@
 
 #ifdef WITH_PQXX
 
-#include "transport/pqxxbackend.h"
-#include "transport/util.h"
+#include "transport/PQXXBackend.h"
+#include "transport/Util.h"
 #include <boost/bind.hpp>
 #include "log4cxx/logger.h"
 
diff --git a/src/presenceoracle.cpp b/src/PresenceOracle.cpp
similarity index 98%
rename from src/presenceoracle.cpp
rename to src/PresenceOracle.cpp
index 642a1b6ee067daa2823392e552dc8bf79161b66f..31d74e7a7007bc4ee207264abba3141cccfce756 100644
--- a/src/presenceoracle.cpp
+++ b/src/PresenceOracle.cpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/presenceoracle.h"
-#include "transport/frontend.h"
+#include "transport/PresenceOracle.h"
+#include "transport/Frontend.h"
 #include "Swiften/Elements/MUCPayload.h"
 
 #include <boost/bind.hpp>
diff --git a/src/rostermanager.cpp b/src/RosterManager.cpp
similarity index 97%
rename from src/rostermanager.cpp
rename to src/RosterManager.cpp
index f0c23199350d5e5bbc0310d13c54db70efc50769..7c65c8172ed83bebb24c06fb5faf5c9396de40a3 100644
--- a/src/rostermanager.cpp
+++ b/src/RosterManager.cpp
@@ -18,22 +18,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/rostermanager.h"
-#include "transport/rosterstorage.h"
-#include "transport/storagebackend.h"
-#include "transport/buddy.h"
-#include "transport/usermanager.h"
-#include "transport/buddy.h"
-#include "transport/user.h"
-#include "transport/logging.h"
-#include "transport/frontend.h"
-#include "transport/factory.h"
-#include "Swiften/Roster/SetRosterRequest.h"
+#include "transport/RosterManager.h"
+#include "transport/RosterStorage.h"
+#include "transport/StorageBackend.h"
+#include "transport/Buddy.h"
+#include "transport/User.h"
+#include "transport/Logging.h"
+#include "transport/Frontend.h"
+#include "transport/Factory.h"
+#include "transport/Transport.h"
 #include "Swiften/Elements/RosterPayload.h"
 #include "Swiften/Elements/RosterItemPayload.h"
 #include "Swiften/Elements/RosterItemExchangePayload.h"
 #include "Swiften/Elements/Nickname.h"
-#include "Swiften/Queries/IQRouter.h"
 #include <boost/foreach.hpp>
 #include <boost/make_shared.hpp>
 
diff --git a/src/rosterstorage.cpp b/src/RosterStorage.cpp
similarity index 96%
rename from src/rosterstorage.cpp
rename to src/RosterStorage.cpp
index eacc205dc6d6573f387795071b10ce9c280ffa88..43fcde6126db6817e1bf3240404d848668115301 100644
--- a/src/rosterstorage.cpp
+++ b/src/RosterStorage.cpp
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/rosterstorage.h"
-#include "transport/buddy.h"
-#include "transport/user.h"
-#include "transport/storagebackend.h"
-#include "transport/logging.h"
+#include "transport/RosterStorage.h"
+#include "transport/Buddy.h"
+#include "transport/User.h"
+#include "transport/StorageBackend.h"
+#include "transport/Logging.h"
+#include "transport/Transport.h"
 
 #include "Swiften/Network/NetworkFactories.h"
 
diff --git a/src/sqlite3backend.cpp b/src/SQLite3Backend.cpp
similarity index 99%
rename from src/sqlite3backend.cpp
rename to src/SQLite3Backend.cpp
index 4290d9cf688d0e1c82e803a0d83ce17481811030..00c8b28f79d81672048fa44d900a0da8c736c6b1 100644
--- a/src/sqlite3backend.cpp
+++ b/src/SQLite3Backend.cpp
@@ -20,9 +20,10 @@
 
 #ifdef WITH_SQLITE
 
-#include "transport/sqlite3backend.h"
-#include "transport/util.h"
-#include "transport/logging.h"
+#include "transport/SQLite3Backend.h"
+#include "transport/Util.h"
+#include "transport/Logging.h"
+#include "transport/Config.h"
 #include <boost/bind.hpp>
 
 #define SQLITE_DB_VERSION 3
diff --git a/src/storagebackend.cpp b/src/StorageBackend.cpp
similarity index 93%
rename from src/storagebackend.cpp
rename to src/StorageBackend.cpp
index 7714df3632c8017e5a1bb15cbead9c51124d6369..bb91fa1d8aa91153a018f8266371c24d07110c01 100644
--- a/src/storagebackend.cpp
+++ b/src/StorageBackend.cpp
@@ -1,9 +1,9 @@
-#include "transport/storagebackend.h"
-#include "transport/config.h"
+#include "transport/StorageBackend.h"
+#include "transport/Config.h"
 
-#include "transport/sqlite3backend.h"
-#include "transport/mysqlbackend.h"
-#include "transport/pqxxbackend.h"
+#include "transport/SQLite3Backend.h"
+#include "transport/MySQLBackend.h"
+#include "transport/PQXXBackend.h"
 #include "Swiften/StringCodecs/Base64.h"
 
 
diff --git a/src/threadpool.cpp b/src/ThreadPool.cpp
similarity index 97%
rename from src/threadpool.cpp
rename to src/ThreadPool.cpp
index 23f6be5213fd21919c112323b6f6bdcee9ca9344..69c0fc748613e477eb8487bb4c7273ab733b049c 100644
--- a/src/threadpool.cpp
+++ b/src/ThreadPool.cpp
@@ -1,4 +1,6 @@
-#include "transport/threadpool.h"
+#include "transport/ThreadPool.h"
+#include "transport/Logging.h"
+
 DEFINE_LOGGER(logger, "ThreadPool")
 boost::signals2::signal< void (Thread*, int) > onWorkCompleted;
 
diff --git a/src/transport.cpp b/src/Transport.cpp
similarity index 95%
rename from src/transport.cpp
rename to src/Transport.cpp
index c2b2e571818425d531c96047fd26a91652eb24b4..59d8fb22cb6427b581e360574e5a6fbf118a569d 100644
--- a/src/transport.cpp
+++ b/src/Transport.cpp
@@ -19,11 +19,11 @@
  */
 
 
-#include "transport/transport.h"
-#include "transport/logging.h"
-#include "transport/frontend.h"
-#include "transport/presenceoracle.h"
-#include "transport/config.h"
+#include "transport/Transport.h"
+#include "transport/Logging.h"
+#include "transport/Frontend.h"
+#include "transport/PresenceOracle.h"
+#include "transport/Config.h"
 
 #include <boost/bind.hpp>
 #include <boost/algorithm/string/predicate.hpp>
diff --git a/src/user.cpp b/src/User.cpp
similarity index 97%
rename from src/user.cpp
rename to src/User.cpp
index 833bf4041ca972f530656cef1c9f5ee1e7b0a03f..8363440bb2648ace6cd3a9718fc6795460bf885b 100644
--- a/src/user.cpp
+++ b/src/User.cpp
@@ -18,18 +18,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/user.h"
-#include "transport/frontend.h"
-#include "transport/transport.h"
-#include "transport/storagebackend.h"
-#include "transport/rostermanager.h"
-#include "transport/usermanager.h"
-#include "transport/conversationmanager.h"
-#include "transport/presenceoracle.h"
-#include "transport/logging.h"
-#include "transport/factory.h"
+#include "transport/User.h"
+#include "transport/Frontend.h"
+#include "transport/Transport.h"
+#include "transport/RosterManager.h"
+#include "transport/UserManager.h"
+#include "transport/Conversation.h"
+#include "transport/Factory.h"
+#include "transport/ConversationManager.h"
+#include "transport/PresenceOracle.h"
+#include "transport/Logging.h"
+#include "transport/StorageBackend.h"
+#include "transport/Buddy.h"
 #include "Swiften/Server/ServerStanzaChannel.h"
-#include "Swiften/Elements/StreamError.h"
 #include "Swiften/Elements/MUCPayload.h"
 #include "Swiften/Elements/SpectrumErrorPayload.h"
 #include "Swiften/Elements/CapsInfo.h"
diff --git a/src/usermanager.cpp b/src/UserManager.cpp
similarity index 98%
rename from src/usermanager.cpp
rename to src/UserManager.cpp
index 00606e9e45e919563647fa72eabe0ec74a0a164d..5ad418f446fa9599cd3678f2a5ba80963b087a1a 100644
--- a/src/usermanager.cpp
+++ b/src/UserManager.cpp
@@ -18,17 +18,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/usermanager.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/storagebackend.h"
-#include "transport/conversationmanager.h"
-#include "transport/rostermanager.h"
-#include "transport/userregistry.h"
-#include "transport/logging.h"
-#include "transport/frontend.h"
-#include "transport/presenceoracle.h"
-#include "storageresponder.h"
+#include "transport/UserManager.h"
+#include "transport/User.h"
+#include "transport/Transport.h"
+#include "transport/StorageBackend.h"
+#include "transport/ConversationManager.h"
+#include "transport/RosterManager.h"
+#include "transport/UserRegistry.h"
+#include "transport/Logging.h"
+#include "transport/Frontend.h"
+#include "transport/PresenceOracle.h"
+#include "transport/Config.h"
 
 #include "Swiften/Server/ServerStanzaChannel.h"
 #include "Swiften/Elements/StreamError.h"
@@ -52,7 +52,6 @@ UserManager::UserManager(Component *component, UserRegistry *userRegistry, Stora
 	m_sentToBackend = 0;
 	m_component = component;
 	m_storageBackend = storageBackend;
-	m_storageResponder = NULL;
 	m_userRegistry = userRegistry;
 
 	component->onUserPresenceReceived.connect(bind(&UserManager::handlePresence, this, _1));
diff --git a/src/userregistration.cpp b/src/UserRegistration.cpp
similarity index 81%
rename from src/userregistration.cpp
rename to src/UserRegistration.cpp
index 4060de42261e9887e074e5256e3fed338a772efc..2f1f29c50b310ad46753d960555725db60b6436d 100644
--- a/src/userregistration.cpp
+++ b/src/UserRegistration.cpp
@@ -18,24 +18,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/userregistration.h"
-#include "transport/usermanager.h"
-#include "transport/storagebackend.h"
-#include "transport/transport.h"
-#include "transport/rostermanager.h"
-#include "transport/user.h"
-#include "transport/logging.h"
-#include "Swiften/Elements/ErrorPayload.h"
-#include "Swiften/EventLoop/SimpleEventLoop.h"
-#include "Swiften/Network/BoostNetworkFactories.h"
-#include "Swiften/Client/Client.h"
+#include "transport/UserRegistration.h"
+#include "transport/UserManager.h"
+#include "transport/StorageBackend.h"
+#include "transport/Transport.h"
+#include "transport/RosterManager.h"
+#include "transport/User.h"
+#include "transport/Logging.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/thread.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/regex.hpp> 
-#if HAVE_SWIFTEN_3
-#include <Swiften/Elements/Form.h>
-#endif
 
 using namespace Swift;
 
diff --git a/src/userregistry.cpp b/src/UserRegistry.cpp
similarity index 97%
rename from src/userregistry.cpp
rename to src/UserRegistry.cpp
index a740e898e77319482cf841fb5b5045c0a1892ed2..3aa09b9faa3afa5f770446882e6cf0952fa5107c 100644
--- a/src/userregistry.cpp
+++ b/src/UserRegistry.cpp
@@ -21,8 +21,9 @@
 #include <string>
 #include <map>
 #include "Swiften/Server/UserRegistry.h"
-#include "transport/userregistry.h"
-#include "transport/logging.h"
+#include "transport/UserRegistry.h"
+#include "transport/Config.h"
+#include "transport/Logging.h"
 
 namespace Transport {
 
diff --git a/src/usersreconnecter.cpp b/src/UsersReconnecter.cpp
similarity index 91%
rename from src/usersreconnecter.cpp
rename to src/UsersReconnecter.cpp
index 2ae0112918b31dbf28827f76a08bb327ffd5f3f5..67adac038721bf2934e8af377f152d51fef104e4 100644
--- a/src/usersreconnecter.cpp
+++ b/src/UsersReconnecter.cpp
@@ -18,16 +18,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/usersreconnecter.h"
+#include "transport/UsersReconnecter.h"
+#include "transport/StorageBackend.h"
+#include "transport/Transport.h"
+#include "transport/Logging.h"
+#include "transport/Frontend.h"
 
 #include <iostream>
 #include <boost/bind.hpp>
-#include "Swiften/Queries/IQRouter.h"
-#include "transport/storagebackend.h"
-#include "transport/transport.h"
-#include "transport/logging.h"
-#include "transport/frontend.h"
-
 #include "Swiften/Network/NetworkFactories.h"
 
 using namespace Swift;
diff --git a/src/util.cpp b/src/Util.cpp
similarity index 98%
rename from src/util.cpp
rename to src/Util.cpp
index b8c3adc590bfad40393e57da69843a0f7fc8ef96..16d1ed32930b9380c44d75abacf8896229268d33 100644
--- a/src/util.cpp
+++ b/src/Util.cpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include "transport/util.h"
-#include "transport/config.h"
+#include "transport/Util.h"
+#include "transport/Config.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 #include <iterator>
diff --git a/src/tests/basictest.cpp b/src/tests/basictest.cpp
index 190428e547892530e80c7e1becf7b14bbd799e50..952e6aa88797ede9ff3f8b4a2251e992f6518c06 100644
--- a/src/tests/basictest.cpp
+++ b/src/tests/basictest.cpp
@@ -1,13 +1,4 @@
 #include "basictest.h"
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/userregistration.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include "XMPPFrontend.h"
 #include "XMPPUserRegistration.h"
 #include "XMPPUserManager.h"
diff --git a/src/tests/basictest.h b/src/tests/basictest.h
index 5023eceb2dd7f4524660da51f688ff403c92efe0..7a6d484d44abd70219080236fe6b7cd8e3ced38d 100644
--- a/src/tests/basictest.h
+++ b/src/tests/basictest.h
@@ -23,20 +23,22 @@
 #include <vector>
 #include "Swiften/Swiften.h"
 #include "Swiften/Queries/SetResponder.h"
-#include "transport/conversation.h"
-#include "transport/conversationmanager.h"
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/userregistration.h"
+#include "transport/Conversation.h"
+#include "transport/ConversationManager.h"
+#include "transport/UserRegistry.h"
+#include "transport/Config.h"
+#include "transport/StorageBackend.h"
+#include "transport/User.h"
+#include "transport/Transport.h"
+#include "transport/UserManager.h"
+#include "transport/UserRegistration.h"
+#include "transport/RosterManager.h"
+#include "transport/NetworkPluginServer.h"
+#include "RosterResponder.h"
 #include "discoitemsresponder.h"
-#include "transport/localbuddy.h"
-#include "transport/storagebackend.h"
-#include "transport/factory.h"
+#include "transport/LocalBuddy.h"
+#include "transport/StorageBackend.h"
+#include "transport/Factory.h"
 #include "XMPPFrontend.h"
 #include "XMPPUserRegistration.h"
 
diff --git a/src/tests/component.cpp b/src/tests/component.cpp
index 3e9338f87287602918432e1c9f2ae8d0df8a7160..ccd2f6f71a9b32f69d9492a3b693629668d243dd 100644
--- a/src/tests/component.cpp
+++ b/src/tests/component.cpp
@@ -1,8 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
diff --git a/src/tests/config.cpp b/src/tests/config.cpp
index a53fc11f0cd99f502d1823648bd60ee306a94261..fea9ada11c53bb5d50a556af3ae635710c23c7a6 100644
--- a/src/tests/config.cpp
+++ b/src/tests/config.cpp
@@ -1,11 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
@@ -18,7 +10,6 @@
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "basictest.h"
 
-#include "transport/util.h"
 
 using namespace Transport;
 
diff --git a/src/tests/conversationmanager.cpp b/src/tests/conversationmanager.cpp
index 27e8b3c857e0fd8f6e1a29c93dabf602a86c5154..e2cb8c4824a962daf819cca6a25bb37121d80045 100644
--- a/src/tests/conversationmanager.cpp
+++ b/src/tests/conversationmanager.cpp
@@ -1,12 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/conversationmanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
diff --git a/src/tests/discoitemsresponder.cpp b/src/tests/discoitemsresponder.cpp
index e247f8430bafb39891f7e974a3359d429829ca02..622432991599703aac9282ab723c5d566fbce6f7 100644
--- a/src/tests/discoitemsresponder.cpp
+++ b/src/tests/discoitemsresponder.cpp
@@ -1,12 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/userregistration.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
diff --git a/src/tests/gatewayresponder.cpp b/src/tests/gatewayresponder.cpp
index 7d0fbe4bc47959b7c0f26276f7ff4b77b538fe56..50e1f51dbccd398c1771bc42c6b71f225ce6b8a5 100644
--- a/src/tests/gatewayresponder.cpp
+++ b/src/tests/gatewayresponder.cpp
@@ -1,12 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/rosterresponder.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include "gatewayresponder.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
diff --git a/src/tests/localbuddy.cpp b/src/tests/localbuddy.cpp
index 9fe00bdc7f64d255c03b7116c08f28ee758574fb..ca50ece1d0d29afdb8a57331845b7474bc223710 100644
--- a/src/tests/localbuddy.cpp
+++ b/src/tests/localbuddy.cpp
@@ -1,11 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
diff --git a/src/tests/networkpluginserver.cpp b/src/tests/networkpluginserver.cpp
index c7d9f21fdaa6cc099f0faf1609e7deb735621bc2..a6c34ddc26239b5b4652fb578c73291f6cf06c62 100644
--- a/src/tests/networkpluginserver.cpp
+++ b/src/tests/networkpluginserver.cpp
@@ -1,14 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/userregistration.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
-#include "transport/protocol.pb.h"
-#include "transport/networkpluginserver.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
@@ -24,6 +13,7 @@
 #include <cppunit/Test.h>
 #include <time.h>    // for clock()
 #include <stdint.h>
+#include "transport/protocol.pb.h"
 
 using namespace Transport;
 
diff --git a/src/tests/rostermanager.cpp b/src/tests/rostermanager.cpp
index 5b58a72204ec65abe1b64f4bd5cf9944036c1de0..9c94fe4749753b82274abdb9139b38f3f3c8541c 100644
--- a/src/tests/rostermanager.cpp
+++ b/src/tests/rostermanager.cpp
@@ -1,11 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
diff --git a/src/tests/rosterresponder.cpp b/src/tests/rosterresponder.cpp
index 0c2a84d6d268bb9891b3dd13a105164d35fe36ef..5c053c951c38e60495d829629caea77ae66e75dc 100644
--- a/src/tests/rosterresponder.cpp
+++ b/src/tests/rosterresponder.cpp
@@ -1,12 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/rosterresponder.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
diff --git a/src/tests/settingsadhoccommand.cpp b/src/tests/settingsadhoccommand.cpp
index 47ffb0aab1c06743be16142b55eab06d6ae9ea6a..3ac54dd9579be64e08f90fed8ea92c825d72052c 100644
--- a/src/tests/settingsadhoccommand.cpp
+++ b/src/tests/settingsadhoccommand.cpp
@@ -1,12 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/userregistration.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include "settingsadhoccommand.h"
 #include "adhocmanager.h"
 #include <cppunit/TestFixture.h>
diff --git a/src/tests/stringtreeparser.cpp b/src/tests/stringtreeparser.cpp
index e25b24d8fdf1c53ee962ee2cbf5feb2d279d1478..2e3b528d9d08011b6f4f8acbf59efa64b4820d9b 100644
--- a/src/tests/stringtreeparser.cpp
+++ b/src/tests/stringtreeparser.cpp
@@ -1,12 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/storagebackend.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
@@ -20,7 +11,7 @@
 #include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
 #include "basictest.h"
 
-#include "transport/util.h"
+#include "transport/Util.h"
 
 using namespace Transport;
 
diff --git a/src/tests/user.cpp b/src/tests/user.cpp
index 932827a0a5c272a39cfbe9d560123d5c88717f65..d6185d0cee02c149deeb28bfb1b18561fc30f2fd 100644
--- a/src/tests/user.cpp
+++ b/src/tests/user.cpp
@@ -1,11 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
diff --git a/src/tests/usermanager.cpp b/src/tests/usermanager.cpp
index 0bbc7fe42e69f6145f3eb37539c1f5bc6cfc4136..eb9130cc87ea4869aca343f7ceffb3af937fae29 100644
--- a/src/tests/usermanager.cpp
+++ b/src/tests/usermanager.cpp
@@ -1,11 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
diff --git a/src/tests/userregistration.cpp b/src/tests/userregistration.cpp
index cefa43b6a8f38e1e3091d5ef7bbc3acb98ea716c..1b71d86219a34a93a2b03ef292cde18bf0135693 100644
--- a/src/tests/userregistration.cpp
+++ b/src/tests/userregistration.cpp
@@ -1,12 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/userregistration.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
diff --git a/src/tests/userregistry.cpp b/src/tests/userregistry.cpp
index 83fb21a13f0683d575f9bd2b8682a3fa58bb03c0..e1d6f96792e18845fbc70457775e3b90a7e9c0b2 100644
--- a/src/tests/userregistry.cpp
+++ b/src/tests/userregistry.cpp
@@ -1,5 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/EventLoop/DummyEventLoop.h>
@@ -8,6 +6,7 @@
 #include <Swiften/Network/DummyConnectionServer.h>
 #include <Swiften/Network/ConnectionFactory.h>
 #include <Swiften/Network/DummyTimerFactory.h>
+#include "basictest.h"
 
 using namespace Transport;
 
diff --git a/src/tests/util.cpp b/src/tests/util.cpp
index 280dcd06deffc95cfa64bb6977628641fed13811..eaf6ebcd7c024c5c14f2f53674a5b2aeab1bc670 100644
--- a/src/tests/util.cpp
+++ b/src/tests/util.cpp
@@ -1,12 +1,3 @@
-#include "transport/userregistry.h"
-#include "transport/config.h"
-#include "transport/storagebackend.h"
-#include "transport/user.h"
-#include "transport/transport.h"
-#include "transport/storagebackend.h"
-#include "transport/conversation.h"
-#include "transport/usermanager.h"
-#include "transport/localbuddy.h"
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
 #include <Swiften/Swiften.h>
@@ -20,7 +11,6 @@
 #include "basictest.h"
 #include "transport/utf8.h"
 
-#include "transport/util.h"
 
 using namespace Transport;