From f825afa37a0ce8fa94636c74d9365802b3f9c64b Mon Sep 17 00:00:00 2001
From: emeric <itmfr@yahoo.fr>
Date: Tue, 23 Aug 2016 13:33:01 +0200
Subject: [PATCH] Moved util functions into utils

---
 src/Makefile.am                                     | 4 ++--
 src/av/AvInfo.cpp                                   | 2 +-
 src/av/AvTranscoder.cpp                             | 3 +--
 src/cover/CoverArtGrabber.cpp                       | 3 ++-
 src/database/Artist.cpp                             | 2 +-
 src/database/DatabaseHandler.cpp                    | 2 +-
 src/database/SearchFilter.cpp                       | 2 +-
 src/database/Track.cpp                              | 2 +-
 src/database/updater/DatabaseFeatureExtractor.cpp   | 5 +++--
 src/database/updater/DatabaseHighLevelCluster.cpp   | 4 ++--
 src/database/updater/DatabaseUpdater.cpp            | 8 +++++---
 src/feature/FeatureExtractor.cpp                    | 2 +-
 src/feature/FeatureStore.cpp                        | 4 ++--
 src/image/Image.cpp                                 | 3 ++-
 src/main/main.cpp                                   | 4 ++--
 src/metadata/AvFormat.cpp                           | 9 +++++----
 src/metadata/TagLibParser.cpp                       | 2 +-
 src/ui/LmsApplication.cpp                           | 2 +-
 src/ui/audio/AudioPlayer.cpp                        | 4 ++--
 src/ui/audio/desktop/DesktopAudio.cpp               | 3 ++-
 src/ui/audio/desktop/PlayQueue.cpp                  | 2 +-
 src/ui/audio/desktop/TableFilter.cpp                | 3 ++-
 src/ui/audio/desktop/TrackView.cpp                  | 2 +-
 src/ui/audio/mobile/ArtistSearchView.cpp            | 3 ++-
 src/ui/audio/mobile/MobileAudio.cpp                 | 7 ++++---
 src/ui/audio/mobile/MobilePlayQueue.cpp             | 2 +-
 src/ui/audio/mobile/PreviewSearchView.cpp           | 3 ++-
 src/ui/audio/mobile/ReleaseSearch.cpp               | 3 ++-
 src/ui/audio/mobile/ReleaseView.cpp                 | 3 ++-
 src/ui/audio/mobile/TrackSearch.cpp                 | 3 ++-
 src/ui/audio/mobile/TrackSearchView.cpp             | 3 ++-
 src/ui/resource/AvConvTranscodeStreamResource.cpp   | 2 +-
 src/ui/resource/ImageResource.cpp                   | 3 ++-
 src/ui/resource/TranscodeResource.cpp               | 3 ++-
 src/ui/settings/Settings.cpp                        | 3 ++-
 src/ui/settings/SettingsAccountFormView.cpp         | 2 +-
 src/ui/settings/SettingsAudioFormView.cpp           | 2 +-
 src/ui/settings/SettingsDatabaseFormView.cpp        | 3 ++-
 src/ui/settings/SettingsFirstConnectionFormView.cpp | 2 +-
 src/ui/settings/SettingsMediaDirectoryFormView.cpp  | 3 ++-
 src/ui/settings/SettingsUserFormView.cpp            | 2 +-
 src/ui/settings/SettingsUsers.cpp                   | 2 +-
 src/{config => utils}/Config.cpp                    | 6 ++++++
 src/{config => utils}/Config.hpp                    | 1 +
 src/{logger => utils}/Logger.cpp                    | 0
 src/{logger => utils}/Logger.hpp                    | 0
 src/utils/Path.cpp                                  | 2 +-
 47 files changed, 83 insertions(+), 57 deletions(-)
 rename src/{config => utils}/Config.cpp (96%)
 rename src/{config => utils}/Config.hpp (99%)
 rename src/{logger => utils}/Logger.cpp (100%)
 rename src/{logger => utils}/Logger.hpp (100%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 568fb488..6de2fd19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,6 @@ lms_SOURCES = \
 	$(srcdir)/main/main.cpp					\
 	$(srcdir)/av/AvInfo.cpp					\
 	$(srcdir)/av/AvTranscoder.cpp				\
-	$(srcdir)/config/Config.cpp				\
 	$(srcdir)/cover/CoverArtGrabber.cpp			\
 	$(srcdir)/database/Artist.cpp				\
 	$(srcdir)/database/DatabaseHandler.cpp			\
@@ -23,7 +22,6 @@ lms_SOURCES = \
 	$(srcdir)/feature/FeatureExtractor.cpp			\
 	$(srcdir)/feature/FeatureStore.cpp			\
 	$(srcdir)/image/Image.cpp				\
-	$(srcdir)/logger/Logger.cpp				\
 	$(srcdir)/metadata/AvFormat.cpp				\
 	$(srcdir)/metadata/TagLibParser.cpp			\
 	$(srcdir)/ui/LmsApplication.cpp				\
@@ -61,6 +59,8 @@ lms_SOURCES = \
 	$(srcdir)/ui/settings/SettingsMediaDirectoryFormView.cpp	\
 	$(srcdir)/ui/settings/SettingsUserFormView.cpp		\
 	$(srcdir)/ui/settings/SettingsUsers.cpp			\
+	$(srcdir)/utils/Config.cpp				\
+	$(srcdir)/utils/Logger.cpp				\
 	$(srcdir)/utils/Path.cpp				\
 	$(srcdir)/utils/Utils.cpp
 
diff --git a/src/av/AvInfo.cpp b/src/av/AvInfo.cpp
index ba320c0e..90aa10d4 100644
--- a/src/av/AvInfo.cpp
+++ b/src/av/AvInfo.cpp
@@ -19,7 +19,7 @@
 
 #include <array>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "AvInfo.hpp"
 
diff --git a/src/av/AvTranscoder.cpp b/src/av/AvTranscoder.cpp
index c970d334..3a82fcf8 100644
--- a/src/av/AvTranscoder.cpp
+++ b/src/av/AvTranscoder.cpp
@@ -20,8 +20,7 @@
 #include <mutex>
 
 #include "utils/Path.hpp"
-
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "AvTranscoder.hpp"
 
diff --git a/src/cover/CoverArtGrabber.cpp b/src/cover/CoverArtGrabber.cpp
index 5eed27fb..a43f3626 100644
--- a/src/cover/CoverArtGrabber.cpp
+++ b/src/cover/CoverArtGrabber.cpp
@@ -17,9 +17,10 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "logger/Logger.hpp"
 #include "av/AvInfo.hpp"
 
+#include "utils/Logger.hpp"
+
 #include "CoverArtGrabber.hpp"
 
 namespace {
diff --git a/src/database/Artist.cpp b/src/database/Artist.cpp
index b141986d..67f4f340 100644
--- a/src/database/Artist.cpp
+++ b/src/database/Artist.cpp
@@ -20,7 +20,7 @@
 #include "Types.hpp"
 #include "SqlQuery.hpp"
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 namespace Database
 {
diff --git a/src/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp
index c8d160ed..c159d378 100644
--- a/src/database/DatabaseHandler.cpp
+++ b/src/database/DatabaseHandler.cpp
@@ -30,7 +30,7 @@
 
 #include "Setting.hpp"
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "DatabaseHandler.hpp"
 
diff --git a/src/database/SearchFilter.cpp b/src/database/SearchFilter.cpp
index eafd86d5..194296e4 100644
--- a/src/database/SearchFilter.cpp
+++ b/src/database/SearchFilter.cpp
@@ -17,7 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "SearchFilter.hpp"
 
diff --git a/src/database/Track.cpp b/src/database/Track.cpp
index a423abbf..cfb3f8ea 100644
--- a/src/database/Track.cpp
+++ b/src/database/Track.cpp
@@ -21,7 +21,7 @@
 
 #include <Wt/Dbo/QueryModel>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "SqlQuery.hpp"
 
diff --git a/src/database/updater/DatabaseFeatureExtractor.cpp b/src/database/updater/DatabaseFeatureExtractor.cpp
index 8b44ecce..1052c6cc 100644
--- a/src/database/updater/DatabaseFeatureExtractor.cpp
+++ b/src/database/updater/DatabaseFeatureExtractor.cpp
@@ -17,11 +17,12 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "logger/Logger.hpp"
+#include "database/Setting.hpp"
 
 #include "feature/FeatureExtractor.hpp"
 #include "feature/FeatureStore.hpp"
-#include "database/Setting.hpp"
+
+#include "utils/Logger.hpp"
 
 #include "DatabaseFeatureExtractor.hpp"
 
diff --git a/src/database/updater/DatabaseHighLevelCluster.cpp b/src/database/updater/DatabaseHighLevelCluster.cpp
index 608963b1..995e106b 100644
--- a/src/database/updater/DatabaseHighLevelCluster.cpp
+++ b/src/database/updater/DatabaseHighLevelCluster.cpp
@@ -17,11 +17,11 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "logger/Logger.hpp"
-
 #include "database/Setting.hpp"
 #include "feature/FeatureStore.hpp"
 
+#include "utils/Logger.hpp"
+
 #include "DatabaseHighLevelCluster.hpp"
 
 namespace Database {
diff --git a/src/database/updater/DatabaseUpdater.cpp b/src/database/updater/DatabaseUpdater.cpp
index 36bc51e5..cf7920fa 100644
--- a/src/database/updater/DatabaseUpdater.cpp
+++ b/src/database/updater/DatabaseUpdater.cpp
@@ -23,14 +23,16 @@
 #include <boost/thread.hpp>
 #include <boost/asio/placeholders.hpp>
 
-#include "logger/Logger.hpp"
 #include "cover/CoverArtGrabber.hpp"
-#include "utils/Utils.hpp"
-#include "utils/Path.hpp"
 
 #include "database/Setting.hpp"
 #include "database/Types.hpp"
 
+#include "utils/Logger.hpp"
+#include "utils/Path.hpp"
+#include "utils/Utils.hpp"
+
+
 #include "DatabaseUpdater.hpp"
 
 namespace {
diff --git a/src/feature/FeatureExtractor.cpp b/src/feature/FeatureExtractor.cpp
index 914757af..7f9560cb 100644
--- a/src/feature/FeatureExtractor.cpp
+++ b/src/feature/FeatureExtractor.cpp
@@ -25,7 +25,7 @@
 
 #include <boost/property_tree/json_parser.hpp>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Path.hpp"
 
 #include "FeatureExtractor.hpp"
diff --git a/src/feature/FeatureStore.cpp b/src/feature/FeatureStore.cpp
index f58c51ab..3856bcf8 100644
--- a/src/feature/FeatureStore.cpp
+++ b/src/feature/FeatureStore.cpp
@@ -19,8 +19,8 @@
 
 #include <boost/property_tree/json_parser.hpp>
 
-#include "logger/Logger.hpp"
-#include "config/Config.hpp"
+#include "utils/Config.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Path.hpp"
 
 #include "FeatureStore.hpp"
diff --git a/src/image/Image.cpp b/src/image/Image.cpp
index d121d860..4ba865f2 100644
--- a/src/image/Image.cpp
+++ b/src/image/Image.cpp
@@ -16,7 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "logger/Logger.hpp"
+
+#include "utils/Logger.hpp"
 
 #include "Image.hpp"
 
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 5e9f4082..0282a8e1 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -21,10 +21,10 @@
 
 #include <Wt/WServer>
 
-#include "config/Config.hpp"
+#include "utils/Config.hpp"
 #include "av/AvInfo.hpp"
 #include "av/AvTranscoder.hpp"
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "image/Image.hpp"
 #include "feature/FeatureExtractor.hpp"
 
diff --git a/src/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp
index 81a95b26..da5fc3bb 100644
--- a/src/metadata/AvFormat.cpp
+++ b/src/metadata/AvFormat.cpp
@@ -17,14 +17,15 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AvFormat.hpp"
-
-#include "logger/Logger.hpp"
-#include "utils/Utils.hpp"
 #include <boost/algorithm/string.hpp>
 
 #include "av/AvInfo.hpp"
 
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
+
+#include "AvFormat.hpp"
+
 
 namespace MetaData
 {
diff --git a/src/metadata/TagLibParser.cpp b/src/metadata/TagLibParser.cpp
index 28f455e6..7afa6140 100644
--- a/src/metadata/TagLibParser.cpp
+++ b/src/metadata/TagLibParser.cpp
@@ -23,7 +23,7 @@
 #include <taglib/mpegfile.h>
 #include <taglib/id3v2tag.h>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "TagLibParser.hpp"
diff --git a/src/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp
index faa87640..d68c2f02 100644
--- a/src/ui/LmsApplication.cpp
+++ b/src/ui/LmsApplication.cpp
@@ -28,7 +28,7 @@
 #include <Wt/Auth/Identity>
 
 #include "config/config.h"
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "settings/Settings.hpp"
diff --git a/src/ui/audio/AudioPlayer.cpp b/src/ui/audio/AudioPlayer.cpp
index a1bd6f6e..bb487af9 100644
--- a/src/ui/audio/AudioPlayer.cpp
+++ b/src/ui/audio/AudioPlayer.cpp
@@ -17,7 +17,6 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #include <Wt/WText>
 #include <Wt/WAudio>
 #include <Wt/WImage>
@@ -25,7 +24,8 @@
 #include <Wt/WPushButton>
 
 #include "common/InputRange.hpp"
-#include "logger/Logger.hpp"
+
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"
diff --git a/src/ui/audio/desktop/DesktopAudio.cpp b/src/ui/audio/desktop/DesktopAudio.cpp
index 08c857a2..3241c623 100644
--- a/src/ui/audio/desktop/DesktopAudio.cpp
+++ b/src/ui/audio/desktop/DesktopAudio.cpp
@@ -31,7 +31,8 @@
 #include <Wt/WLineEdit>
 #include <Wt/WLabel>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "TableFilter.hpp"
diff --git a/src/ui/audio/desktop/PlayQueue.cpp b/src/ui/audio/desktop/PlayQueue.cpp
index 1d4c9c51..8eea4231 100644
--- a/src/ui/audio/desktop/PlayQueue.cpp
+++ b/src/ui/audio/desktop/PlayQueue.cpp
@@ -27,7 +27,7 @@
 #include <Wt/WFileResource>
 #include <Wt/WTheme>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
 #include "PlayQueue.hpp"
diff --git a/src/ui/audio/desktop/TableFilter.cpp b/src/ui/audio/desktop/TableFilter.cpp
index 3ef75edd..bedb27ab 100644
--- a/src/ui/audio/desktop/TableFilter.cpp
+++ b/src/ui/audio/desktop/TableFilter.cpp
@@ -20,7 +20,8 @@
 #include <Wt/WItemDelegate>
 
 #include "database/Types.hpp"
-#include "logger/Logger.hpp"
+
+#include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
 #include "TableFilter.hpp"
diff --git a/src/ui/audio/desktop/TrackView.cpp b/src/ui/audio/desktop/TrackView.cpp
index 3c3e9cc6..8695d858 100644
--- a/src/ui/audio/desktop/TrackView.cpp
+++ b/src/ui/audio/desktop/TrackView.cpp
@@ -22,7 +22,7 @@
 #include <Wt/WItemDelegate>
 #include <Wt/WBreak>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
 
 #include "LmsApplication.hpp"
diff --git a/src/ui/audio/mobile/ArtistSearchView.cpp b/src/ui/audio/mobile/ArtistSearchView.cpp
index 1fda1e0d..d05f00dd 100644
--- a/src/ui/audio/mobile/ArtistSearchView.cpp
+++ b/src/ui/audio/mobile/ArtistSearchView.cpp
@@ -20,7 +20,8 @@
 #include <Wt/WApplication>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "SearchUtils.hpp"
 
 #include "ArtistSearch.hpp"
diff --git a/src/ui/audio/mobile/MobileAudio.cpp b/src/ui/audio/mobile/MobileAudio.cpp
index f1078acb..ab08aa30 100644
--- a/src/ui/audio/mobile/MobileAudio.cpp
+++ b/src/ui/audio/mobile/MobileAudio.cpp
@@ -23,10 +23,8 @@
 #include <Wt/WTemplate>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
-#include "utils/Utils.hpp"
-
 #include "audio/AudioPlayer.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "PreviewSearchView.hpp"
@@ -39,6 +37,9 @@
 
 #include "MobilePlayQueue.hpp"
 
+#include "utils/Logger.hpp"
+#include "utils/Utils.hpp"
+
 #include "MobileAudio.hpp"
 
 
diff --git a/src/ui/audio/mobile/MobilePlayQueue.cpp b/src/ui/audio/mobile/MobilePlayQueue.cpp
index e74ddb9a..c14d0ff7 100644
--- a/src/ui/audio/mobile/MobilePlayQueue.cpp
+++ b/src/ui/audio/mobile/MobilePlayQueue.cpp
@@ -22,7 +22,7 @@
 #include <Wt/WText>
 #include <Wt/WPushButton>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "LmsApplication.hpp"
 
diff --git a/src/ui/audio/mobile/PreviewSearchView.cpp b/src/ui/audio/mobile/PreviewSearchView.cpp
index 38cb7a33..8a602e24 100644
--- a/src/ui/audio/mobile/PreviewSearchView.cpp
+++ b/src/ui/audio/mobile/PreviewSearchView.cpp
@@ -20,7 +20,8 @@
 #include <Wt/WApplication>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "SearchUtils.hpp"
 
 #include "ArtistSearch.hpp"
diff --git a/src/ui/audio/mobile/ReleaseSearch.cpp b/src/ui/audio/mobile/ReleaseSearch.cpp
index 07b34f2a..c45c83cc 100644
--- a/src/ui/audio/mobile/ReleaseSearch.cpp
+++ b/src/ui/audio/mobile/ReleaseSearch.cpp
@@ -22,7 +22,8 @@
 #include <Wt/WPushButton>
 #include <Wt/WTemplate>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "ReleaseSearch.hpp"
diff --git a/src/ui/audio/mobile/ReleaseView.cpp b/src/ui/audio/mobile/ReleaseView.cpp
index 27a6350c..93c1e5fc 100644
--- a/src/ui/audio/mobile/ReleaseView.cpp
+++ b/src/ui/audio/mobile/ReleaseView.cpp
@@ -22,8 +22,9 @@
 #include <Wt/WPushButton>
 #include <Wt/WTemplate>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "ReleaseView.hpp"
diff --git a/src/ui/audio/mobile/TrackSearch.cpp b/src/ui/audio/mobile/TrackSearch.cpp
index 79a2db33..db5d4427 100644
--- a/src/ui/audio/mobile/TrackSearch.cpp
+++ b/src/ui/audio/mobile/TrackSearch.cpp
@@ -22,8 +22,9 @@
 #include <Wt/WPushButton>
 #include <Wt/WTemplate>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "TrackSearch.hpp"
diff --git a/src/ui/audio/mobile/TrackSearchView.cpp b/src/ui/audio/mobile/TrackSearchView.cpp
index c7138452..bff89ee0 100644
--- a/src/ui/audio/mobile/TrackSearchView.cpp
+++ b/src/ui/audio/mobile/TrackSearchView.cpp
@@ -20,7 +20,8 @@
 #include <Wt/WApplication>
 #include <Wt/WText>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "SearchUtils.hpp"
 
 #include "TrackSearch.hpp"
diff --git a/src/ui/resource/AvConvTranscodeStreamResource.cpp b/src/ui/resource/AvConvTranscodeStreamResource.cpp
index b4e0b4f4..528d9cba 100644
--- a/src/ui/resource/AvConvTranscodeStreamResource.cpp
+++ b/src/ui/resource/AvConvTranscodeStreamResource.cpp
@@ -21,7 +21,7 @@
 #include <Wt/Http/Request>
 #include <Wt/Http/Response>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "AvConvTranscodeStreamResource.hpp"
 
diff --git a/src/ui/resource/ImageResource.cpp b/src/ui/resource/ImageResource.cpp
index e192dd0d..9b56846a 100644
--- a/src/ui/resource/ImageResource.cpp
+++ b/src/ui/resource/ImageResource.cpp
@@ -20,8 +20,9 @@
 #include <Wt/WApplication>
 #include <Wt/Http/Response>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 #include "utils/Utils.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "cover/CoverArtGrabber.hpp"
diff --git a/src/ui/resource/TranscodeResource.cpp b/src/ui/resource/TranscodeResource.cpp
index 8acef15c..f12c6fad 100644
--- a/src/ui/resource/TranscodeResource.cpp
+++ b/src/ui/resource/TranscodeResource.cpp
@@ -19,7 +19,8 @@
 
 #include <Wt/Http/Response>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "LmsApplication.hpp"
 
 #include "TranscodeResource.hpp"
diff --git a/src/ui/settings/Settings.cpp b/src/ui/settings/Settings.cpp
index 78d3838b..52e75376 100644
--- a/src/ui/settings/Settings.cpp
+++ b/src/ui/settings/Settings.cpp
@@ -29,7 +29,8 @@
 #include "SettingsMediaDirectories.hpp"
 #include "SettingsUsers.hpp"
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "database/Setting.hpp"
 #include "database/updater/DatabaseUpdater.hpp"
 
diff --git a/src/ui/settings/SettingsAccountFormView.cpp b/src/ui/settings/SettingsAccountFormView.cpp
index c7f265e8..bbffbd2a 100644
--- a/src/ui/settings/SettingsAccountFormView.cpp
+++ b/src/ui/settings/SettingsAccountFormView.cpp
@@ -26,7 +26,7 @@
 #include <Wt/WPushButton>
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"
diff --git a/src/ui/settings/SettingsAudioFormView.cpp b/src/ui/settings/SettingsAudioFormView.cpp
index e86e171d..91c49015 100644
--- a/src/ui/settings/SettingsAudioFormView.cpp
+++ b/src/ui/settings/SettingsAudioFormView.cpp
@@ -24,7 +24,7 @@
 #include <Wt/WComboBox>
 #include <Wt/WPushButton>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"
diff --git a/src/ui/settings/SettingsDatabaseFormView.cpp b/src/ui/settings/SettingsDatabaseFormView.cpp
index ffc15630..1379d0d1 100644
--- a/src/ui/settings/SettingsDatabaseFormView.cpp
+++ b/src/ui/settings/SettingsDatabaseFormView.cpp
@@ -30,7 +30,8 @@
 #include <Wt/WFormModel>
 #include <Wt/WStringListModel>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "database/Setting.hpp"
 
 #include "common/DirectoryValidator.hpp"
diff --git a/src/ui/settings/SettingsFirstConnectionFormView.cpp b/src/ui/settings/SettingsFirstConnectionFormView.cpp
index 7f0628a0..c6873079 100644
--- a/src/ui/settings/SettingsFirstConnectionFormView.cpp
+++ b/src/ui/settings/SettingsFirstConnectionFormView.cpp
@@ -24,7 +24,7 @@
 #include <Wt/WPushButton>
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"
diff --git a/src/ui/settings/SettingsMediaDirectoryFormView.cpp b/src/ui/settings/SettingsMediaDirectoryFormView.cpp
index 8d9c485a..a9e4a2f9 100644
--- a/src/ui/settings/SettingsMediaDirectoryFormView.cpp
+++ b/src/ui/settings/SettingsMediaDirectoryFormView.cpp
@@ -25,7 +25,8 @@
 #include <Wt/WComboBox>
 #include <Wt/WPushButton>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
+
 #include "database/MediaDirectory.hpp"
 
 #include "common/DirectoryValidator.hpp"
diff --git a/src/ui/settings/SettingsUserFormView.cpp b/src/ui/settings/SettingsUserFormView.cpp
index f3c45b69..fc3224dd 100644
--- a/src/ui/settings/SettingsUserFormView.cpp
+++ b/src/ui/settings/SettingsUserFormView.cpp
@@ -27,7 +27,7 @@
 #include <Wt/WPushButton>
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "common/Validators.hpp"
 #include "LmsApplication.hpp"
diff --git a/src/ui/settings/SettingsUsers.cpp b/src/ui/settings/SettingsUsers.cpp
index 00eff561..314a2a59 100644
--- a/src/ui/settings/SettingsUsers.cpp
+++ b/src/ui/settings/SettingsUsers.cpp
@@ -25,7 +25,7 @@
 
 #include <Wt/Auth/Identity>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "SettingsUserFormView.hpp"
 #include "LmsApplication.hpp"
diff --git a/src/config/Config.cpp b/src/utils/Config.cpp
similarity index 96%
rename from src/config/Config.cpp
rename to src/utils/Config.cpp
index 61c2fda2..9ff3a95e 100644
--- a/src/config/Config.cpp
+++ b/src/utils/Config.cpp
@@ -30,6 +30,12 @@ Config::Config()
 {
 }
 
+Config::~Config()
+{
+	if (_config)
+		delete _config;
+}
+
 Config&
 Config::instance()
 {
diff --git a/src/config/Config.hpp b/src/utils/Config.hpp
similarity index 99%
rename from src/config/Config.hpp
rename to src/utils/Config.hpp
index afa0863d..bd52e732 100644
--- a/src/config/Config.hpp
+++ b/src/utils/Config.hpp
@@ -43,6 +43,7 @@ class Config
 	private:
 
 		Config();
+		~Config();
 
 		libconfig::Config	*_config;
 };
diff --git a/src/logger/Logger.cpp b/src/utils/Logger.cpp
similarity index 100%
rename from src/logger/Logger.cpp
rename to src/utils/Logger.cpp
diff --git a/src/logger/Logger.hpp b/src/utils/Logger.hpp
similarity index 100%
rename from src/logger/Logger.hpp
rename to src/utils/Logger.hpp
diff --git a/src/utils/Path.cpp b/src/utils/Path.cpp
index b7685416..dfc49ba4 100644
--- a/src/utils/Path.cpp
+++ b/src/utils/Path.cpp
@@ -23,7 +23,7 @@
 #include <boost/crc.hpp>  // for boost::crc_32_type
 #include <boost/tokenizer.hpp>
 
-#include "logger/Logger.hpp"
+#include "utils/Logger.hpp"
 
 #include "Path.hpp"