diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 7044f632..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,115 +0,0 @@
-
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
-
-SUBDIRS = test .
-
-bin_PROGRAMS = lms
-
-lms_SOURCES = \
-	$(top_srcdir)/main/main.cpp			\
-	$(top_srcdir)/av/CodecContext.cpp	\
-	$(top_srcdir)/av/Common.cpp		\
-	$(top_srcdir)/av/Dictionary.cpp		\
-	$(top_srcdir)/av/FormatContext.cpp	\
-	$(top_srcdir)/av/InputFormatContext.cpp	\
-	$(top_srcdir)/av/Stream.cpp		\
-	$(top_srcdir)/config/ConfigReader.cpp	\
-	$(top_srcdir)/cover/CoverArt.cpp	\
-	$(top_srcdir)/cover/CoverArtGrabber.cpp	\
-	$(top_srcdir)/database/Artist.cpp		\
-	$(top_srcdir)/database/Genre.cpp		\
-	$(top_srcdir)/database/Release.cpp		\
-	$(top_srcdir)/database/MediaDirectory.cpp	\
-	$(top_srcdir)/database/Track.cpp		\
-	$(top_srcdir)/database/DatabaseHandler.cpp	\
-	$(top_srcdir)/database/SqlQuery.cpp		\
-	$(top_srcdir)/database/Video.cpp		\
-	$(top_srcdir)/database/User.cpp			\
-	$(top_srcdir)/database-updater/DatabaseUpdater.cpp	\
-	$(top_srcdir)/database-updater/Checksum.cpp		\
-	$(top_srcdir)/logger/Logger.cpp			\
-	$(top_srcdir)/metadata/AvFormat.cpp		\
-	$(top_srcdir)/metadata/Utils.cpp		\
-	$(top_srcdir)/remote/server/Connection.cpp		\
-	$(top_srcdir)/remote/server/ConnectionManager.cpp	\
-	$(top_srcdir)/remote/server/AudioCollectionRequestHandler.cpp		\
-	$(top_srcdir)/remote/server/AuthRequestHandler.cpp	\
-	$(top_srcdir)/remote/server/MediaRequestHandler.cpp	\
-	$(top_srcdir)/remote/server/RequestHandler.cpp		\
-	$(top_srcdir)/remote/server/Server.cpp		\
-	$(top_srcdir)/service/ServiceManager.cpp		\
-	$(top_srcdir)/service/DatabaseUpdateService.cpp	\
-	$(top_srcdir)/service/UserInterfaceService.cpp		\
-	$(top_srcdir)/service/RemoteServerService.cpp	\
-	$(top_srcdir)/transcode/AvConvTranscoder.cpp	\
-	$(top_srcdir)/transcode/Format.cpp		\
-	$(top_srcdir)/transcode/Parameters.cpp		\
-	$(top_srcdir)/transcode/InputMediaFile.cpp	\
-	$(top_srcdir)/ui/LmsApplication.cpp	\
-	$(top_srcdir)/ui/LmsHome.cpp		\
-	$(top_srcdir)/ui/auth/LmsAuth.cpp			\
-	$(top_srcdir)/ui/audio/AudioWidget.cpp			\
-	$(top_srcdir)/ui/audio/AudioDatabaseWidget.cpp		\
-	$(top_srcdir)/ui/audio/AudioMediaPlayerWidget.cpp	\
-	$(top_srcdir)/ui/audio/SearchFilterWidget.cpp		\
-	$(top_srcdir)/ui/audio/TableFilterWidget.cpp		\
-	$(top_srcdir)/ui/audio/TrackWidget.cpp			\
-	$(top_srcdir)/ui/common/DirectoryValidator.cpp		\
-	$(top_srcdir)/ui/common/SessionData.cpp			\
-	$(top_srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp	\
-	$(top_srcdir)/ui/video/VideoWidget.cpp			\
-	$(top_srcdir)/ui/video/VideoDatabaseWidget.cpp		\
-	$(top_srcdir)/ui/video/VideoMediaPlayerWidget.cpp	\
-	$(top_srcdir)/ui/video/VideoParametersDialog.cpp	\
-	$(top_srcdir)/ui/settings/Settings.cpp			\
-	$(top_srcdir)/ui/settings/SettingsAccountFormView.cpp	\
-	$(top_srcdir)/ui/settings/SettingsAudioFormView.cpp	\
-	$(top_srcdir)/ui/settings/SettingsDatabaseFormView.cpp	\
-	$(top_srcdir)/ui/settings/SettingsFirstConnectionFormView.cpp	\
-	$(top_srcdir)/ui/settings/SettingsMediaDirectories.cpp	\
-	$(top_srcdir)/ui/settings/SettingsMediaDirectoryFormView.cpp	\
-	$(top_srcdir)/ui/settings/SettingsUserFormView.cpp	\
-	$(top_srcdir)/ui/settings/SettingsUsers.cpp
-
-nodist_lms_SOURCES = \
-	$(builddir)/auth.pb.cc			\
-	$(builddir)/auth.pb.h			\
-	$(builddir)/collection.pb.cc		\
-	$(builddir)/collection.pb.h		\
-	$(builddir)/common.pb.cc		\
-	$(builddir)/common.pb.h			\
-	$(builddir)/media.pb.cc			\
-	$(builddir)/media.pb.h			\
-	$(builddir)/messages.pb.cc		\
-	$(builddir)/messages.pb.h
-
-BUILT_SOURCES = \
-	$(builddir)/auth.pb.cc			\
-	$(builddir)/auth.pb.h			\
-	$(builddir)/collection.pb.cc		\
-	$(builddir)/collection.pb.h		\
-	$(builddir)/common.pb.cc		\
-	$(builddir)/common.pb.h			\
-	$(builddir)/media.pb.cc			\
-	$(builddir)/media.pb.h			\
-	$(builddir)/messages.pb.cc		\
-	$(builddir)/messages.pb.h
-
-MOSTLYCLEANFILES = \
-	$(builddir)/auth.pb.cc			\
-	$(builddir)/auth.pb.h			\
-	$(builddir)/collection.pb.cc		\
-	$(builddir)/collection.pb.h		\
-	$(builddir)/common.pb.cc		\
-	$(builddir)/common.pb.h			\
-	$(builddir)/media.pb.cc			\
-	$(builddir)/media.pb.h			\
-	$(builddir)/messages.pb.cc		\
-	$(builddir)/messages.pb.h
-
-
-%.pb.cc %.pb.h: $(top_srcdir)/remote/proto/%.proto
-	$(PROTOC) --proto_path=$(top_srcdir)/remote/proto/ --cpp_out=$(builddir)/ $^
-
-lms_CXXFLAGS=-DBOOST_LOG_DYN_LINK -std=c++11 -Wall -I$(top_srcdir)/boost/ -I$(top_srcdir)/ui -I$(top_srcdir)/remote
-
diff --git a/README b/README
index da6adb00..bf8be171 100644
--- a/README
+++ b/README
@@ -1,22 +1,21 @@
 LMS - Lightweight Media Server
 
 
-LMS is a free media streaming software, released on the GPLv3 license.
-It allows you to access your music and your videos using the following built-in services:
-- Web server
-- TCP/SSL server using a Protocol Buffers format (see https://github.com/google/protobuf/)
-
-LMS is written entirely in C++. Therefore, it is suitable to run on embedded devices, where space and/or memory are limited.
-Please note the media files are transcoded on-the-fly: this reduces compatibility issues but may need a lot of computation power, at least for HD videos.
+LMS is a free media streaming software, released under the GPLv3 license.
+It allows you to access your music and your videos using an https web interface.
 
 Features:
 - User management
-- "Winamp-style" interface
-- Audio/Video transcode (including downsampling), based on the libav project (see https://www.libav.org/)
+- Fast "Winamp-style" interface
+- Audio/Video transcode (including downsampling), based on the libav project (see https://www.libav.org/).
+- Custom API to access data using Protocol Buffers format over TCP/SSL (see https://github.com/google/protobuf/ and src/remote/proto)
 
 Please note LMS is still under development and will gain more features in the future.
 An android application is being developped as well.
 
+LMS is written entirely in C++. Therefore, it is suitable to run on embedded devices, where space and/or memory are limited.
+Please note some media files may require significant CPU usage to be trasncoded.
+
 I) DEPENCIES
 
 Debian packages:
@@ -50,7 +49,7 @@ Generate a self signed certificate:
 IV) RUNNING
 
 In the build directory:
-# ./lms lms.conf
+# ./src/lms lms.conf
 
 Create the lms.conf file using the etc/lms.sample.conf
 - "ui.resources.approot" has to refer to the ui/approot/ directory.
diff --git a/etc/lms.conf.sample b/conf/lms.conf.sample
similarity index 100%
rename from etc/lms.conf.sample
rename to conf/lms.conf.sample
diff --git a/configure.ac b/configure.ac
index 83ec5c01..5ab8fa94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,6 +142,7 @@ AC_CHECK_LIB([wt],
 
 
 AC_CONFIG_FILES([Makefile
+		 src/Makefile
 		 test/Makefile])
 
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 00000000..bb843b57
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,109 @@
+bin_PROGRAMS = lms
+
+lms_SOURCES = \
+	$(srcdir)/main/main.cpp			\
+	$(srcdir)/av/CodecContext.cpp	\
+	$(srcdir)/av/Common.cpp		\
+	$(srcdir)/av/Dictionary.cpp		\
+	$(srcdir)/av/FormatContext.cpp	\
+	$(srcdir)/av/InputFormatContext.cpp	\
+	$(srcdir)/av/Stream.cpp		\
+	$(srcdir)/config/ConfigReader.cpp	\
+	$(srcdir)/cover/CoverArt.cpp	\
+	$(srcdir)/cover/CoverArtGrabber.cpp	\
+	$(srcdir)/database/Artist.cpp		\
+	$(srcdir)/database/Genre.cpp		\
+	$(srcdir)/database/Release.cpp		\
+	$(srcdir)/database/MediaDirectory.cpp	\
+	$(srcdir)/database/Track.cpp		\
+	$(srcdir)/database/DatabaseHandler.cpp	\
+	$(srcdir)/database/SqlQuery.cpp		\
+	$(srcdir)/database/Video.cpp		\
+	$(srcdir)/database/User.cpp			\
+	$(srcdir)/database-updater/DatabaseUpdater.cpp	\
+	$(srcdir)/database-updater/Checksum.cpp		\
+	$(srcdir)/logger/Logger.cpp			\
+	$(srcdir)/metadata/AvFormat.cpp		\
+	$(srcdir)/metadata/Utils.cpp		\
+	$(srcdir)/remote/server/Connection.cpp		\
+	$(srcdir)/remote/server/ConnectionManager.cpp	\
+	$(srcdir)/remote/server/AudioCollectionRequestHandler.cpp		\
+	$(srcdir)/remote/server/AuthRequestHandler.cpp	\
+	$(srcdir)/remote/server/MediaRequestHandler.cpp	\
+	$(srcdir)/remote/server/RequestHandler.cpp		\
+	$(srcdir)/remote/server/Server.cpp		\
+	$(srcdir)/service/ServiceManager.cpp		\
+	$(srcdir)/service/DatabaseUpdateService.cpp	\
+	$(srcdir)/service/UserInterfaceService.cpp		\
+	$(srcdir)/service/RemoteServerService.cpp	\
+	$(srcdir)/transcode/AvConvTranscoder.cpp	\
+	$(srcdir)/transcode/Format.cpp		\
+	$(srcdir)/transcode/Parameters.cpp		\
+	$(srcdir)/transcode/InputMediaFile.cpp	\
+	$(srcdir)/ui/LmsApplication.cpp	\
+	$(srcdir)/ui/LmsHome.cpp		\
+	$(srcdir)/ui/auth/LmsAuth.cpp			\
+	$(srcdir)/ui/audio/AudioWidget.cpp			\
+	$(srcdir)/ui/audio/AudioDatabaseWidget.cpp		\
+	$(srcdir)/ui/audio/AudioMediaPlayerWidget.cpp	\
+	$(srcdir)/ui/audio/SearchFilterWidget.cpp		\
+	$(srcdir)/ui/audio/TableFilterWidget.cpp		\
+	$(srcdir)/ui/audio/TrackWidget.cpp			\
+	$(srcdir)/ui/common/DirectoryValidator.cpp		\
+	$(srcdir)/ui/common/SessionData.cpp			\
+	$(srcdir)/ui/resource/AvConvTranscodeStreamResource.cpp	\
+	$(srcdir)/ui/video/VideoWidget.cpp			\
+	$(srcdir)/ui/video/VideoDatabaseWidget.cpp		\
+	$(srcdir)/ui/video/VideoMediaPlayerWidget.cpp	\
+	$(srcdir)/ui/video/VideoParametersDialog.cpp	\
+	$(srcdir)/ui/settings/Settings.cpp			\
+	$(srcdir)/ui/settings/SettingsAccountFormView.cpp	\
+	$(srcdir)/ui/settings/SettingsAudioFormView.cpp	\
+	$(srcdir)/ui/settings/SettingsDatabaseFormView.cpp	\
+	$(srcdir)/ui/settings/SettingsFirstConnectionFormView.cpp	\
+	$(srcdir)/ui/settings/SettingsMediaDirectories.cpp	\
+	$(srcdir)/ui/settings/SettingsMediaDirectoryFormView.cpp	\
+	$(srcdir)/ui/settings/SettingsUserFormView.cpp	\
+	$(srcdir)/ui/settings/SettingsUsers.cpp
+
+nodist_lms_SOURCES = \
+	$(builddir)/auth.pb.cc			\
+	$(builddir)/auth.pb.h			\
+	$(builddir)/collection.pb.cc		\
+	$(builddir)/collection.pb.h		\
+	$(builddir)/common.pb.cc		\
+	$(builddir)/common.pb.h			\
+	$(builddir)/media.pb.cc			\
+	$(builddir)/media.pb.h			\
+	$(builddir)/messages.pb.cc		\
+	$(builddir)/messages.pb.h
+
+BUILT_SOURCES = \
+	$(builddir)/auth.pb.cc			\
+	$(builddir)/auth.pb.h			\
+	$(builddir)/collection.pb.cc		\
+	$(builddir)/collection.pb.h		\
+	$(builddir)/common.pb.cc		\
+	$(builddir)/common.pb.h			\
+	$(builddir)/media.pb.cc			\
+	$(builddir)/media.pb.h			\
+	$(builddir)/messages.pb.cc		\
+	$(builddir)/messages.pb.h
+
+MOSTLYCLEANFILES = \
+	$(builddir)/auth.pb.cc			\
+	$(builddir)/auth.pb.h			\
+	$(builddir)/collection.pb.cc		\
+	$(builddir)/collection.pb.h		\
+	$(builddir)/common.pb.cc		\
+	$(builddir)/common.pb.h			\
+	$(builddir)/media.pb.cc			\
+	$(builddir)/media.pb.h			\
+	$(builddir)/messages.pb.cc		\
+	$(builddir)/messages.pb.h
+
+%.pb.cc %.pb.h: $(srcdir)/remote/proto/%.proto
+	$(PROTOC) --proto_path=$(srcdir)/remote/proto/ --cpp_out=$(builddir)/ $^
+
+lms_CXXFLAGS=-DBOOST_LOG_DYN_LINK -std=c++11 -Wall -I$(top_srcdir) -I$(srcdir)/ui -I$(srcdir)/remote
+
diff --git a/av/Codec.cpp b/src/av/Codec.cpp
similarity index 100%
rename from av/Codec.cpp
rename to src/av/Codec.cpp
diff --git a/av/Codec.hpp b/src/av/Codec.hpp
similarity index 100%
rename from av/Codec.hpp
rename to src/av/Codec.hpp
diff --git a/av/CodecContext.cpp b/src/av/CodecContext.cpp
similarity index 100%
rename from av/CodecContext.cpp
rename to src/av/CodecContext.cpp
diff --git a/av/CodecContext.hpp b/src/av/CodecContext.hpp
similarity index 100%
rename from av/CodecContext.hpp
rename to src/av/CodecContext.hpp
diff --git a/av/Common.cpp b/src/av/Common.cpp
similarity index 100%
rename from av/Common.cpp
rename to src/av/Common.cpp
diff --git a/av/Common.hpp b/src/av/Common.hpp
similarity index 100%
rename from av/Common.hpp
rename to src/av/Common.hpp
diff --git a/av/Dictionary.cpp b/src/av/Dictionary.cpp
similarity index 100%
rename from av/Dictionary.cpp
rename to src/av/Dictionary.cpp
diff --git a/av/Dictionary.hpp b/src/av/Dictionary.hpp
similarity index 100%
rename from av/Dictionary.hpp
rename to src/av/Dictionary.hpp
diff --git a/av/FormatContext.cpp b/src/av/FormatContext.cpp
similarity index 100%
rename from av/FormatContext.cpp
rename to src/av/FormatContext.cpp
diff --git a/av/FormatContext.hpp b/src/av/FormatContext.hpp
similarity index 100%
rename from av/FormatContext.hpp
rename to src/av/FormatContext.hpp
diff --git a/av/InputFormatContext.cpp b/src/av/InputFormatContext.cpp
similarity index 100%
rename from av/InputFormatContext.cpp
rename to src/av/InputFormatContext.cpp
diff --git a/av/InputFormatContext.hpp b/src/av/InputFormatContext.hpp
similarity index 100%
rename from av/InputFormatContext.hpp
rename to src/av/InputFormatContext.hpp
diff --git a/av/Stream.cpp b/src/av/Stream.cpp
similarity index 100%
rename from av/Stream.cpp
rename to src/av/Stream.cpp
diff --git a/av/Stream.hpp b/src/av/Stream.hpp
similarity index 100%
rename from av/Stream.hpp
rename to src/av/Stream.hpp
diff --git a/config/ConfigReader.cpp b/src/config/ConfigReader.cpp
similarity index 100%
rename from config/ConfigReader.cpp
rename to src/config/ConfigReader.cpp
diff --git a/config/ConfigReader.hpp b/src/config/ConfigReader.hpp
similarity index 100%
rename from config/ConfigReader.hpp
rename to src/config/ConfigReader.hpp
diff --git a/cover/CoverArt.cpp b/src/cover/CoverArt.cpp
similarity index 100%
rename from cover/CoverArt.cpp
rename to src/cover/CoverArt.cpp
diff --git a/cover/CoverArt.hpp b/src/cover/CoverArt.hpp
similarity index 100%
rename from cover/CoverArt.hpp
rename to src/cover/CoverArt.hpp
diff --git a/cover/CoverArtGrabber.cpp b/src/cover/CoverArtGrabber.cpp
similarity index 100%
rename from cover/CoverArtGrabber.cpp
rename to src/cover/CoverArtGrabber.cpp
diff --git a/cover/CoverArtGrabber.hpp b/src/cover/CoverArtGrabber.hpp
similarity index 100%
rename from cover/CoverArtGrabber.hpp
rename to src/cover/CoverArtGrabber.hpp
diff --git a/database-updater/Checksum.cpp b/src/database-updater/Checksum.cpp
similarity index 100%
rename from database-updater/Checksum.cpp
rename to src/database-updater/Checksum.cpp
diff --git a/database-updater/Checksum.hpp b/src/database-updater/Checksum.hpp
similarity index 100%
rename from database-updater/Checksum.hpp
rename to src/database-updater/Checksum.hpp
diff --git a/database-updater/DatabaseUpdater.cpp b/src/database-updater/DatabaseUpdater.cpp
similarity index 100%
rename from database-updater/DatabaseUpdater.cpp
rename to src/database-updater/DatabaseUpdater.cpp
diff --git a/database-updater/DatabaseUpdater.hpp b/src/database-updater/DatabaseUpdater.hpp
similarity index 100%
rename from database-updater/DatabaseUpdater.hpp
rename to src/database-updater/DatabaseUpdater.hpp
diff --git a/database/Artist.cpp b/src/database/Artist.cpp
similarity index 100%
rename from database/Artist.cpp
rename to src/database/Artist.cpp
diff --git a/database/AudioTypes.hpp b/src/database/AudioTypes.hpp
similarity index 100%
rename from database/AudioTypes.hpp
rename to src/database/AudioTypes.hpp
diff --git a/database/DatabaseHandler.cpp b/src/database/DatabaseHandler.cpp
similarity index 100%
rename from database/DatabaseHandler.cpp
rename to src/database/DatabaseHandler.cpp
diff --git a/database/DatabaseHandler.hpp b/src/database/DatabaseHandler.hpp
similarity index 100%
rename from database/DatabaseHandler.hpp
rename to src/database/DatabaseHandler.hpp
diff --git a/database/Genre.cpp b/src/database/Genre.cpp
similarity index 100%
rename from database/Genre.cpp
rename to src/database/Genre.cpp
diff --git a/database/MediaDirectory.cpp b/src/database/MediaDirectory.cpp
similarity index 100%
rename from database/MediaDirectory.cpp
rename to src/database/MediaDirectory.cpp
diff --git a/database/MediaDirectory.hpp b/src/database/MediaDirectory.hpp
similarity index 100%
rename from database/MediaDirectory.hpp
rename to src/database/MediaDirectory.hpp
diff --git a/database/Release.cpp b/src/database/Release.cpp
similarity index 100%
rename from database/Release.cpp
rename to src/database/Release.cpp
diff --git a/database/SqlQuery.cpp b/src/database/SqlQuery.cpp
similarity index 100%
rename from database/SqlQuery.cpp
rename to src/database/SqlQuery.cpp
diff --git a/database/SqlQuery.hpp b/src/database/SqlQuery.hpp
similarity index 100%
rename from database/SqlQuery.hpp
rename to src/database/SqlQuery.hpp
diff --git a/database/Track.cpp b/src/database/Track.cpp
similarity index 100%
rename from database/Track.cpp
rename to src/database/Track.cpp
diff --git a/database/User.cpp b/src/database/User.cpp
similarity index 100%
rename from database/User.cpp
rename to src/database/User.cpp
diff --git a/database/User.hpp b/src/database/User.hpp
similarity index 100%
rename from database/User.hpp
rename to src/database/User.hpp
diff --git a/database/Video.cpp b/src/database/Video.cpp
similarity index 100%
rename from database/Video.cpp
rename to src/database/Video.cpp
diff --git a/database/VideoTypes.hpp b/src/database/VideoTypes.hpp
similarity index 100%
rename from database/VideoTypes.hpp
rename to src/database/VideoTypes.hpp
diff --git a/logger/Logger.cpp b/src/logger/Logger.cpp
similarity index 100%
rename from logger/Logger.cpp
rename to src/logger/Logger.cpp
diff --git a/logger/Logger.hpp b/src/logger/Logger.hpp
similarity index 100%
rename from logger/Logger.hpp
rename to src/logger/Logger.hpp
diff --git a/main/main.cpp b/src/main/main.cpp
similarity index 100%
rename from main/main.cpp
rename to src/main/main.cpp
diff --git a/metadata/AvFormat.cpp b/src/metadata/AvFormat.cpp
similarity index 100%
rename from metadata/AvFormat.cpp
rename to src/metadata/AvFormat.cpp
diff --git a/metadata/AvFormat.hpp b/src/metadata/AvFormat.hpp
similarity index 100%
rename from metadata/AvFormat.hpp
rename to src/metadata/AvFormat.hpp
diff --git a/metadata/Extractor.cpp b/src/metadata/Extractor.cpp
similarity index 100%
rename from metadata/Extractor.cpp
rename to src/metadata/Extractor.cpp
diff --git a/metadata/Extractor.hpp b/src/metadata/Extractor.hpp
similarity index 100%
rename from metadata/Extractor.hpp
rename to src/metadata/Extractor.hpp
diff --git a/metadata/MetaData.hpp b/src/metadata/MetaData.hpp
similarity index 100%
rename from metadata/MetaData.hpp
rename to src/metadata/MetaData.hpp
diff --git a/metadata/Utils.cpp b/src/metadata/Utils.cpp
similarity index 100%
rename from metadata/Utils.cpp
rename to src/metadata/Utils.cpp
diff --git a/metadata/Utils.hpp b/src/metadata/Utils.hpp
similarity index 100%
rename from metadata/Utils.hpp
rename to src/metadata/Utils.hpp
diff --git a/remote/messages/Header.hpp b/src/remote/messages/Header.hpp
similarity index 100%
rename from remote/messages/Header.hpp
rename to src/remote/messages/Header.hpp
diff --git a/remote/proto/auth.proto b/src/remote/proto/auth.proto
similarity index 100%
rename from remote/proto/auth.proto
rename to src/remote/proto/auth.proto
diff --git a/remote/proto/collection.proto b/src/remote/proto/collection.proto
similarity index 100%
rename from remote/proto/collection.proto
rename to src/remote/proto/collection.proto
diff --git a/remote/proto/common.proto b/src/remote/proto/common.proto
similarity index 100%
rename from remote/proto/common.proto
rename to src/remote/proto/common.proto
diff --git a/remote/proto/media.proto b/src/remote/proto/media.proto
similarity index 100%
rename from remote/proto/media.proto
rename to src/remote/proto/media.proto
diff --git a/remote/proto/messages.proto b/src/remote/proto/messages.proto
similarity index 100%
rename from remote/proto/messages.proto
rename to src/remote/proto/messages.proto
diff --git a/remote/server/AudioCollectionRequestHandler.cpp b/src/remote/server/AudioCollectionRequestHandler.cpp
similarity index 100%
rename from remote/server/AudioCollectionRequestHandler.cpp
rename to src/remote/server/AudioCollectionRequestHandler.cpp
diff --git a/remote/server/AudioCollectionRequestHandler.hpp b/src/remote/server/AudioCollectionRequestHandler.hpp
similarity index 100%
rename from remote/server/AudioCollectionRequestHandler.hpp
rename to src/remote/server/AudioCollectionRequestHandler.hpp
diff --git a/remote/server/AuthRequestHandler.cpp b/src/remote/server/AuthRequestHandler.cpp
similarity index 100%
rename from remote/server/AuthRequestHandler.cpp
rename to src/remote/server/AuthRequestHandler.cpp
diff --git a/remote/server/AuthRequestHandler.hpp b/src/remote/server/AuthRequestHandler.hpp
similarity index 100%
rename from remote/server/AuthRequestHandler.hpp
rename to src/remote/server/AuthRequestHandler.hpp
diff --git a/remote/server/Connection.cpp b/src/remote/server/Connection.cpp
similarity index 100%
rename from remote/server/Connection.cpp
rename to src/remote/server/Connection.cpp
diff --git a/remote/server/Connection.hpp b/src/remote/server/Connection.hpp
similarity index 100%
rename from remote/server/Connection.hpp
rename to src/remote/server/Connection.hpp
diff --git a/remote/server/ConnectionManager.cpp b/src/remote/server/ConnectionManager.cpp
similarity index 100%
rename from remote/server/ConnectionManager.cpp
rename to src/remote/server/ConnectionManager.cpp
diff --git a/remote/server/ConnectionManager.hpp b/src/remote/server/ConnectionManager.hpp
similarity index 100%
rename from remote/server/ConnectionManager.hpp
rename to src/remote/server/ConnectionManager.hpp
diff --git a/remote/server/MediaRequestHandler.cpp b/src/remote/server/MediaRequestHandler.cpp
similarity index 100%
rename from remote/server/MediaRequestHandler.cpp
rename to src/remote/server/MediaRequestHandler.cpp
diff --git a/remote/server/MediaRequestHandler.hpp b/src/remote/server/MediaRequestHandler.hpp
similarity index 100%
rename from remote/server/MediaRequestHandler.hpp
rename to src/remote/server/MediaRequestHandler.hpp
diff --git a/remote/server/RequestHandler.cpp b/src/remote/server/RequestHandler.cpp
similarity index 100%
rename from remote/server/RequestHandler.cpp
rename to src/remote/server/RequestHandler.cpp
diff --git a/remote/server/RequestHandler.hpp b/src/remote/server/RequestHandler.hpp
similarity index 100%
rename from remote/server/RequestHandler.hpp
rename to src/remote/server/RequestHandler.hpp
diff --git a/remote/server/Server.cpp b/src/remote/server/Server.cpp
similarity index 100%
rename from remote/server/Server.cpp
rename to src/remote/server/Server.cpp
diff --git a/remote/server/Server.hpp b/src/remote/server/Server.hpp
similarity index 100%
rename from remote/server/Server.hpp
rename to src/remote/server/Server.hpp
diff --git a/service/DatabaseUpdateService.cpp b/src/service/DatabaseUpdateService.cpp
similarity index 100%
rename from service/DatabaseUpdateService.cpp
rename to src/service/DatabaseUpdateService.cpp
diff --git a/service/DatabaseUpdateService.hpp b/src/service/DatabaseUpdateService.hpp
similarity index 100%
rename from service/DatabaseUpdateService.hpp
rename to src/service/DatabaseUpdateService.hpp
diff --git a/service/RemoteServerService.cpp b/src/service/RemoteServerService.cpp
similarity index 100%
rename from service/RemoteServerService.cpp
rename to src/service/RemoteServerService.cpp
diff --git a/service/RemoteServerService.hpp b/src/service/RemoteServerService.hpp
similarity index 100%
rename from service/RemoteServerService.hpp
rename to src/service/RemoteServerService.hpp
diff --git a/service/Service.hpp b/src/service/Service.hpp
similarity index 100%
rename from service/Service.hpp
rename to src/service/Service.hpp
diff --git a/service/ServiceManager.cpp b/src/service/ServiceManager.cpp
similarity index 100%
rename from service/ServiceManager.cpp
rename to src/service/ServiceManager.cpp
diff --git a/service/ServiceManager.hpp b/src/service/ServiceManager.hpp
similarity index 100%
rename from service/ServiceManager.hpp
rename to src/service/ServiceManager.hpp
diff --git a/service/UserInterfaceService.cpp b/src/service/UserInterfaceService.cpp
similarity index 100%
rename from service/UserInterfaceService.cpp
rename to src/service/UserInterfaceService.cpp
diff --git a/service/UserInterfaceService.hpp b/src/service/UserInterfaceService.hpp
similarity index 100%
rename from service/UserInterfaceService.hpp
rename to src/service/UserInterfaceService.hpp
diff --git a/transcode/AvConvTranscoder.cpp b/src/transcode/AvConvTranscoder.cpp
similarity index 100%
rename from transcode/AvConvTranscoder.cpp
rename to src/transcode/AvConvTranscoder.cpp
diff --git a/transcode/AvConvTranscoder.hpp b/src/transcode/AvConvTranscoder.hpp
similarity index 100%
rename from transcode/AvConvTranscoder.hpp
rename to src/transcode/AvConvTranscoder.hpp
diff --git a/transcode/Format.cpp b/src/transcode/Format.cpp
similarity index 100%
rename from transcode/Format.cpp
rename to src/transcode/Format.cpp
diff --git a/transcode/Format.hpp b/src/transcode/Format.hpp
similarity index 100%
rename from transcode/Format.hpp
rename to src/transcode/Format.hpp
diff --git a/transcode/InputMediaFile.cpp b/src/transcode/InputMediaFile.cpp
similarity index 100%
rename from transcode/InputMediaFile.cpp
rename to src/transcode/InputMediaFile.cpp
diff --git a/transcode/InputMediaFile.hpp b/src/transcode/InputMediaFile.hpp
similarity index 100%
rename from transcode/InputMediaFile.hpp
rename to src/transcode/InputMediaFile.hpp
diff --git a/transcode/Parameters.cpp b/src/transcode/Parameters.cpp
similarity index 100%
rename from transcode/Parameters.cpp
rename to src/transcode/Parameters.cpp
diff --git a/transcode/Parameters.hpp b/src/transcode/Parameters.hpp
similarity index 100%
rename from transcode/Parameters.hpp
rename to src/transcode/Parameters.hpp
diff --git a/transcode/Stream.hpp b/src/transcode/Stream.hpp
similarity index 100%
rename from transcode/Stream.hpp
rename to src/transcode/Stream.hpp
diff --git a/ui/LmsApplication.cpp b/src/ui/LmsApplication.cpp
similarity index 100%
rename from ui/LmsApplication.cpp
rename to src/ui/LmsApplication.cpp
diff --git a/ui/LmsApplication.hpp b/src/ui/LmsApplication.hpp
similarity index 100%
rename from ui/LmsApplication.hpp
rename to src/ui/LmsApplication.hpp
diff --git a/ui/LmsHome.cpp b/src/ui/LmsHome.cpp
similarity index 100%
rename from ui/LmsHome.cpp
rename to src/ui/LmsHome.cpp
diff --git a/ui/LmsHome.hpp b/src/ui/LmsHome.hpp
similarity index 100%
rename from ui/LmsHome.hpp
rename to src/ui/LmsHome.hpp
diff --git a/ui/approot/templates.xml b/src/ui/approot/templates.xml
similarity index 100%
rename from ui/approot/templates.xml
rename to src/ui/approot/templates.xml
diff --git a/ui/audio/AudioDatabaseWidget.cpp b/src/ui/audio/AudioDatabaseWidget.cpp
similarity index 100%
rename from ui/audio/AudioDatabaseWidget.cpp
rename to src/ui/audio/AudioDatabaseWidget.cpp
diff --git a/ui/audio/AudioDatabaseWidget.hpp b/src/ui/audio/AudioDatabaseWidget.hpp
similarity index 100%
rename from ui/audio/AudioDatabaseWidget.hpp
rename to src/ui/audio/AudioDatabaseWidget.hpp
diff --git a/ui/audio/AudioMediaPlayerWidget.cpp b/src/ui/audio/AudioMediaPlayerWidget.cpp
similarity index 100%
rename from ui/audio/AudioMediaPlayerWidget.cpp
rename to src/ui/audio/AudioMediaPlayerWidget.cpp
diff --git a/ui/audio/AudioMediaPlayerWidget.hpp b/src/ui/audio/AudioMediaPlayerWidget.hpp
similarity index 100%
rename from ui/audio/AudioMediaPlayerWidget.hpp
rename to src/ui/audio/AudioMediaPlayerWidget.hpp
diff --git a/ui/audio/AudioWidget.cpp b/src/ui/audio/AudioWidget.cpp
similarity index 100%
rename from ui/audio/AudioWidget.cpp
rename to src/ui/audio/AudioWidget.cpp
diff --git a/ui/audio/AudioWidget.hpp b/src/ui/audio/AudioWidget.hpp
similarity index 100%
rename from ui/audio/AudioWidget.hpp
rename to src/ui/audio/AudioWidget.hpp
diff --git a/ui/audio/FilterWidget.hpp b/src/ui/audio/FilterWidget.hpp
similarity index 100%
rename from ui/audio/FilterWidget.hpp
rename to src/ui/audio/FilterWidget.hpp
diff --git a/ui/audio/SearchFilterWidget.cpp b/src/ui/audio/SearchFilterWidget.cpp
similarity index 100%
rename from ui/audio/SearchFilterWidget.cpp
rename to src/ui/audio/SearchFilterWidget.cpp
diff --git a/ui/audio/SearchFilterWidget.hpp b/src/ui/audio/SearchFilterWidget.hpp
similarity index 100%
rename from ui/audio/SearchFilterWidget.hpp
rename to src/ui/audio/SearchFilterWidget.hpp
diff --git a/ui/audio/TableFilterWidget.cpp b/src/ui/audio/TableFilterWidget.cpp
similarity index 100%
rename from ui/audio/TableFilterWidget.cpp
rename to src/ui/audio/TableFilterWidget.cpp
diff --git a/ui/audio/TableFilterWidget.hpp b/src/ui/audio/TableFilterWidget.hpp
similarity index 100%
rename from ui/audio/TableFilterWidget.hpp
rename to src/ui/audio/TableFilterWidget.hpp
diff --git a/ui/audio/TrackWidget.cpp b/src/ui/audio/TrackWidget.cpp
similarity index 100%
rename from ui/audio/TrackWidget.cpp
rename to src/ui/audio/TrackWidget.cpp
diff --git a/ui/audio/TrackWidget.hpp b/src/ui/audio/TrackWidget.hpp
similarity index 100%
rename from ui/audio/TrackWidget.hpp
rename to src/ui/audio/TrackWidget.hpp
diff --git a/ui/auth/LmsAuth.cpp b/src/ui/auth/LmsAuth.cpp
similarity index 100%
rename from ui/auth/LmsAuth.cpp
rename to src/ui/auth/LmsAuth.cpp
diff --git a/ui/auth/LmsAuth.hpp b/src/ui/auth/LmsAuth.hpp
similarity index 100%
rename from ui/auth/LmsAuth.hpp
rename to src/ui/auth/LmsAuth.hpp
diff --git a/ui/common/DirectoryValidator.cpp b/src/ui/common/DirectoryValidator.cpp
similarity index 100%
rename from ui/common/DirectoryValidator.cpp
rename to src/ui/common/DirectoryValidator.cpp
diff --git a/ui/common/DirectoryValidator.hpp b/src/ui/common/DirectoryValidator.hpp
similarity index 100%
rename from ui/common/DirectoryValidator.hpp
rename to src/ui/common/DirectoryValidator.hpp
diff --git a/ui/common/SessionData.cpp b/src/ui/common/SessionData.cpp
similarity index 100%
rename from ui/common/SessionData.cpp
rename to src/ui/common/SessionData.cpp
diff --git a/ui/common/SessionData.hpp b/src/ui/common/SessionData.hpp
similarity index 100%
rename from ui/common/SessionData.hpp
rename to src/ui/common/SessionData.hpp
diff --git a/ui/common/Validators.hpp b/src/ui/common/Validators.hpp
similarity index 100%
rename from ui/common/Validators.hpp
rename to src/ui/common/Validators.hpp
diff --git a/ui/resource/AvConvTranscodeStreamResource.cpp b/src/ui/resource/AvConvTranscodeStreamResource.cpp
similarity index 100%
rename from ui/resource/AvConvTranscodeStreamResource.cpp
rename to src/ui/resource/AvConvTranscodeStreamResource.cpp
diff --git a/ui/resource/AvConvTranscodeStreamResource.hpp b/src/ui/resource/AvConvTranscodeStreamResource.hpp
similarity index 100%
rename from ui/resource/AvConvTranscodeStreamResource.hpp
rename to src/ui/resource/AvConvTranscodeStreamResource.hpp
diff --git a/ui/settings/Settings.cpp b/src/ui/settings/Settings.cpp
similarity index 100%
rename from ui/settings/Settings.cpp
rename to src/ui/settings/Settings.cpp
diff --git a/ui/settings/Settings.hpp b/src/ui/settings/Settings.hpp
similarity index 100%
rename from ui/settings/Settings.hpp
rename to src/ui/settings/Settings.hpp
diff --git a/ui/settings/SettingsAccountFormView.cpp b/src/ui/settings/SettingsAccountFormView.cpp
similarity index 100%
rename from ui/settings/SettingsAccountFormView.cpp
rename to src/ui/settings/SettingsAccountFormView.cpp
diff --git a/ui/settings/SettingsAccountFormView.hpp b/src/ui/settings/SettingsAccountFormView.hpp
similarity index 100%
rename from ui/settings/SettingsAccountFormView.hpp
rename to src/ui/settings/SettingsAccountFormView.hpp
diff --git a/ui/settings/SettingsAudioFormView.cpp b/src/ui/settings/SettingsAudioFormView.cpp
similarity index 100%
rename from ui/settings/SettingsAudioFormView.cpp
rename to src/ui/settings/SettingsAudioFormView.cpp
diff --git a/ui/settings/SettingsAudioFormView.hpp b/src/ui/settings/SettingsAudioFormView.hpp
similarity index 100%
rename from ui/settings/SettingsAudioFormView.hpp
rename to src/ui/settings/SettingsAudioFormView.hpp
diff --git a/ui/settings/SettingsDatabaseFormView.cpp b/src/ui/settings/SettingsDatabaseFormView.cpp
similarity index 100%
rename from ui/settings/SettingsDatabaseFormView.cpp
rename to src/ui/settings/SettingsDatabaseFormView.cpp
diff --git a/ui/settings/SettingsDatabaseFormView.hpp b/src/ui/settings/SettingsDatabaseFormView.hpp
similarity index 100%
rename from ui/settings/SettingsDatabaseFormView.hpp
rename to src/ui/settings/SettingsDatabaseFormView.hpp
diff --git a/ui/settings/SettingsFirstConnectionFormView.cpp b/src/ui/settings/SettingsFirstConnectionFormView.cpp
similarity index 100%
rename from ui/settings/SettingsFirstConnectionFormView.cpp
rename to src/ui/settings/SettingsFirstConnectionFormView.cpp
diff --git a/ui/settings/SettingsFirstConnectionFormView.hpp b/src/ui/settings/SettingsFirstConnectionFormView.hpp
similarity index 100%
rename from ui/settings/SettingsFirstConnectionFormView.hpp
rename to src/ui/settings/SettingsFirstConnectionFormView.hpp
diff --git a/ui/settings/SettingsMediaDirectories.cpp b/src/ui/settings/SettingsMediaDirectories.cpp
similarity index 100%
rename from ui/settings/SettingsMediaDirectories.cpp
rename to src/ui/settings/SettingsMediaDirectories.cpp
diff --git a/ui/settings/SettingsMediaDirectories.hpp b/src/ui/settings/SettingsMediaDirectories.hpp
similarity index 100%
rename from ui/settings/SettingsMediaDirectories.hpp
rename to src/ui/settings/SettingsMediaDirectories.hpp
diff --git a/ui/settings/SettingsMediaDirectoryFormView.cpp b/src/ui/settings/SettingsMediaDirectoryFormView.cpp
similarity index 100%
rename from ui/settings/SettingsMediaDirectoryFormView.cpp
rename to src/ui/settings/SettingsMediaDirectoryFormView.cpp
diff --git a/ui/settings/SettingsMediaDirectoryFormView.hpp b/src/ui/settings/SettingsMediaDirectoryFormView.hpp
similarity index 100%
rename from ui/settings/SettingsMediaDirectoryFormView.hpp
rename to src/ui/settings/SettingsMediaDirectoryFormView.hpp
diff --git a/ui/settings/SettingsUserFormView.cpp b/src/ui/settings/SettingsUserFormView.cpp
similarity index 100%
rename from ui/settings/SettingsUserFormView.cpp
rename to src/ui/settings/SettingsUserFormView.cpp
diff --git a/ui/settings/SettingsUserFormView.hpp b/src/ui/settings/SettingsUserFormView.hpp
similarity index 100%
rename from ui/settings/SettingsUserFormView.hpp
rename to src/ui/settings/SettingsUserFormView.hpp
diff --git a/ui/settings/SettingsUsers.cpp b/src/ui/settings/SettingsUsers.cpp
similarity index 100%
rename from ui/settings/SettingsUsers.cpp
rename to src/ui/settings/SettingsUsers.cpp
diff --git a/ui/settings/SettingsUsers.hpp b/src/ui/settings/SettingsUsers.hpp
similarity index 100%
rename from ui/settings/SettingsUsers.hpp
rename to src/ui/settings/SettingsUsers.hpp
diff --git a/ui/video/VideoDatabaseWidget.cpp b/src/ui/video/VideoDatabaseWidget.cpp
similarity index 100%
rename from ui/video/VideoDatabaseWidget.cpp
rename to src/ui/video/VideoDatabaseWidget.cpp
diff --git a/ui/video/VideoDatabaseWidget.hpp b/src/ui/video/VideoDatabaseWidget.hpp
similarity index 100%
rename from ui/video/VideoDatabaseWidget.hpp
rename to src/ui/video/VideoDatabaseWidget.hpp
diff --git a/ui/video/VideoMediaPlayerWidget.cpp b/src/ui/video/VideoMediaPlayerWidget.cpp
similarity index 100%
rename from ui/video/VideoMediaPlayerWidget.cpp
rename to src/ui/video/VideoMediaPlayerWidget.cpp
diff --git a/ui/video/VideoMediaPlayerWidget.hpp b/src/ui/video/VideoMediaPlayerWidget.hpp
similarity index 100%
rename from ui/video/VideoMediaPlayerWidget.hpp
rename to src/ui/video/VideoMediaPlayerWidget.hpp
diff --git a/ui/video/VideoParametersDialog.cpp b/src/ui/video/VideoParametersDialog.cpp
similarity index 100%
rename from ui/video/VideoParametersDialog.cpp
rename to src/ui/video/VideoParametersDialog.cpp
diff --git a/ui/video/VideoParametersDialog.hpp b/src/ui/video/VideoParametersDialog.hpp
similarity index 100%
rename from ui/video/VideoParametersDialog.hpp
rename to src/ui/video/VideoParametersDialog.hpp
diff --git a/ui/video/VideoWidget.cpp b/src/ui/video/VideoWidget.cpp
similarity index 100%
rename from ui/video/VideoWidget.cpp
rename to src/ui/video/VideoWidget.cpp
diff --git a/ui/video/VideoWidget.hpp b/src/ui/video/VideoWidget.hpp
similarity index 100%
rename from ui/video/VideoWidget.hpp
rename to src/ui/video/VideoWidget.hpp
diff --git a/test/Makefile.am b/test/Makefile.am
index 87e7ccc6..d1105468 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -6,16 +6,16 @@ check_PROGRAMS = database-integrity sql-query database-user remote
 remote_SOURCES = \
 	$(srcdir)/RemoteClientServer.cpp			\
 	$(srcdir)/TestDatabase.cpp				\
-	$(top_srcdir)/logger/Logger.cpp 			\
-	$(top_srcdir)/database/Artist.cpp			\
-	$(top_srcdir)/database/Genre.cpp			\
-	$(top_srcdir)/database/Release.cpp			\
-	$(top_srcdir)/database/Track.cpp			\
-	$(top_srcdir)/database/DatabaseHandler.cpp		\
-	$(top_srcdir)/database/MediaDirectory.cpp		\
-	$(top_srcdir)/database/SqlQuery.cpp		\
-	$(top_srcdir)/database/User.cpp			\
-	$(top_srcdir)/database/Video.cpp
+	$(top_srcdir)/src/logger/Logger.cpp 			\
+	$(top_srcdir)/src/database/Artist.cpp			\
+	$(top_srcdir)/src/database/Genre.cpp			\
+	$(top_srcdir)/src/database/Release.cpp			\
+	$(top_srcdir)/src/database/Track.cpp			\
+	$(top_srcdir)/src/database/DatabaseHandler.cpp		\
+	$(top_srcdir)/src/database/MediaDirectory.cpp		\
+	$(top_srcdir)/src/database/SqlQuery.cpp		\
+	$(top_srcdir)/src/database/User.cpp			\
+	$(top_srcdir)/src/database/Video.cpp
 nodist_remote_SOURCES = \
 	$(builddir)/auth.pb.cc			\
 	$(builddir)/collection.pb.cc		\
@@ -31,46 +31,46 @@ BUILT_SOURCES = \
 	$(builddir)/messages.pb.h
 
 
-remote_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_srcdir) -I$(top_srcdir)/remote -I$(top_srcdir)/boost
+remote_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_srcdir) -I$(top_srcdir)/src
 
-%.pb.cc %.pb.h: $(top_srcdir)/remote/proto/%.proto
-	$(PROTOC) --proto_path=$(top_srcdir)/remote/proto/ --cpp_out=$(builddir)/ $^
+%.pb.cc %.pb.h: $(top_srcdir)/src/remote/proto/%.proto
+	$(PROTOC) --proto_path=$(top_srcdir)/src/remote/proto/ --cpp_out=$(builddir)/ $^
 
 
 database_user_SOURCES = \
 	$(srcdir)/CheckDatabaseUser.cpp		\
-	$(top_srcdir)/logger/Logger.cpp 			\
-	$(top_srcdir)/database/Artist.cpp	\
-	$(top_srcdir)/database/Genre.cpp	\
-	$(top_srcdir)/database/Release.cpp	\
-	$(top_srcdir)/database/Track.cpp	\
-	$(top_srcdir)/database/DatabaseHandler.cpp	\
-	$(top_srcdir)/database/MediaDirectory.cpp		\
-	$(top_srcdir)/database/SqlQuery.cpp		\
-	$(top_srcdir)/database/User.cpp			\
-	$(top_srcdir)/database/Video.cpp
+	$(top_srcdir)/src/logger/Logger.cpp 			\
+	$(top_srcdir)/src/database/Artist.cpp	\
+	$(top_srcdir)/src/database/Genre.cpp	\
+	$(top_srcdir)/src/database/Release.cpp	\
+	$(top_srcdir)/src/database/Track.cpp	\
+	$(top_srcdir)/src/database/DatabaseHandler.cpp	\
+	$(top_srcdir)/src/database/MediaDirectory.cpp		\
+	$(top_srcdir)/src/database/SqlQuery.cpp		\
+	$(top_srcdir)/src/database/User.cpp			\
+	$(top_srcdir)/src/database/Video.cpp
 
-database_user_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_srcdir)
+database_user_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_srcdir) -I$(top_srcdir)/src
 
 
 database_integrity_SOURCES = \
 	$(srcdir)/DatabaseIntegrity.cpp		\
-	$(top_srcdir)/logger/Logger.cpp 			\
-	$(top_srcdir)/database/Artist.cpp	\
-	$(top_srcdir)/database/Genre.cpp	\
-	$(top_srcdir)/database/Release.cpp	\
-	$(top_srcdir)/database/Track.cpp	\
-	$(top_srcdir)/database/DatabaseHandler.cpp	\
-	$(top_srcdir)/database/MediaDirectory.cpp		\
-	$(top_srcdir)/database/SqlQuery.cpp		\
-	$(top_srcdir)/database/User.cpp			\
-	$(top_srcdir)/database/Video.cpp
+	$(top_srcdir)/src/logger/Logger.cpp 			\
+	$(top_srcdir)/src/database/Artist.cpp	\
+	$(top_srcdir)/src/database/Genre.cpp	\
+	$(top_srcdir)/src/database/Release.cpp	\
+	$(top_srcdir)/src/database/Track.cpp	\
+	$(top_srcdir)/src/database/DatabaseHandler.cpp	\
+	$(top_srcdir)/src/database/MediaDirectory.cpp		\
+	$(top_srcdir)/src/database/SqlQuery.cpp		\
+	$(top_srcdir)/src/database/User.cpp			\
+	$(top_srcdir)/src/database/Video.cpp
 
-database_integrity_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_srcdir)
+database_integrity_CXXFLAGS=-std=c++11 -Wall -Wextra -DBOOST_LOG_DYN_LINK -I$(top_srcdir) -I$(top_srcdir)/src
 
 sql_query_SOURCES = \
 	$(srcdir)/CheckSqlQuery.cpp         \
-	$(top_srcdir)/database/SqlQuery.cpp
+	$(top_srcdir)/src/database/SqlQuery.cpp
 
-sql_query_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir)
+sql_query_CXXFLAGS=-std=c++11 -Wall -Wextra -I$(top_srcdir) -I$(top_srcdir)/src