27 files changed, 29 insertions, 30 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index efe4de4..d94094b 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -18,8 +18,7 @@
 #include <Swift/Controllers/UIInterfaces/UIFactory.h>
 #include "Swiften/Network/TimerFactory.h"
 #include "Swift/Controllers/BuildVersion.h"
-#include "Swift/Controllers/StoragesFactory.h"
-#include "Swiften/Client/Storages.h"
+#include "Swift/Controllers/Storages/StoragesFactory.h"
 #include "Swiften/VCards/VCardManager.h"
 #include "Swift/Controllers/Chat/UserSearchController.h"
 #include "Swift/Controllers/Chat/ChatsManager.h"
@@ -59,8 +58,8 @@
 #include "Swift/Controllers/UIEvents/RequestChatUIEvent.h"
 #include "Swift/Controllers/UIEvents/ToggleNotificationsUIEvent.h"
 #include "Swift/Controllers/UIEvents/JoinMUCUIEvent.h"
-#include "Swift/Controllers/CertificateStorageFactory.h"
-#include "Swift/Controllers/CertificateStorageTrustChecker.h"
+#include "Swift/Controllers/Storages/CertificateStorageFactory.h"
+#include "Swift/Controllers/Storages/CertificateStorageTrustChecker.h"
 #include "Swiften/Network/NetworkFactories.h"
 #include <Swift/Controllers/ProfileController.h>
 #include <Swift/Controllers/ContactEditController.h>
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index bd18a3e..5b55892 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -50,9 +50,14 @@ if env["SCONS_STAGE"] == "build" :
 			"UIInterfaces/XMLConsoleWidget.cpp",
 			"UIInterfaces/ChatListWindow.cpp",
 			"PreviousStatusStore.cpp",
-			"CertificateStorageFactory.cpp",
-			"CertificateStorage.cpp",
-			"CertificateFileStorage.cpp",
+			"Storages/CertificateStorageFactory.cpp",
+			"Storages/CertificateStorage.cpp",
+			"Storages/CertificateFileStorage.cpp",
+			"Storages/AvatarFileStorage.cpp",
+			"Storages/FileStorages.cpp",
+			"Storages/RosterFileStorage.cpp",
+			"Storages/CapsFileStorage.cpp",
+			"Storages/VCardFileStorage.cpp",
 			"StatusUtil.cpp",
 			"Translator.cpp",
 			"XMPPURIController.cpp",
diff --git a/Swiften/Avatars/AvatarFileStorage.cpp b/Swift/Controllers/Storages/AvatarFileStorage.cpp
index 9effc16..288f6fd 100644
--- a/Swiften/Avatars/AvatarFileStorage.cpp
+++ b/Swift/Controllers/Storages/AvatarFileStorage.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include <Swiften/Avatars/AvatarFileStorage.h>
+#include <Swift/Controllers/Storages/AvatarFileStorage.h>
 
 #include <iostream>
 #include <boost/filesystem/fstream.hpp>
diff --git a/Swiften/Avatars/AvatarFileStorage.h b/Swift/Controllers/Storages/AvatarFileStorage.h
index b7e73f5..b7e73f5 100644
--- a/Swiften/Avatars/AvatarFileStorage.h
+++ b/Swift/Controllers/Storages/AvatarFileStorage.h
diff --git a/Swiften/Disco/CapsFileStorage.cpp b/Swift/Controllers/Storages/CapsFileStorage.cpp
index 81e9551..b7593fd 100644
--- a/Swiften/Disco/CapsFileStorage.cpp
+++ b/Swift/Controllers/Storages/CapsFileStorage.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Disco/CapsFileStorage.h"
+#include "Swift/Controllers/Storages/CapsFileStorage.h"
 
 #include <Swiften/Entity/GenericPayloadPersister.h>
 #include "Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.h"
diff --git a/Swiften/Disco/CapsFileStorage.h b/Swift/Controllers/Storages/CapsFileStorage.h
index b3757e0..b3757e0 100644
--- a/Swiften/Disco/CapsFileStorage.h
+++ b/Swift/Controllers/Storages/CapsFileStorage.h
diff --git a/Swift/Controllers/CertificateFileStorage.cpp b/Swift/Controllers/Storages/CertificateFileStorage.cpp
index cf924ee..31af949 100644
--- a/Swift/Controllers/CertificateFileStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateFileStorage.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include <Swift/Controllers/CertificateFileStorage.h>
+#include <Swift/Controllers/Storages/CertificateFileStorage.h>
 
 #include <iostream>
 #include <boost/filesystem/fstream.hpp>
diff --git a/Swift/Controllers/CertificateFileStorage.h b/Swift/Controllers/Storages/CertificateFileStorage.h
index 2b853ed..f7a60b9 100644
--- a/Swift/Controllers/CertificateFileStorage.h
+++ b/Swift/Controllers/Storages/CertificateFileStorage.h
@@ -8,7 +8,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include "Swift/Controllers/CertificateStorage.h"
+#include "Swift/Controllers/Storages/CertificateStorage.h"
 
 namespace Swift {
 	class CertificateFactory;
diff --git a/Swift/Controllers/CertificateFileStorageFactory.h b/Swift/Controllers/Storages/CertificateFileStorageFactory.h
index 7ed8287..b215165 100644
--- a/Swift/Controllers/CertificateFileStorageFactory.h
+++ b/Swift/Controllers/Storages/CertificateFileStorageFactory.h
@@ -6,8 +6,8 @@
 
 #pragma once
 
-#include <Swift/Controllers/CertificateStorageFactory.h>
-#include <Swift/Controllers/CertificateFileStorage.h>
+#include <Swift/Controllers/Storages/CertificateStorageFactory.h>
+#include <Swift/Controllers/Storages/CertificateFileStorage.h>
 
 namespace Swift {
 	class CertificateFactory;
diff --git a/Swift/Controllers/CertificateStorage.cpp b/Swift/Controllers/Storages/CertificateStorage.cpp
index 343fccd..ee942c0 100644
--- a/Swift/Controllers/CertificateStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateStorage.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swift/Controllers/CertificateStorage.h"
+#include "Swift/Controllers/Storages/CertificateStorage.h"
 
 namespace Swift {
 
diff --git a/Swift/Controllers/CertificateStorage.h b/Swift/Controllers/Storages/CertificateStorage.h
index f8c6fb5..f8c6fb5 100644
--- a/Swift/Controllers/CertificateStorage.h
+++ b/Swift/Controllers/Storages/CertificateStorage.h
diff --git a/Swift/Controllers/CertificateStorageFactory.cpp b/Swift/Controllers/Storages/CertificateStorageFactory.cpp
index 613a8c3..ba0179a 100644
--- a/Swift/Controllers/CertificateStorageFactory.cpp
+++ b/Swift/Controllers/Storages/CertificateStorageFactory.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include <Swift/Controllers/CertificateStorageFactory.h>
+#include <Swift/Controllers/Storages/CertificateStorageFactory.h>
 
 namespace Swift {
 
diff --git a/Swift/Controllers/CertificateStorageFactory.h b/Swift/Controllers/Storages/CertificateStorageFactory.h
index 5b85757..5b85757 100644
--- a/Swift/Controllers/CertificateStorageFactory.h
+++ b/Swift/Controllers/Storages/CertificateStorageFactory.h
diff --git a/Swift/Controllers/CertificateStorageTrustChecker.h b/Swift/Controllers/Storages/CertificateStorageTrustChecker.h
index f33287c..40838dd 100644
--- a/Swift/Controllers/CertificateStorageTrustChecker.h
+++ b/Swift/Controllers/Storages/CertificateStorageTrustChecker.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include <Swiften/TLS/CertificateTrustChecker.h>
-#include <Swift/Controllers/CertificateStorage.h>
+#include <Swift/Controllers/Storages/CertificateStorage.h>
 
 namespace Swift {
 	/**
diff --git a/Swiften/Client/FileStorages.cpp b/Swift/Controllers/Storages/FileStorages.cpp
index e6a93fd..6447099 100644
--- a/Swiften/Client/FileStorages.cpp
+++ b/Swift/Controllers/Storages/FileStorages.cpp
@@ -4,11 +4,11 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Client/FileStorages.h"
-#include "Swiften/VCards/VCardFileStorage.h"
-#include "Swiften/Avatars/AvatarFileStorage.h"
-#include "Swiften/Disco/CapsFileStorage.h"
-#include "Swiften/Roster/RosterFileStorage.h"
+#include "Swift/Controllers/Storages/FileStorages.h"
+#include "Swift/Controllers/Storages/VCardFileStorage.h"
+#include "Swift/Controllers/Storages/AvatarFileStorage.h"
+#include "Swift/Controllers/Storages/CapsFileStorage.h"
+#include "Swift/Controllers/Storages/RosterFileStorage.h"
 
 namespace Swift {
 
diff --git a/Swiften/Client/FileStorages.h b/Swift/Controllers/Storages/FileStorages.h
index 28df314..28df314 100644
--- a/Swiften/Client/FileStorages.h
+++ b/Swift/Controllers/Storages/FileStorages.h
diff --git a/Swift/Controllers/FileStoragesFactory.h b/Swift/Controllers/Storages/FileStoragesFactory.h
index bd7cdfb..75c65b7 100644
--- a/Swift/Controllers/FileStoragesFactory.h
+++ b/Swift/Controllers/Storages/FileStoragesFactory.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Swift/Controllers/StoragesFactory.h"
+#include "Swift/Controllers/Storages/StoragesFactory.h"
 #include "Swiften/Client/FileStorages.h"
 
 namespace Swift {
diff --git a/Swift/Controllers/MemoryStoragesFactory.h b/Swift/Controllers/Storages/MemoryStoragesFactory.h
index 8408e10..6648bcd 100644
--- a/Swift/Controllers/MemoryStoragesFactory.h
+++ b/Swift/Controllers/Storages/MemoryStoragesFactory.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Swift/Controllers/StoragesFactory.h"
+#include "Swift/Controllers/Storages/StoragesFactory.h"
 #include "Swiften/Client/MemoryStorages.h"
 
 namespace Swift {
diff --git a/Swiften/Roster/RosterFileStorage.cpp b/Swift/Controllers/Storages/RosterFileStorage.cpp
index 31b6c5e..73e582f 100644
--- a/Swiften/Roster/RosterFileStorage.cpp
+++ b/Swift/Controllers/Storages/RosterFileStorage.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include <Swiften/Roster/RosterFileStorage.h>
+#include <Swift/Controllers/Storages/RosterFileStorage.h>
 
 #include <Swiften/Entity/GenericPayloadPersister.h>
 #include <Swiften/Serializer/PayloadSerializers/RosterSerializer.h>
diff --git a/Swiften/Roster/RosterFileStorage.h b/Swift/Controllers/Storages/RosterFileStorage.h
index cb00969..cb00969 100644
--- a/Swiften/Roster/RosterFileStorage.h
+++ b/Swift/Controllers/Storages/RosterFileStorage.h
diff --git a/Swift/Controllers/StoragesFactory.h b/Swift/Controllers/Storages/StoragesFactory.h
index 441a4e9..441a4e9 100644
--- a/Swift/Controllers/StoragesFactory.h
+++ b/Swift/Controllers/Storages/StoragesFactory.h
diff --git a/Swiften/VCards/VCardFileStorage.cpp b/Swift/Controllers/Storages/VCardFileStorage.cpp
index 1b23635..4933d0c 100644
--- a/Swiften/VCards/VCardFileStorage.cpp
+++ b/Swift/Controllers/Storages/VCardFileStorage.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/VCards/VCardFileStorage.h"
+#include "Swift/Controllers/Storages/VCardFileStorage.h"
 
 #include <boost/filesystem/fstream.hpp>
 #include <boost/filesystem.hpp>
diff --git a/Swiften/VCards/VCardFileStorage.h b/Swift/Controllers/Storages/VCardFileStorage.h
index ba422f4..ba422f4 100644
--- a/Swiften/VCards/VCardFileStorage.h
+++ b/Swift/Controllers/Storages/VCardFileStorage.h
diff --git a/Swiften/Avatars/SConscript b/Swiften/Avatars/SConscript
index 46ae897..9c219a4 100644
--- a/Swiften/Avatars/SConscript
+++ b/Swiften/Avatars/SConscript
@@ -1,7 +1,6 @@
 Import("swiften_env")
 
 objects = swiften_env.SwiftenObject([
-			"AvatarFileStorage.cpp",
 			"VCardUpdateAvatarManager.cpp",
 			"VCardAvatarManager.cpp",
 			"OfflineAvatarManager.cpp",
diff --git a/Swiften/Disco/SConscript b/Swiften/Disco/SConscript
index a4b47db..434018a 100644
--- a/Swiften/Disco/SConscript
+++ b/Swiften/Disco/SConscript
@@ -7,7 +7,6 @@ objects = swiften_env.SwiftenObject([
 			"EntityCapsProvider.cpp",
 			"DummyEntityCapsProvider.cpp",
 			"CapsStorage.cpp",
-			"CapsFileStorage.cpp",
 			"ClientDiscoManager.cpp",
 			"DiscoInfoResponder.cpp",
 			"JIDDiscoInfoResponder.cpp",
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 5536b3f..41de5b5 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -58,7 +58,6 @@ if env["SCONS_STAGE"] == "build" :
 			"Client/ClientXMLTracer.cpp",
 			"Client/ClientSession.cpp",
 			"Client/MemoryStorages.cpp",
-			"Client/FileStorages.cpp",
 			"Client/NickResolver.cpp",
 			"Client/NickManager.cpp",
 			"Client/NickManagerImpl.cpp",
@@ -97,7 +96,6 @@ if env["SCONS_STAGE"] == "build" :
 			"Queries/Responders/SoftwareVersionResponder.cpp",
 			"Roster/RosterStorage.cpp",
 			"Roster/RosterMemoryStorage.cpp",
-			"Roster/RosterFileStorage.cpp",
 			"Roster/XMPPRoster.cpp",
 			"Roster/XMPPRosterImpl.cpp",
 			"Roster/XMPPRosterController.cpp",
diff --git a/Swiften/VCards/SConscript b/Swiften/VCards/SConscript
index e980ba3..c20c17d 100644
--- a/Swiften/VCards/SConscript
+++ b/Swiften/VCards/SConscript
@@ -3,6 +3,5 @@ Import("swiften_env")
 objects = swiften_env.SwiftenObject([
 			"VCardManager.cpp",
 			"VCardStorage.cpp",
-			"VCardFileStorage.cpp",
 		])
 swiften_env.Append(SWIFTEN_OBJECTS = [objects])