From 0f333e82fbae4655e16c8e78743e896f7c9fa3cc Mon Sep 17 00:00:00 2001
From: casey <casey@GREENPOINT>
Date: Tue, 3 May 2016 23:07:10 -0700
Subject: [PATCH] Re-pathed all queries and filestreams.

---
 src/core/IndexerTrack.cpp                     |  2 +-
 src/core/Library/LibraryBase.cpp              |  2 +-
 src/core/Library/LocalLibrary.cpp             |  2 +-
 src/core/NonLibraryTrackHelper.cpp            |  2 +-
 src/core/PlaybackQueue.cpp                    |  2 +-
 src/core/PlaybackQueue.h                      |  4 +-
 src/core/audio/Stream.h                       |  2 +-
 src/core/core.vcxproj                         | 58 ++++++++-----------
 .../{filestreams => datastream}/Factory.cpp   |  4 +-
 .../{filestreams => datastream}/Factory.h     |  0
 .../LocalFileStream.cpp                       |  2 +-
 .../LocalFileStream.h                         |  0
 src/core/{Query => library/query}/Factory.cpp | 10 ++--
 src/core/{Query => library/query}/Factory.h   |  2 +-
 .../query}/LibraryTrackListQuery.cpp          |  4 +-
 .../query}/LibraryTrackListQuery.h            |  6 +-
 .../query}/ListQueryBase.cpp                  |  2 +-
 .../{Query => library/query}/ListQueryBase.h  |  2 +-
 .../query}/ListSelectionQuery.cpp             |  2 +-
 .../query}/ListSelectionQuery.h               |  2 +-
 .../query}/MultiLibraryTrackListQuery.cpp     |  2 +-
 .../query}/MultiLibraryTrackListQuery.h       |  8 +--
 .../{Query => library/query}/PlaylistLoad.cpp |  2 +-
 .../{Query => library/query}/PlaylistLoad.h   |  2 +-
 .../{Query => library/query}/PlaylistSave.cpp |  2 +-
 .../{Query => library/query}/PlaylistSave.h   |  4 +-
 .../{Query => library/query}/Playlists.cpp    |  4 +-
 src/core/{Query => library/query}/Playlists.h |  4 +-
 .../{Query => library/query}/QueryBase.cpp    |  2 +-
 src/core/{Query => library/query}/QueryBase.h |  0
 .../query}/SortTracksQuery.cpp                |  2 +-
 .../query}/SortTracksQuery.h                  |  4 +-
 .../query}/SortTracksWithDataQuery.cpp        |  2 +-
 .../query}/SortTracksWithDataQuery.h          |  2 +-
 .../query}/TrackListQueryBase.cpp             |  2 +-
 .../query}/TrackListQueryBase.h               |  2 +-
 .../query}/TrackMetadataQuery.cpp             |  2 +-
 .../query}/TrackMetadataQuery.h               |  2 +-
 38 files changed, 74 insertions(+), 84 deletions(-)
 rename src/core/{filestreams => datastream}/Factory.cpp (95%)
 rename src/core/{filestreams => datastream}/Factory.h (100%)
 rename src/core/{filestreams => datastream}/LocalFileStream.cpp (95%)
 rename src/core/{filestreams => datastream}/LocalFileStream.h (100%)
 rename src/core/{Query => library/query}/Factory.cpp (87%)
 rename src/core/{Query => library/query}/Factory.h (95%)
 rename src/core/{tracklist => library/query}/LibraryTrackListQuery.cpp (96%)
 rename src/core/{tracklist => library/query}/LibraryTrackListQuery.h (94%)
 rename src/core/{Query => library/query}/ListQueryBase.cpp (96%)
 rename src/core/{Query => library/query}/ListQueryBase.h (96%)
 rename src/core/{Query => library/query}/ListSelectionQuery.cpp (97%)
 rename src/core/{Query => library/query}/ListSelectionQuery.h (96%)
 rename src/core/{tracklist => library/query}/MultiLibraryTrackListQuery.cpp (96%)
 rename src/core/{tracklist => library/query}/MultiLibraryTrackListQuery.h (94%)
 rename src/core/{Query => library/query}/PlaylistLoad.cpp (95%)
 rename src/core/{Query => library/query}/PlaylistLoad.h (95%)
 rename src/core/{Query => library/query}/PlaylistSave.cpp (96%)
 rename src/core/{Query => library/query}/PlaylistSave.h (94%)
 rename src/core/{Query => library/query}/Playlists.cpp (94%)
 rename src/core/{Query => library/query}/Playlists.h (94%)
 rename src/core/{Query => library/query}/QueryBase.cpp (95%)
 rename src/core/{Query => library/query}/QueryBase.h (100%)
 rename src/core/{Query => library/query}/SortTracksQuery.cpp (96%)
 rename src/core/{Query => library/query}/SortTracksQuery.h (94%)
 rename src/core/{Query => library/query}/SortTracksWithDataQuery.cpp (96%)
 rename src/core/{Query => library/query}/SortTracksWithDataQuery.h (96%)
 rename src/core/{tracklist => library/query}/TrackListQueryBase.cpp (95%)
 rename src/core/{tracklist => library/query}/TrackListQueryBase.h (96%)
 rename src/core/{Query => library/query}/TrackMetadataQuery.cpp (96%)
 rename src/core/{Query => library/query}/TrackMetadataQuery.h (96%)

diff --git a/src/core/IndexerTrack.cpp b/src/core/IndexerTrack.cpp
index b47481686..d3ba13f99 100644
--- a/src/core/IndexerTrack.cpp
+++ b/src/core/IndexerTrack.cpp
@@ -42,7 +42,7 @@
 #include <core/db/Connection.h>
 #include <core/db/Statement.h>
 #include <core/library/LibraryBase.h>
-#include <core/filestreams/Factory.h>
+#include <core/datastream/Factory.h>
 
 #include <boost/lexical_cast.hpp>
 
diff --git a/src/core/Library/LibraryBase.cpp b/src/core/Library/LibraryBase.cpp
index a390cc156..0db0f0247 100644
--- a/src/core/Library/LibraryBase.cpp
+++ b/src/core/Library/LibraryBase.cpp
@@ -38,7 +38,7 @@
 
 #include <core/Library/LibraryBase.h>
 #include <core/config.h>
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/Common.h>
 
 using namespace musik::core;
diff --git a/src/core/Library/LocalLibrary.cpp b/src/core/Library/LocalLibrary.cpp
index f19785cc0..952172f1f 100644
--- a/src/core/Library/LocalLibrary.cpp
+++ b/src/core/Library/LocalLibrary.cpp
@@ -37,7 +37,7 @@
 #include "pch.hpp"
 
 #include <core/Library/LocalLibrary.h>
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/Preferences.h>
 
 #include <boost/bind.hpp>
diff --git a/src/core/NonLibraryTrackHelper.cpp b/src/core/NonLibraryTrackHelper.cpp
index 67416e302..2d38bcac5 100644
--- a/src/core/NonLibraryTrackHelper.cpp
+++ b/src/core/NonLibraryTrackHelper.cpp
@@ -40,7 +40,7 @@
 #include <boost/bind.hpp>
 #include <core/PluginFactory.h>
 #include <core/sdk/IMetaDataReader.h>
-#include <core/filestreams/Factory.h>
+#include <core/datastream/Factory.h>
 
 using namespace musik::core;
 
diff --git a/src/core/PlaybackQueue.cpp b/src/core/PlaybackQueue.cpp
index d33bfaa2a..70b805aae 100644
--- a/src/core/PlaybackQueue.cpp
+++ b/src/core/PlaybackQueue.cpp
@@ -33,7 +33,7 @@
 #include "pch.hpp"
 #include <core/PlaybackQueue.h>
 #include <core/LibraryFactory.h>
-#include <core/tracklist/MultiLibraryTrackListQuery.h>
+#include <core/library/query/MultiLibraryTrackListQuery.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/src/core/PlaybackQueue.h b/src/core/PlaybackQueue.h
index 2fa9a2332..7258a3b0b 100644
--- a/src/core/PlaybackQueue.h
+++ b/src/core/PlaybackQueue.h
@@ -36,8 +36,8 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include <core/audio/Transport.h>
-#include <core/tracklist/TrackListQueryBase.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/TrackListQueryBase.h>
+#include <core/library/query/TrackMetadataQuery.h>
 #include <sigslot/sigslot.h>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/audio/Stream.h b/src/core/audio/Stream.h
index be9dbcc4c..1caa1ad75 100644
--- a/src/core/audio/Stream.h
+++ b/src/core/audio/Stream.h
@@ -34,7 +34,7 @@
 #pragma once
 
 #include <core/config.h>
-#include <core/filestreams/Factory.h>
+#include <core/datastream/Factory.h>
 #include <core/audio/Buffer.h>
 #include <core/sdk/IDecoder.h>
 #include <core/sdk/IDSP.h>
diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
index 3950437b9..41194f729 100755
--- a/src/core/core.vcxproj
+++ b/src/core/core.vcxproj
@@ -77,7 +77,19 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="datastream\Factory.cpp" />
+    <ClCompile Include="datastream\LocalFileStream.cpp" />
     <ClCompile Include="Library\LocalLibrary.cpp" />
+    <ClCompile Include="Library\query\Factory.cpp" />
+    <ClCompile Include="Library\query\LibraryTrackListQuery.cpp" />
+    <ClCompile Include="Library\query\ListQueryBase.cpp" />
+    <ClCompile Include="Library\query\ListSelectionQuery.cpp" />
+    <ClCompile Include="Library\query\MultiLibraryTrackListQuery.cpp" />
+    <ClCompile Include="Library\query\QueryBase.cpp" />
+    <ClCompile Include="Library\query\SortTracksQuery.cpp" />
+    <ClCompile Include="Library\query\SortTracksWithDataQuery.cpp" />
+    <ClCompile Include="Library\query\TrackListQueryBase.cpp" />
+    <ClCompile Include="Library\query\TrackMetadataQuery.cpp" />
     <ClCompile Include="pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -91,18 +103,6 @@
     <ClCompile Include="ThreadHelper.cpp" />
     <ClCompile Include="Indexer.cpp" />
     <ClCompile Include="LibraryFactory.cpp" />
-    <ClCompile Include="Query\QueryBase.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="Query\Factory.cpp" />
-    <ClCompile Include="Query\ListQueryBase.cpp" />
-    <ClCompile Include="Query\ListSelectionQuery.cpp" />
-    <ClCompile Include="Query\SortTracksQuery.cpp" />
-    <ClCompile Include="Query\SortTracksWithDataQuery.cpp" />
-    <ClCompile Include="Query\TrackMetadataQuery.cpp" />
     <ClCompile Include="Library\LibraryBase.cpp" />
     <ClCompile Include="db\CachedStatement.cpp" />
     <ClCompile Include="db\Connection.cpp" />
@@ -116,24 +116,26 @@
     <ClCompile Include="audio\Player.cpp" />
     <ClCompile Include="audio\Stream.cpp" />
     <ClCompile Include="audio\Transport.cpp" />
-    <ClCompile Include="filestreams\Factory.cpp">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="filestreams\LocalFileStream.cpp" />
     <ClCompile Include="GenericTrack.cpp" />
     <ClCompile Include="IndexerTrack.cpp" />
     <ClCompile Include="LibraryTrack.cpp" />
     <ClCompile Include="Track.cpp" />
     <ClCompile Include="TrackFactory.cpp" />
-    <ClCompile Include="tracklist\TrackListQueryBase.cpp" />
-    <ClCompile Include="tracklist\LibraryTrackListQuery.cpp" />
-    <ClCompile Include="tracklist\MultiLibraryTrackListQuery.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="datastream\Factory.h" />
+    <ClInclude Include="datastream\LocalFileStream.h" />
     <ClInclude Include="Library\LocalLibrary.h" />
+    <ClInclude Include="Library\query\Factory.h" />
+    <ClInclude Include="Library\query\LibraryTrackListQuery.h" />
+    <ClInclude Include="Library\query\ListQueryBase.h" />
+    <ClInclude Include="Library\query\ListSelectionQuery.h" />
+    <ClInclude Include="Library\query\MultiLibraryTrackListQuery.h" />
+    <ClInclude Include="Library\query\QueryBase.h" />
+    <ClInclude Include="Library\query\SortTracksQuery.h" />
+    <ClInclude Include="Library\query\SortTracksWithDataQuery.h" />
+    <ClInclude Include="Library\query\TrackListQueryBase.h" />
+    <ClInclude Include="Library\query\TrackMetadataQuery.h" />
     <ClInclude Include="pch.hpp" />
     <ClInclude Include="PlaybackQueue.h" />
     <ClInclude Include="Common.h" />
@@ -155,18 +157,8 @@
     <ClInclude Include="sdk\IPlugin.h" />
     <ClInclude Include="sdk\ITrack.h" />
     <ClInclude Include="ThreadHelper.h" />
-    <ClInclude Include="tracklist\TrackListQueryBase.h" />
-    <ClInclude Include="tracklist\LibraryTrackListQuery.h" />
-    <ClInclude Include="tracklist\MultiLibraryTrackListQuery.h" />
     <ClInclude Include="Indexer.h" />
     <ClInclude Include="LibraryFactory.h" />
-    <ClInclude Include="Query\QueryBase.h" />
-    <ClInclude Include="Query\Factory.h" />
-    <ClInclude Include="Query\ListQueryBase.h" />
-    <ClInclude Include="Query\ListSelectionQuery.h" />
-    <ClInclude Include="Query\SortTracksQuery.h" />
-    <ClInclude Include="Query\SortTracksWithDataQuery.h" />
-    <ClInclude Include="Query\TrackMetadataQuery.h" />
     <ClInclude Include="Library\LibraryBase.h" />
     <ClInclude Include="db\CachedStatement.h" />
     <ClInclude Include="db\Connection.h" />
@@ -181,8 +173,6 @@
     <ClInclude Include="audio\Player.h" />
     <ClInclude Include="audio\Stream.h" />
     <ClInclude Include="audio\Transport.h" />
-    <ClInclude Include="filestreams\Factory.h" />
-    <ClInclude Include="filestreams\LocalFileStream.h" />
     <ClInclude Include="GenericTrack.h" />
     <ClInclude Include="IndexerTrack.h" />
     <ClInclude Include="LibraryTrack.h" />
diff --git a/src/core/filestreams/Factory.cpp b/src/core/datastream/Factory.cpp
similarity index 95%
rename from src/core/filestreams/Factory.cpp
rename to src/core/datastream/Factory.cpp
index 429981f1d..56e485631 100644
--- a/src/core/filestreams/Factory.cpp
+++ b/src/core/datastream/Factory.cpp
@@ -36,10 +36,10 @@
 
 #include "pch.hpp"
 
-#include <core/filestreams/Factory.h>
+#include <core/datastream/Factory.h>
 #include <core/config.h>
 #include <core/PluginFactory.h>
-#include <core/filestreams/LocalFileStream.h>
+#include <core/datastream/LocalFileStream.h>
 
 using namespace musik::core::io;
 
diff --git a/src/core/filestreams/Factory.h b/src/core/datastream/Factory.h
similarity index 100%
rename from src/core/filestreams/Factory.h
rename to src/core/datastream/Factory.h
diff --git a/src/core/filestreams/LocalFileStream.cpp b/src/core/datastream/LocalFileStream.cpp
similarity index 95%
rename from src/core/filestreams/LocalFileStream.cpp
rename to src/core/datastream/LocalFileStream.cpp
index f0eeaeb6f..4cf58cd94 100644
--- a/src/core/filestreams/LocalFileStream.cpp
+++ b/src/core/datastream/LocalFileStream.cpp
@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/filestreams/LocalFileStream.h>
+#include <core/datastream/LocalFileStream.h>
 #include <core/config.h>
 #include <core/Common.h>
 #include <core/config.h>
diff --git a/src/core/filestreams/LocalFileStream.h b/src/core/datastream/LocalFileStream.h
similarity index 100%
rename from src/core/filestreams/LocalFileStream.h
rename to src/core/datastream/LocalFileStream.h
diff --git a/src/core/Query/Factory.cpp b/src/core/library/query/Factory.cpp
similarity index 87%
rename from src/core/Query/Factory.cpp
rename to src/core/library/query/Factory.cpp
index 1e872cd04..9e5c41991 100644
--- a/src/core/Query/Factory.cpp
+++ b/src/core/library/query/Factory.cpp
@@ -36,12 +36,12 @@
 
 #include "pch.hpp"
 
-#include <core/Query/Factory.h>
+#include <core/library/query/Factory.h>
 
-#include <core/Query/ListSelectionQuery.h>
-#include <core/Query/SortTracksQuery.h>
-#include <core/Query/SortTracksWithDataQuery.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/ListSelectionQuery.h>
+#include <core/library/query/SortTracksQuery.h>
+#include <core/library/query/SortTracksWithDataQuery.h>
+#include <core/library/query/TrackMetadataQuery.h>
 
 using namespace musik::core::query;
 
diff --git a/src/core/Query/Factory.h b/src/core/library/query/Factory.h
similarity index 95%
rename from src/core/Query/Factory.h
rename to src/core/library/query/Factory.h
index e290362ee..87ccd391f 100644
--- a/src/core/Query/Factory.h
+++ b/src/core/library/query/Factory.h
@@ -36,7 +36,7 @@
 #pragma once
 
 #include <core/config.h>
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 
 #include <map>
 
diff --git a/src/core/tracklist/LibraryTrackListQuery.cpp b/src/core/library/query/LibraryTrackListQuery.cpp
similarity index 96%
rename from src/core/tracklist/LibraryTrackListQuery.cpp
rename to src/core/library/query/LibraryTrackListQuery.cpp
index 60753d90e..f8952e2f4 100644
--- a/src/core/tracklist/LibraryTrackListQuery.cpp
+++ b/src/core/library/query/LibraryTrackListQuery.cpp
@@ -36,9 +36,9 @@
 
 #include "pch.hpp"
 
-#include <core/tracklist/LibraryTrackListQuery.h>
+#include <core/library/query/LibraryTrackListQuery.h>
 #include <core/LibraryTrack.h>
-#include <core/Query/SortTracksQuery.h>
+#include <core/library/query/SortTracksQuery.h>
 
 //////////////////////////////////////////////////////////////////////////////
 using namespace musik::core::tracklist;
diff --git a/src/core/tracklist/LibraryTrackListQuery.h b/src/core/library/query/LibraryTrackListQuery.h
similarity index 94%
rename from src/core/tracklist/LibraryTrackListQuery.h
rename to src/core/library/query/LibraryTrackListQuery.h
index 9e24d7577..70457a55c 100644
--- a/src/core/tracklist/LibraryTrackListQuery.h
+++ b/src/core/library/query/LibraryTrackListQuery.h
@@ -38,9 +38,9 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <core/tracklist/TrackListQueryBase.h>
-#include <core/Query/ListQueryBase.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/TrackListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
+#include <core/library/query/TrackMetadataQuery.h>
 #include <core/library/LibraryBase.h>
 
 #include <set>
diff --git a/src/core/Query/ListQueryBase.cpp b/src/core/library/query/ListQueryBase.cpp
similarity index 96%
rename from src/core/Query/ListQueryBase.cpp
rename to src/core/library/query/ListQueryBase.cpp
index fa881dbc6..494aab198 100644
--- a/src/core/Query/ListQueryBase.cpp
+++ b/src/core/library/query/ListQueryBase.cpp
@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/ListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
 #include <core/library/LibraryBase.h>
 #include <core/Common.h>
 #include <core/LibraryTrack.h>
diff --git a/src/core/Query/ListQueryBase.h b/src/core/library/query/ListQueryBase.h
similarity index 96%
rename from src/core/Query/ListQueryBase.h
rename to src/core/library/query/ListQueryBase.h
index b5bf91e5e..5fead140c 100644
--- a/src/core/Query/ListQueryBase.h
+++ b/src/core/library/query/ListQueryBase.h
@@ -36,7 +36,7 @@
 
 #pragma once
 
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/MetadataValue.h>
 #include <core/LibraryTrack.h>
 
diff --git a/src/core/Query/ListSelectionQuery.cpp b/src/core/library/query/ListSelectionQuery.cpp
similarity index 97%
rename from src/core/Query/ListSelectionQuery.cpp
rename to src/core/library/query/ListSelectionQuery.cpp
index 8a6546add..7ad564097 100644
--- a/src/core/Query/ListSelectionQuery.cpp
+++ b/src/core/library/query/ListSelectionQuery.cpp
@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/ListSelectionQuery.h>
+#include <core/library/query/ListSelectionQuery.h>
 #include <core/library/LibraryBase.h>
 
 #include <boost/format.hpp>
diff --git a/src/core/Query/ListSelectionQuery.h b/src/core/library/query/ListSelectionQuery.h
similarity index 96%
rename from src/core/Query/ListSelectionQuery.h
rename to src/core/library/query/ListSelectionQuery.h
index be6bc0f71..1c54ddf44 100644
--- a/src/core/Query/ListSelectionQuery.h
+++ b/src/core/library/query/ListSelectionQuery.h
@@ -50,7 +50,7 @@
 #include <string>
 
 #include <core/config.h>
-#include <core/Query/ListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
 
 //////////////////////////////////////////////////////////////
 
diff --git a/src/core/tracklist/MultiLibraryTrackListQuery.cpp b/src/core/library/query/MultiLibraryTrackListQuery.cpp
similarity index 96%
rename from src/core/tracklist/MultiLibraryTrackListQuery.cpp
rename to src/core/library/query/MultiLibraryTrackListQuery.cpp
index 371103cef..70fff6359 100644
--- a/src/core/tracklist/MultiLibraryTrackListQuery.cpp
+++ b/src/core/library/query/MultiLibraryTrackListQuery.cpp
@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/tracklist/MultiLibraryTrackListQuery.h>
+#include <core/library/query/MultiLibraryTrackListQuery.h>
 #include <core/LibraryTrack.h>
 #include <core/LibraryFactory.h>
 #include <core/NonLibraryTrackHelper.h>
diff --git a/src/core/tracklist/MultiLibraryTrackListQuery.h b/src/core/library/query/MultiLibraryTrackListQuery.h
similarity index 94%
rename from src/core/tracklist/MultiLibraryTrackListQuery.h
rename to src/core/library/query/MultiLibraryTrackListQuery.h
index 6b16af352..8b46a0853 100644
--- a/src/core/tracklist/MultiLibraryTrackListQuery.h
+++ b/src/core/library/query/MultiLibraryTrackListQuery.h
@@ -38,11 +38,11 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
-#include <core/tracklist/TrackListQueryBase.h>
-#include <core/Query/ListQueryBase.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/TrackListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
+#include <core/library/query/TrackMetadataQuery.h>
 #include <core/library/LibraryBase.h>
-#include <core/Query/SortTracksWithDataQuery.h>
+#include <core/library/query/SortTracksWithDataQuery.h>
 
 #include <boost/thread/mutex.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/src/core/Query/PlaylistLoad.cpp b/src/core/library/query/PlaylistLoad.cpp
similarity index 95%
rename from src/core/Query/PlaylistLoad.cpp
rename to src/core/library/query/PlaylistLoad.cpp
index 06b6cd30c..a7a593f5e 100644
--- a/src/core/Query/PlaylistLoad.cpp
+++ b/src/core/library/query/PlaylistLoad.cpp
@@ -40,7 +40,7 @@
 #include <core/pch.hpp>
 #endif
 
-#include <core/Query/PlaylistLoad.h>
+#include <core/library/query/PlaylistLoad.h>
 #include <core/Library/Base.h>
 
 using namespace musik::core;
diff --git a/src/core/Query/PlaylistLoad.h b/src/core/library/query/PlaylistLoad.h
similarity index 95%
rename from src/core/Query/PlaylistLoad.h
rename to src/core/library/query/PlaylistLoad.h
index 5a930ed0a..de0e31eb3 100644
--- a/src/core/Query/PlaylistLoad.h
+++ b/src/core/library/query/PlaylistLoad.h
@@ -44,7 +44,7 @@
 #include <string>
 
 #include <core/config.h>
-#include <core/Query/ListBase.h>
+#include <core/library/query/ListBase.h>
 
 //////////////////////////////////////////////////////////////
 // Forward declarations
diff --git a/src/core/Query/PlaylistSave.cpp b/src/core/library/query/PlaylistSave.cpp
similarity index 96%
rename from src/core/Query/PlaylistSave.cpp
rename to src/core/library/query/PlaylistSave.cpp
index 857d2f658..303f42304 100644
--- a/src/core/Query/PlaylistSave.cpp
+++ b/src/core/library/query/PlaylistSave.cpp
@@ -35,7 +35,7 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "../pch.hpp"
-#include <core/Query/PlaylistSave.h>
+#include <core/library/query/PlaylistSave.h>
 #include <core/Library/Base.h>
 #include <core/LibraryTrack.h>
 
diff --git a/src/core/Query/PlaylistSave.h b/src/core/library/query/PlaylistSave.h
similarity index 94%
rename from src/core/Query/PlaylistSave.h
rename to src/core/library/query/PlaylistSave.h
index 42a887bca..80c4865b0 100644
--- a/src/core/Query/PlaylistSave.h
+++ b/src/core/library/query/PlaylistSave.h
@@ -43,8 +43,8 @@
 #include <sigslot/sigslot.h>
 
 #include <core/config.h>
-#include <core/Query/Base.h>
-#include <core/tracklist/LibraryList.h>
+#include <core/library/query/Base.h>
+#include <core/library/query/LibraryList.h>
 
 //////////////////////////////////////////////////////////////
 // Forward declarations
diff --git a/src/core/Query/Playlists.cpp b/src/core/library/query/Playlists.cpp
similarity index 94%
rename from src/core/Query/Playlists.cpp
rename to src/core/library/query/Playlists.cpp
index 123939540..3777057cc 100644
--- a/src/core/Query/Playlists.cpp
+++ b/src/core/library/query/Playlists.cpp
@@ -35,9 +35,9 @@
 //////////////////////////////////////////////////////////////////////////////
 
 #include "../pch.hpp"
-#include <core/Query/Playlists.h>
+#include <core/library/query/Playlists.h>
 #include <core/Library/Base.h>
-#include <core/tracklist/Playlist.h>
+#include <core/library/query/Playlist.h>
 
 using namespace musik::core;
 
diff --git a/src/core/Query/Playlists.h b/src/core/library/query/Playlists.h
similarity index 94%
rename from src/core/Query/Playlists.h
rename to src/core/library/query/Playlists.h
index a1d97ff5d..f9046f38e 100644
--- a/src/core/Query/Playlists.h
+++ b/src/core/library/query/Playlists.h
@@ -48,8 +48,8 @@ namespace musik{ namespace core{
 //////////////////////////////////////////////////////////////
 
 #include <core/config.h>
-#include <core/Query/Base.h>
-#include <core/tracklist/LibraryList.h>
+#include <core/library/query/Base.h>
+#include <core/library/query/LibraryList.h>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
diff --git a/src/core/Query/QueryBase.cpp b/src/core/library/query/QueryBase.cpp
similarity index 95%
rename from src/core/Query/QueryBase.cpp
rename to src/core/library/query/QueryBase.cpp
index 87a6a1e84..f88697459 100644
--- a/src/core/Query/QueryBase.cpp
+++ b/src/core/library/query/QueryBase.cpp
@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/Library/LibraryBase.h>
 
 using namespace musik::core;
diff --git a/src/core/Query/QueryBase.h b/src/core/library/query/QueryBase.h
similarity index 100%
rename from src/core/Query/QueryBase.h
rename to src/core/library/query/QueryBase.h
diff --git a/src/core/Query/SortTracksQuery.cpp b/src/core/library/query/SortTracksQuery.cpp
similarity index 96%
rename from src/core/Query/SortTracksQuery.cpp
rename to src/core/library/query/SortTracksQuery.cpp
index 5f8a4eeba..28a7dee82 100644
--- a/src/core/Query/SortTracksQuery.cpp
+++ b/src/core/library/query/SortTracksQuery.cpp
@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/SortTracksQuery.h>
+#include <core/library/query/SortTracksQuery.h>
 #include <core/library/LibraryBase.h>
 #include <core/config.h>
 #include <boost/algorithm/string.hpp>
diff --git a/src/core/Query/SortTracksQuery.h b/src/core/library/query/SortTracksQuery.h
similarity index 94%
rename from src/core/Query/SortTracksQuery.h
rename to src/core/library/query/SortTracksQuery.h
index a0a162d94..1c5a5ec5f 100644
--- a/src/core/Query/SortTracksQuery.h
+++ b/src/core/library/query/SortTracksQuery.h
@@ -43,8 +43,8 @@
 #include <string>
 
 #include <core/config.h>
-#include <core/Query/ListQueryBase.h>
-#include <core/tracklist/LibraryTrackListQuery.h>
+#include <core/library/query/ListQueryBase.h>
+#include <core/library/query/LibraryTrackListQuery.h>
 
 namespace musik { namespace core { namespace query {
 
diff --git a/src/core/Query/SortTracksWithDataQuery.cpp b/src/core/library/query/SortTracksWithDataQuery.cpp
similarity index 96%
rename from src/core/Query/SortTracksWithDataQuery.cpp
rename to src/core/library/query/SortTracksWithDataQuery.cpp
index 6509252ea..68dcabb07 100644
--- a/src/core/Query/SortTracksWithDataQuery.cpp
+++ b/src/core/library/query/SortTracksWithDataQuery.cpp
@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/Query/SortTracksWithDataQuery.h>
+#include <core/library/query/SortTracksWithDataQuery.h>
 #include <core/library/LibraryBase.h>
 #include <core/config.h>
 #include <boost/algorithm/string.hpp>
diff --git a/src/core/Query/SortTracksWithDataQuery.h b/src/core/library/query/SortTracksWithDataQuery.h
similarity index 96%
rename from src/core/Query/SortTracksWithDataQuery.h
rename to src/core/library/query/SortTracksWithDataQuery.h
index d14cc590e..d8eaeeec0 100644
--- a/src/core/Query/SortTracksWithDataQuery.h
+++ b/src/core/library/query/SortTracksWithDataQuery.h
@@ -37,7 +37,7 @@
 #pragma once
 
 #include <core/config.h>
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/Track.h>
 
 #include <boost/shared_ptr.hpp>
diff --git a/src/core/tracklist/TrackListQueryBase.cpp b/src/core/library/query/TrackListQueryBase.cpp
similarity index 95%
rename from src/core/tracklist/TrackListQueryBase.cpp
rename to src/core/library/query/TrackListQueryBase.cpp
index 86ae8d11a..5667e7344 100644
--- a/src/core/tracklist/TrackListQueryBase.cpp
+++ b/src/core/library/query/TrackListQueryBase.cpp
@@ -36,7 +36,7 @@
 
 #include "pch.hpp"
 
-#include <core/tracklist/TrackListQueryBase.h>
+#include <core/library/query/TrackListQueryBase.h>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/core/tracklist/TrackListQueryBase.h b/src/core/library/query/TrackListQueryBase.h
similarity index 96%
rename from src/core/tracklist/TrackListQueryBase.h
rename to src/core/library/query/TrackListQueryBase.h
index 6186d38a9..7d15ebbde 100644
--- a/src/core/tracklist/TrackListQueryBase.h
+++ b/src/core/library/query/TrackListQueryBase.h
@@ -41,7 +41,7 @@
 #include <core/config.h>
 #include <core/Track.h>
 #include <core/library/LibraryBase.h>
-#include <core/Query/ListQueryBase.h>
+#include <core/library/query/ListQueryBase.h>
 
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/src/core/Query/TrackMetadataQuery.cpp b/src/core/library/query/TrackMetadataQuery.cpp
similarity index 96%
rename from src/core/Query/TrackMetadataQuery.cpp
rename to src/core/library/query/TrackMetadataQuery.cpp
index 5412dc4f9..fc4c2916b 100644
--- a/src/core/Query/TrackMetadataQuery.cpp
+++ b/src/core/library/query/TrackMetadataQuery.cpp
@@ -37,7 +37,7 @@
 #include "pch.hpp"
 
 #include <core/Common.h>
-#include <core/Query/TrackMetadataQuery.h>
+#include <core/library/query/TrackMetadataQuery.h>
 #include <core/library/LibraryBase.h>
 #include <core/LibraryTrack.h>
 #include <boost/algorithm/string.hpp>
diff --git a/src/core/Query/TrackMetadataQuery.h b/src/core/library/query/TrackMetadataQuery.h
similarity index 96%
rename from src/core/Query/TrackMetadataQuery.h
rename to src/core/library/query/TrackMetadataQuery.h
index 6c8441af2..4ed6bdf76 100644
--- a/src/core/Query/TrackMetadataQuery.h
+++ b/src/core/library/query/TrackMetadataQuery.h
@@ -42,7 +42,7 @@
 #include <boost/function.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include <core/Query/QueryBase.h>
+#include <core/library/query/QueryBase.h>
 #include <core/config.h>
 #include <core/Track.h>