diff --git a/qjson/CMakeLists.txt b/3rdparty/qjson/CMakeLists.txt
similarity index 100%
rename from qjson/CMakeLists.txt
rename to 3rdparty/qjson/CMakeLists.txt
diff --git a/qjson/COPYING.lib b/3rdparty/qjson/COPYING.lib
similarity index 100%
rename from qjson/COPYING.lib
rename to 3rdparty/qjson/COPYING.lib
diff --git a/qjson/FlexLexer.h b/3rdparty/qjson/FlexLexer.h
similarity index 100%
rename from qjson/FlexLexer.h
rename to 3rdparty/qjson/FlexLexer.h
diff --git a/qjson/README.license b/3rdparty/qjson/README.license
similarity index 100%
rename from qjson/README.license
rename to 3rdparty/qjson/README.license
diff --git a/qjson/json_parser.cc b/3rdparty/qjson/json_parser.cc
similarity index 100%
rename from qjson/json_parser.cc
rename to 3rdparty/qjson/json_parser.cc
diff --git a/qjson/json_parser.hh b/3rdparty/qjson/json_parser.hh
similarity index 100%
rename from qjson/json_parser.hh
rename to 3rdparty/qjson/json_parser.hh
diff --git a/qjson/json_parser.yy b/3rdparty/qjson/json_parser.yy
similarity index 100%
rename from qjson/json_parser.yy
rename to 3rdparty/qjson/json_parser.yy
diff --git a/qjson/json_scanner.cc b/3rdparty/qjson/json_scanner.cc
similarity index 100%
rename from qjson/json_scanner.cc
rename to 3rdparty/qjson/json_scanner.cc
diff --git a/qjson/json_scanner.cpp b/3rdparty/qjson/json_scanner.cpp
similarity index 100%
rename from qjson/json_scanner.cpp
rename to 3rdparty/qjson/json_scanner.cpp
diff --git a/qjson/json_scanner.h b/3rdparty/qjson/json_scanner.h
similarity index 100%
rename from qjson/json_scanner.h
rename to 3rdparty/qjson/json_scanner.h
diff --git a/qjson/json_scanner.yy b/3rdparty/qjson/json_scanner.yy
similarity index 100%
rename from qjson/json_scanner.yy
rename to 3rdparty/qjson/json_scanner.yy
diff --git a/qjson/location.hh b/3rdparty/qjson/location.hh
similarity index 100%
rename from qjson/location.hh
rename to 3rdparty/qjson/location.hh
diff --git a/qjson/parser.cpp b/3rdparty/qjson/parser.cpp
similarity index 100%
rename from qjson/parser.cpp
rename to 3rdparty/qjson/parser.cpp
diff --git a/qjson/parser.h b/3rdparty/qjson/parser.h
similarity index 100%
rename from qjson/parser.h
rename to 3rdparty/qjson/parser.h
diff --git a/qjson/parser_p.h b/3rdparty/qjson/parser_p.h
similarity index 100%
rename from qjson/parser_p.h
rename to 3rdparty/qjson/parser_p.h
diff --git a/qjson/position.hh b/3rdparty/qjson/position.hh
similarity index 100%
rename from qjson/position.hh
rename to 3rdparty/qjson/position.hh
diff --git a/qjson/qjson_debug.h b/3rdparty/qjson/qjson_debug.h
similarity index 100%
rename from qjson/qjson_debug.h
rename to 3rdparty/qjson/qjson_debug.h
diff --git a/qjson/qjson_export.h b/3rdparty/qjson/qjson_export.h
similarity index 100%
rename from qjson/qjson_export.h
rename to 3rdparty/qjson/qjson_export.h
diff --git a/qjson/qobjecthelper.cpp b/3rdparty/qjson/qobjecthelper.cpp
similarity index 100%
rename from qjson/qobjecthelper.cpp
rename to 3rdparty/qjson/qobjecthelper.cpp
diff --git a/qjson/qobjecthelper.h b/3rdparty/qjson/qobjecthelper.h
similarity index 100%
rename from qjson/qobjecthelper.h
rename to 3rdparty/qjson/qobjecthelper.h
diff --git a/qjson/stack.hh b/3rdparty/qjson/stack.hh
similarity index 100%
rename from qjson/stack.hh
rename to 3rdparty/qjson/stack.hh
diff --git a/qtiocompressor/CMakeLists.txt b/3rdparty/qtiocompressor/CMakeLists.txt
similarity index 100%
rename from qtiocompressor/CMakeLists.txt
rename to 3rdparty/qtiocompressor/CMakeLists.txt
diff --git a/qtiocompressor/LGPL_EXCEPTION.txt b/3rdparty/qtiocompressor/LGPL_EXCEPTION.txt
similarity index 100%
rename from qtiocompressor/LGPL_EXCEPTION.txt
rename to 3rdparty/qtiocompressor/LGPL_EXCEPTION.txt
diff --git a/qtiocompressor/LICENSE.GPL3 b/3rdparty/qtiocompressor/LICENSE.GPL3
similarity index 100%
rename from qtiocompressor/LICENSE.GPL3
rename to 3rdparty/qtiocompressor/LICENSE.GPL3
diff --git a/qtiocompressor/QtIOCompressor b/3rdparty/qtiocompressor/QtIOCompressor
similarity index 100%
rename from qtiocompressor/QtIOCompressor
rename to 3rdparty/qtiocompressor/QtIOCompressor
diff --git a/qtiocompressor/qtiocompressor.cpp b/3rdparty/qtiocompressor/qtiocompressor.cpp
similarity index 100%
rename from qtiocompressor/qtiocompressor.cpp
rename to 3rdparty/qtiocompressor/qtiocompressor.cpp
diff --git a/qtiocompressor/qtiocompressor.h b/3rdparty/qtiocompressor/qtiocompressor.h
similarity index 100%
rename from qtiocompressor/qtiocompressor.h
rename to 3rdparty/qtiocompressor/qtiocompressor.h
diff --git a/qtsingleapplication/CMakeLists.txt b/3rdparty/qtsingleapplication/CMakeLists.txt
similarity index 100%
rename from qtsingleapplication/CMakeLists.txt
rename to 3rdparty/qtsingleapplication/CMakeLists.txt
diff --git a/qtsingleapplication/LICENSE.LGPL b/3rdparty/qtsingleapplication/LICENSE.LGPL
similarity index 100%
rename from qtsingleapplication/LICENSE.LGPL
rename to 3rdparty/qtsingleapplication/LICENSE.LGPL
diff --git a/qtsingleapplication/QtLockedFile b/3rdparty/qtsingleapplication/QtLockedFile
similarity index 100%
rename from qtsingleapplication/QtLockedFile
rename to 3rdparty/qtsingleapplication/QtLockedFile
diff --git a/qtsingleapplication/QtSingleApplication b/3rdparty/qtsingleapplication/QtSingleApplication
similarity index 100%
rename from qtsingleapplication/QtSingleApplication
rename to 3rdparty/qtsingleapplication/QtSingleApplication
diff --git a/qtsingleapplication/qtlocalpeer.cpp b/3rdparty/qtsingleapplication/qtlocalpeer.cpp
similarity index 100%
rename from qtsingleapplication/qtlocalpeer.cpp
rename to 3rdparty/qtsingleapplication/qtlocalpeer.cpp
diff --git a/qtsingleapplication/qtlocalpeer.h b/3rdparty/qtsingleapplication/qtlocalpeer.h
similarity index 100%
rename from qtsingleapplication/qtlocalpeer.h
rename to 3rdparty/qtsingleapplication/qtlocalpeer.h
diff --git a/qtsingleapplication/qtlockedfile.cpp b/3rdparty/qtsingleapplication/qtlockedfile.cpp
similarity index 100%
rename from qtsingleapplication/qtlockedfile.cpp
rename to 3rdparty/qtsingleapplication/qtlockedfile.cpp
diff --git a/qtsingleapplication/qtlockedfile.h b/3rdparty/qtsingleapplication/qtlockedfile.h
similarity index 100%
rename from qtsingleapplication/qtlockedfile.h
rename to 3rdparty/qtsingleapplication/qtlockedfile.h
diff --git a/qtsingleapplication/qtlockedfile_unix.cpp b/3rdparty/qtsingleapplication/qtlockedfile_unix.cpp
similarity index 100%
rename from qtsingleapplication/qtlockedfile_unix.cpp
rename to 3rdparty/qtsingleapplication/qtlockedfile_unix.cpp
diff --git a/qtsingleapplication/qtlockedfile_win.cpp b/3rdparty/qtsingleapplication/qtlockedfile_win.cpp
similarity index 100%
rename from qtsingleapplication/qtlockedfile_win.cpp
rename to 3rdparty/qtsingleapplication/qtlockedfile_win.cpp
diff --git a/qtsingleapplication/qtsingleapplication.cpp b/3rdparty/qtsingleapplication/qtsingleapplication.cpp
similarity index 100%
rename from qtsingleapplication/qtsingleapplication.cpp
rename to 3rdparty/qtsingleapplication/qtsingleapplication.cpp
diff --git a/qtsingleapplication/qtsingleapplication.h b/3rdparty/qtsingleapplication/qtsingleapplication.h
similarity index 100%
rename from qtsingleapplication/qtsingleapplication.h
rename to 3rdparty/qtsingleapplication/qtsingleapplication.h
diff --git a/qtsingleapplication/qtsingleapplication.patch b/3rdparty/qtsingleapplication/qtsingleapplication.patch
similarity index 100%
rename from qtsingleapplication/qtsingleapplication.patch
rename to 3rdparty/qtsingleapplication/qtsingleapplication.patch
diff --git a/qtsingleapplication/qtsinglecoreapplication.cpp b/3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
similarity index 100%
rename from qtsingleapplication/qtsinglecoreapplication.cpp
rename to 3rdparty/qtsingleapplication/qtsinglecoreapplication.cpp
diff --git a/qtsingleapplication/qtsinglecoreapplication.h b/3rdparty/qtsingleapplication/qtsinglecoreapplication.h
similarity index 100%
rename from qtsingleapplication/qtsinglecoreapplication.h
rename to 3rdparty/qtsingleapplication/qtsinglecoreapplication.h
diff --git a/sha2/CMakeLists.txt b/3rdparty/sha2/CMakeLists.txt
similarity index 100%
rename from sha2/CMakeLists.txt
rename to 3rdparty/sha2/CMakeLists.txt
diff --git a/sha2/sha2.c b/3rdparty/sha2/sha2.c
similarity index 100%
rename from sha2/sha2.c
rename to 3rdparty/sha2/sha2.c
diff --git a/sha2/sha2.h b/3rdparty/sha2/sha2.h
similarity index 100%
rename from sha2/sha2.h
rename to 3rdparty/sha2/sha2.h
diff --git a/solid-lite/CMakeLists.txt b/3rdparty/solid-lite/CMakeLists.txt
similarity index 100%
rename from solid-lite/CMakeLists.txt
rename to 3rdparty/solid-lite/CMakeLists.txt
diff --git a/solid-lite/README b/3rdparty/solid-lite/README
similarity index 100%
rename from solid-lite/README
rename to 3rdparty/solid-lite/README
diff --git a/solid-lite/backends/hal/halblock.cpp b/3rdparty/solid-lite/backends/hal/halblock.cpp
similarity index 100%
rename from solid-lite/backends/hal/halblock.cpp
rename to 3rdparty/solid-lite/backends/hal/halblock.cpp
diff --git a/solid-lite/backends/hal/halblock.h b/3rdparty/solid-lite/backends/hal/halblock.h
similarity index 100%
rename from solid-lite/backends/hal/halblock.h
rename to 3rdparty/solid-lite/backends/hal/halblock.h
diff --git a/solid-lite/backends/hal/halcdrom.cpp b/3rdparty/solid-lite/backends/hal/halcdrom.cpp
similarity index 100%
rename from solid-lite/backends/hal/halcdrom.cpp
rename to 3rdparty/solid-lite/backends/hal/halcdrom.cpp
diff --git a/solid-lite/backends/hal/halcdrom.h b/3rdparty/solid-lite/backends/hal/halcdrom.h
similarity index 100%
rename from solid-lite/backends/hal/halcdrom.h
rename to 3rdparty/solid-lite/backends/hal/halcdrom.h
diff --git a/solid-lite/backends/hal/haldevice.cpp b/3rdparty/solid-lite/backends/hal/haldevice.cpp
similarity index 100%
rename from solid-lite/backends/hal/haldevice.cpp
rename to 3rdparty/solid-lite/backends/hal/haldevice.cpp
diff --git a/solid-lite/backends/hal/haldevice.h b/3rdparty/solid-lite/backends/hal/haldevice.h
similarity index 100%
rename from solid-lite/backends/hal/haldevice.h
rename to 3rdparty/solid-lite/backends/hal/haldevice.h
diff --git a/solid-lite/backends/hal/haldeviceinterface.cpp b/3rdparty/solid-lite/backends/hal/haldeviceinterface.cpp
similarity index 100%
rename from solid-lite/backends/hal/haldeviceinterface.cpp
rename to 3rdparty/solid-lite/backends/hal/haldeviceinterface.cpp
diff --git a/solid-lite/backends/hal/haldeviceinterface.h b/3rdparty/solid-lite/backends/hal/haldeviceinterface.h
similarity index 100%
rename from solid-lite/backends/hal/haldeviceinterface.h
rename to 3rdparty/solid-lite/backends/hal/haldeviceinterface.h
diff --git a/solid-lite/backends/hal/halfstabhandling.cpp b/3rdparty/solid-lite/backends/hal/halfstabhandling.cpp
similarity index 100%
rename from solid-lite/backends/hal/halfstabhandling.cpp
rename to 3rdparty/solid-lite/backends/hal/halfstabhandling.cpp
diff --git a/solid-lite/backends/hal/halfstabhandling.h b/3rdparty/solid-lite/backends/hal/halfstabhandling.h
similarity index 100%
rename from solid-lite/backends/hal/halfstabhandling.h
rename to 3rdparty/solid-lite/backends/hal/halfstabhandling.h
diff --git a/solid-lite/backends/hal/halgenericinterface.cpp b/3rdparty/solid-lite/backends/hal/halgenericinterface.cpp
similarity index 100%
rename from solid-lite/backends/hal/halgenericinterface.cpp
rename to 3rdparty/solid-lite/backends/hal/halgenericinterface.cpp
diff --git a/solid-lite/backends/hal/halgenericinterface.h b/3rdparty/solid-lite/backends/hal/halgenericinterface.h
similarity index 100%
rename from solid-lite/backends/hal/halgenericinterface.h
rename to 3rdparty/solid-lite/backends/hal/halgenericinterface.h
diff --git a/solid-lite/backends/hal/halmanager.cpp b/3rdparty/solid-lite/backends/hal/halmanager.cpp
similarity index 100%
rename from solid-lite/backends/hal/halmanager.cpp
rename to 3rdparty/solid-lite/backends/hal/halmanager.cpp
diff --git a/solid-lite/backends/hal/halmanager.h b/3rdparty/solid-lite/backends/hal/halmanager.h
similarity index 100%
rename from solid-lite/backends/hal/halmanager.h
rename to 3rdparty/solid-lite/backends/hal/halmanager.h
diff --git a/solid-lite/backends/hal/halopticaldisc.cpp b/3rdparty/solid-lite/backends/hal/halopticaldisc.cpp
similarity index 100%
rename from solid-lite/backends/hal/halopticaldisc.cpp
rename to 3rdparty/solid-lite/backends/hal/halopticaldisc.cpp
diff --git a/solid-lite/backends/hal/halopticaldisc.h b/3rdparty/solid-lite/backends/hal/halopticaldisc.h
similarity index 100%
rename from solid-lite/backends/hal/halopticaldisc.h
rename to 3rdparty/solid-lite/backends/hal/halopticaldisc.h
diff --git a/solid-lite/backends/hal/halportablemediaplayer.cpp b/3rdparty/solid-lite/backends/hal/halportablemediaplayer.cpp
similarity index 100%
rename from solid-lite/backends/hal/halportablemediaplayer.cpp
rename to 3rdparty/solid-lite/backends/hal/halportablemediaplayer.cpp
diff --git a/solid-lite/backends/hal/halportablemediaplayer.h b/3rdparty/solid-lite/backends/hal/halportablemediaplayer.h
similarity index 100%
rename from solid-lite/backends/hal/halportablemediaplayer.h
rename to 3rdparty/solid-lite/backends/hal/halportablemediaplayer.h
diff --git a/solid-lite/backends/hal/halstorage.cpp b/3rdparty/solid-lite/backends/hal/halstorage.cpp
similarity index 100%
rename from solid-lite/backends/hal/halstorage.cpp
rename to 3rdparty/solid-lite/backends/hal/halstorage.cpp
diff --git a/solid-lite/backends/hal/halstorage.h b/3rdparty/solid-lite/backends/hal/halstorage.h
similarity index 100%
rename from solid-lite/backends/hal/halstorage.h
rename to 3rdparty/solid-lite/backends/hal/halstorage.h
diff --git a/solid-lite/backends/hal/halstorageaccess.cpp b/3rdparty/solid-lite/backends/hal/halstorageaccess.cpp
similarity index 100%
rename from solid-lite/backends/hal/halstorageaccess.cpp
rename to 3rdparty/solid-lite/backends/hal/halstorageaccess.cpp
diff --git a/solid-lite/backends/hal/halstorageaccess.h b/3rdparty/solid-lite/backends/hal/halstorageaccess.h
similarity index 100%
rename from solid-lite/backends/hal/halstorageaccess.h
rename to 3rdparty/solid-lite/backends/hal/halstorageaccess.h
diff --git a/solid-lite/backends/hal/halvolume.cpp b/3rdparty/solid-lite/backends/hal/halvolume.cpp
similarity index 100%
rename from solid-lite/backends/hal/halvolume.cpp
rename to 3rdparty/solid-lite/backends/hal/halvolume.cpp
diff --git a/solid-lite/backends/hal/halvolume.h b/3rdparty/solid-lite/backends/hal/halvolume.h
similarity index 100%
rename from solid-lite/backends/hal/halvolume.h
rename to 3rdparty/solid-lite/backends/hal/halvolume.h
diff --git a/solid-lite/backends/iokit/cfhelper.cpp b/3rdparty/solid-lite/backends/iokit/cfhelper.cpp
similarity index 100%
rename from solid-lite/backends/iokit/cfhelper.cpp
rename to 3rdparty/solid-lite/backends/iokit/cfhelper.cpp
diff --git a/solid-lite/backends/iokit/iokitdevice.cpp b/3rdparty/solid-lite/backends/iokit/iokitdevice.cpp
similarity index 100%
rename from solid-lite/backends/iokit/iokitdevice.cpp
rename to 3rdparty/solid-lite/backends/iokit/iokitdevice.cpp
diff --git a/solid-lite/backends/iokit/iokitdevice.h b/3rdparty/solid-lite/backends/iokit/iokitdevice.h
similarity index 100%
rename from solid-lite/backends/iokit/iokitdevice.h
rename to 3rdparty/solid-lite/backends/iokit/iokitdevice.h
diff --git a/solid-lite/backends/iokit/iokitdeviceinterface.cpp b/3rdparty/solid-lite/backends/iokit/iokitdeviceinterface.cpp
similarity index 100%
rename from solid-lite/backends/iokit/iokitdeviceinterface.cpp
rename to 3rdparty/solid-lite/backends/iokit/iokitdeviceinterface.cpp
diff --git a/solid-lite/backends/iokit/iokitdeviceinterface.h b/3rdparty/solid-lite/backends/iokit/iokitdeviceinterface.h
similarity index 100%
rename from solid-lite/backends/iokit/iokitdeviceinterface.h
rename to 3rdparty/solid-lite/backends/iokit/iokitdeviceinterface.h
diff --git a/solid-lite/backends/iokit/iokitgenericinterface.cpp b/3rdparty/solid-lite/backends/iokit/iokitgenericinterface.cpp
similarity index 100%
rename from solid-lite/backends/iokit/iokitgenericinterface.cpp
rename to 3rdparty/solid-lite/backends/iokit/iokitgenericinterface.cpp
diff --git a/solid-lite/backends/iokit/iokitgenericinterface.h b/3rdparty/solid-lite/backends/iokit/iokitgenericinterface.h
similarity index 100%
rename from solid-lite/backends/iokit/iokitgenericinterface.h
rename to 3rdparty/solid-lite/backends/iokit/iokitgenericinterface.h
diff --git a/solid-lite/backends/iokit/iokitmanager.cpp b/3rdparty/solid-lite/backends/iokit/iokitmanager.cpp
similarity index 100%
rename from solid-lite/backends/iokit/iokitmanager.cpp
rename to 3rdparty/solid-lite/backends/iokit/iokitmanager.cpp
diff --git a/solid-lite/backends/iokit/iokitmanager.h b/3rdparty/solid-lite/backends/iokit/iokitmanager.h
similarity index 100%
rename from solid-lite/backends/iokit/iokitmanager.h
rename to 3rdparty/solid-lite/backends/iokit/iokitmanager.h
diff --git a/solid-lite/backends/shared/rootdevice.cpp b/3rdparty/solid-lite/backends/shared/rootdevice.cpp
similarity index 100%
rename from solid-lite/backends/shared/rootdevice.cpp
rename to 3rdparty/solid-lite/backends/shared/rootdevice.cpp
diff --git a/solid-lite/backends/shared/rootdevice.h b/3rdparty/solid-lite/backends/shared/rootdevice.h
similarity index 100%
rename from solid-lite/backends/shared/rootdevice.h
rename to 3rdparty/solid-lite/backends/shared/rootdevice.h
diff --git a/solid-lite/backends/shared/udevqt.h b/3rdparty/solid-lite/backends/shared/udevqt.h
similarity index 100%
rename from solid-lite/backends/shared/udevqt.h
rename to 3rdparty/solid-lite/backends/shared/udevqt.h
diff --git a/solid-lite/backends/shared/udevqt_p.h b/3rdparty/solid-lite/backends/shared/udevqt_p.h
similarity index 100%
rename from solid-lite/backends/shared/udevqt_p.h
rename to 3rdparty/solid-lite/backends/shared/udevqt_p.h
diff --git a/solid-lite/backends/shared/udevqtclient.cpp b/3rdparty/solid-lite/backends/shared/udevqtclient.cpp
similarity index 100%
rename from solid-lite/backends/shared/udevqtclient.cpp
rename to 3rdparty/solid-lite/backends/shared/udevqtclient.cpp
diff --git a/solid-lite/backends/shared/udevqtdevice.cpp b/3rdparty/solid-lite/backends/shared/udevqtdevice.cpp
similarity index 100%
rename from solid-lite/backends/shared/udevqtdevice.cpp
rename to 3rdparty/solid-lite/backends/shared/udevqtdevice.cpp
diff --git a/solid-lite/backends/udev/udev.h b/3rdparty/solid-lite/backends/udev/udev.h
similarity index 100%
rename from solid-lite/backends/udev/udev.h
rename to 3rdparty/solid-lite/backends/udev/udev.h
diff --git a/solid-lite/backends/udev/udevblock.cpp b/3rdparty/solid-lite/backends/udev/udevblock.cpp
similarity index 100%
rename from solid-lite/backends/udev/udevblock.cpp
rename to 3rdparty/solid-lite/backends/udev/udevblock.cpp
diff --git a/solid-lite/backends/udev/udevblock.h b/3rdparty/solid-lite/backends/udev/udevblock.h
similarity index 100%
rename from solid-lite/backends/udev/udevblock.h
rename to 3rdparty/solid-lite/backends/udev/udevblock.h
diff --git a/solid-lite/backends/udev/udevdevice.cpp b/3rdparty/solid-lite/backends/udev/udevdevice.cpp
similarity index 100%
rename from solid-lite/backends/udev/udevdevice.cpp
rename to 3rdparty/solid-lite/backends/udev/udevdevice.cpp
diff --git a/solid-lite/backends/udev/udevdevice.h b/3rdparty/solid-lite/backends/udev/udevdevice.h
similarity index 100%
rename from solid-lite/backends/udev/udevdevice.h
rename to 3rdparty/solid-lite/backends/udev/udevdevice.h
diff --git a/solid-lite/backends/udev/udevdeviceinterface.cpp b/3rdparty/solid-lite/backends/udev/udevdeviceinterface.cpp
similarity index 100%
rename from solid-lite/backends/udev/udevdeviceinterface.cpp
rename to 3rdparty/solid-lite/backends/udev/udevdeviceinterface.cpp
diff --git a/solid-lite/backends/udev/udevdeviceinterface.h b/3rdparty/solid-lite/backends/udev/udevdeviceinterface.h
similarity index 100%
rename from solid-lite/backends/udev/udevdeviceinterface.h
rename to 3rdparty/solid-lite/backends/udev/udevdeviceinterface.h
diff --git a/solid-lite/backends/udev/udevgenericinterface.cpp b/3rdparty/solid-lite/backends/udev/udevgenericinterface.cpp
similarity index 100%
rename from solid-lite/backends/udev/udevgenericinterface.cpp
rename to 3rdparty/solid-lite/backends/udev/udevgenericinterface.cpp
diff --git a/solid-lite/backends/udev/udevgenericinterface.h b/3rdparty/solid-lite/backends/udev/udevgenericinterface.h
similarity index 100%
rename from solid-lite/backends/udev/udevgenericinterface.h
rename to 3rdparty/solid-lite/backends/udev/udevgenericinterface.h
diff --git a/solid-lite/backends/udev/udevmanager.cpp b/3rdparty/solid-lite/backends/udev/udevmanager.cpp
similarity index 100%
rename from solid-lite/backends/udev/udevmanager.cpp
rename to 3rdparty/solid-lite/backends/udev/udevmanager.cpp
diff --git a/solid-lite/backends/udev/udevmanager.h b/3rdparty/solid-lite/backends/udev/udevmanager.h
similarity index 100%
rename from solid-lite/backends/udev/udevmanager.h
rename to 3rdparty/solid-lite/backends/udev/udevmanager.h
diff --git a/solid-lite/backends/udev/udevportablemediaplayer.cpp b/3rdparty/solid-lite/backends/udev/udevportablemediaplayer.cpp
similarity index 100%
rename from solid-lite/backends/udev/udevportablemediaplayer.cpp
rename to 3rdparty/solid-lite/backends/udev/udevportablemediaplayer.cpp
diff --git a/solid-lite/backends/udev/udevportablemediaplayer.h b/3rdparty/solid-lite/backends/udev/udevportablemediaplayer.h
similarity index 100%
rename from solid-lite/backends/udev/udevportablemediaplayer.h
rename to 3rdparty/solid-lite/backends/udev/udevportablemediaplayer.h
diff --git a/solid-lite/backends/udisks/udisks.h b/3rdparty/solid-lite/backends/udisks/udisks.h
similarity index 100%
rename from solid-lite/backends/udisks/udisks.h
rename to 3rdparty/solid-lite/backends/udisks/udisks.h
diff --git a/solid-lite/backends/udisks/udisksblock.cpp b/3rdparty/solid-lite/backends/udisks/udisksblock.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksblock.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksblock.cpp
diff --git a/solid-lite/backends/udisks/udisksblock.h b/3rdparty/solid-lite/backends/udisks/udisksblock.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksblock.h
rename to 3rdparty/solid-lite/backends/udisks/udisksblock.h
diff --git a/solid-lite/backends/udisks/udisksdevice.cpp b/3rdparty/solid-lite/backends/udisks/udisksdevice.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksdevice.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksdevice.cpp
diff --git a/solid-lite/backends/udisks/udisksdevice.h b/3rdparty/solid-lite/backends/udisks/udisksdevice.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksdevice.h
rename to 3rdparty/solid-lite/backends/udisks/udisksdevice.h
diff --git a/solid-lite/backends/udisks/udisksdeviceinterface.cpp b/3rdparty/solid-lite/backends/udisks/udisksdeviceinterface.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksdeviceinterface.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksdeviceinterface.cpp
diff --git a/solid-lite/backends/udisks/udisksdeviceinterface.h b/3rdparty/solid-lite/backends/udisks/udisksdeviceinterface.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksdeviceinterface.h
rename to 3rdparty/solid-lite/backends/udisks/udisksdeviceinterface.h
diff --git a/solid-lite/backends/udisks/udisksgenericinterface.cpp b/3rdparty/solid-lite/backends/udisks/udisksgenericinterface.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksgenericinterface.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksgenericinterface.cpp
diff --git a/solid-lite/backends/udisks/udisksgenericinterface.h b/3rdparty/solid-lite/backends/udisks/udisksgenericinterface.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksgenericinterface.h
rename to 3rdparty/solid-lite/backends/udisks/udisksgenericinterface.h
diff --git a/solid-lite/backends/udisks/udisksmanager.cpp b/3rdparty/solid-lite/backends/udisks/udisksmanager.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksmanager.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksmanager.cpp
diff --git a/solid-lite/backends/udisks/udisksmanager.h b/3rdparty/solid-lite/backends/udisks/udisksmanager.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksmanager.h
rename to 3rdparty/solid-lite/backends/udisks/udisksmanager.h
diff --git a/solid-lite/backends/udisks/udisksopticaldisc.cpp b/3rdparty/solid-lite/backends/udisks/udisksopticaldisc.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksopticaldisc.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksopticaldisc.cpp
diff --git a/solid-lite/backends/udisks/udisksopticaldisc.h b/3rdparty/solid-lite/backends/udisks/udisksopticaldisc.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksopticaldisc.h
rename to 3rdparty/solid-lite/backends/udisks/udisksopticaldisc.h
diff --git a/solid-lite/backends/udisks/udisksopticaldrive.cpp b/3rdparty/solid-lite/backends/udisks/udisksopticaldrive.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksopticaldrive.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksopticaldrive.cpp
diff --git a/solid-lite/backends/udisks/udisksopticaldrive.h b/3rdparty/solid-lite/backends/udisks/udisksopticaldrive.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksopticaldrive.h
rename to 3rdparty/solid-lite/backends/udisks/udisksopticaldrive.h
diff --git a/solid-lite/backends/udisks/udisksstorageaccess.cpp b/3rdparty/solid-lite/backends/udisks/udisksstorageaccess.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksstorageaccess.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksstorageaccess.cpp
diff --git a/solid-lite/backends/udisks/udisksstorageaccess.h b/3rdparty/solid-lite/backends/udisks/udisksstorageaccess.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksstorageaccess.h
rename to 3rdparty/solid-lite/backends/udisks/udisksstorageaccess.h
diff --git a/solid-lite/backends/udisks/udisksstoragedrive.cpp b/3rdparty/solid-lite/backends/udisks/udisksstoragedrive.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksstoragedrive.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksstoragedrive.cpp
diff --git a/solid-lite/backends/udisks/udisksstoragedrive.h b/3rdparty/solid-lite/backends/udisks/udisksstoragedrive.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksstoragedrive.h
rename to 3rdparty/solid-lite/backends/udisks/udisksstoragedrive.h
diff --git a/solid-lite/backends/udisks/udisksstoragevolume.cpp b/3rdparty/solid-lite/backends/udisks/udisksstoragevolume.cpp
similarity index 100%
rename from solid-lite/backends/udisks/udisksstoragevolume.cpp
rename to 3rdparty/solid-lite/backends/udisks/udisksstoragevolume.cpp
diff --git a/solid-lite/backends/udisks/udisksstoragevolume.h b/3rdparty/solid-lite/backends/udisks/udisksstoragevolume.h
similarity index 100%
rename from solid-lite/backends/udisks/udisksstoragevolume.h
rename to 3rdparty/solid-lite/backends/udisks/udisksstoragevolume.h
diff --git a/solid-lite/backends/udisks2/dbus/manager.cpp b/3rdparty/solid-lite/backends/udisks2/dbus/manager.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/dbus/manager.cpp
rename to 3rdparty/solid-lite/backends/udisks2/dbus/manager.cpp
diff --git a/solid-lite/backends/udisks2/dbus/manager.h b/3rdparty/solid-lite/backends/udisks2/dbus/manager.h
similarity index 100%
rename from solid-lite/backends/udisks2/dbus/manager.h
rename to 3rdparty/solid-lite/backends/udisks2/dbus/manager.h
diff --git a/solid-lite/backends/udisks2/dbus/manager.xml b/3rdparty/solid-lite/backends/udisks2/dbus/manager.xml
similarity index 100%
rename from solid-lite/backends/udisks2/dbus/manager.xml
rename to 3rdparty/solid-lite/backends/udisks2/dbus/manager.xml
diff --git a/solid-lite/backends/udisks2/udisks2.h b/3rdparty/solid-lite/backends/udisks2/udisks2.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisks2.h
rename to 3rdparty/solid-lite/backends/udisks2/udisks2.h
diff --git a/solid-lite/backends/udisks2/udisksblock.cpp b/3rdparty/solid-lite/backends/udisks2/udisksblock.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksblock.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksblock.cpp
diff --git a/solid-lite/backends/udisks2/udisksblock.h b/3rdparty/solid-lite/backends/udisks2/udisksblock.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksblock.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksblock.h
diff --git a/solid-lite/backends/udisks2/udisksdevice.cpp b/3rdparty/solid-lite/backends/udisks2/udisksdevice.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksdevice.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksdevice.cpp
diff --git a/solid-lite/backends/udisks2/udisksdevice.h b/3rdparty/solid-lite/backends/udisks2/udisksdevice.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksdevice.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksdevice.h
diff --git a/solid-lite/backends/udisks2/udisksdevicebackend.cpp b/3rdparty/solid-lite/backends/udisks2/udisksdevicebackend.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksdevicebackend.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksdevicebackend.cpp
diff --git a/solid-lite/backends/udisks2/udisksdevicebackend.h b/3rdparty/solid-lite/backends/udisks2/udisksdevicebackend.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksdevicebackend.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksdevicebackend.h
diff --git a/solid-lite/backends/udisks2/udisksdeviceinterface.cpp b/3rdparty/solid-lite/backends/udisks2/udisksdeviceinterface.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksdeviceinterface.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksdeviceinterface.cpp
diff --git a/solid-lite/backends/udisks2/udisksdeviceinterface.h b/3rdparty/solid-lite/backends/udisks2/udisksdeviceinterface.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksdeviceinterface.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksdeviceinterface.h
diff --git a/solid-lite/backends/udisks2/udisksgenericinterface.cpp b/3rdparty/solid-lite/backends/udisks2/udisksgenericinterface.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksgenericinterface.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksgenericinterface.cpp
diff --git a/solid-lite/backends/udisks2/udisksgenericinterface.h b/3rdparty/solid-lite/backends/udisks2/udisksgenericinterface.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksgenericinterface.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksgenericinterface.h
diff --git a/solid-lite/backends/udisks2/udisksmanager.cpp b/3rdparty/solid-lite/backends/udisks2/udisksmanager.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksmanager.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksmanager.cpp
diff --git a/solid-lite/backends/udisks2/udisksmanager.h b/3rdparty/solid-lite/backends/udisks2/udisksmanager.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksmanager.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksmanager.h
diff --git a/solid-lite/backends/udisks2/udisksopticaldisc.cpp b/3rdparty/solid-lite/backends/udisks2/udisksopticaldisc.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksopticaldisc.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksopticaldisc.cpp
diff --git a/solid-lite/backends/udisks2/udisksopticaldisc.h b/3rdparty/solid-lite/backends/udisks2/udisksopticaldisc.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksopticaldisc.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksopticaldisc.h
diff --git a/solid-lite/backends/udisks2/udisksopticaldrive.cpp b/3rdparty/solid-lite/backends/udisks2/udisksopticaldrive.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksopticaldrive.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksopticaldrive.cpp
diff --git a/solid-lite/backends/udisks2/udisksopticaldrive.h b/3rdparty/solid-lite/backends/udisks2/udisksopticaldrive.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksopticaldrive.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksopticaldrive.h
diff --git a/solid-lite/backends/udisks2/udisksstorageaccess.cpp b/3rdparty/solid-lite/backends/udisks2/udisksstorageaccess.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksstorageaccess.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksstorageaccess.cpp
diff --git a/solid-lite/backends/udisks2/udisksstorageaccess.h b/3rdparty/solid-lite/backends/udisks2/udisksstorageaccess.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksstorageaccess.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksstorageaccess.h
diff --git a/solid-lite/backends/udisks2/udisksstoragedrive.cpp b/3rdparty/solid-lite/backends/udisks2/udisksstoragedrive.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksstoragedrive.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksstoragedrive.cpp
diff --git a/solid-lite/backends/udisks2/udisksstoragedrive.h b/3rdparty/solid-lite/backends/udisks2/udisksstoragedrive.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksstoragedrive.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksstoragedrive.h
diff --git a/solid-lite/backends/udisks2/udisksstoragevolume.cpp b/3rdparty/solid-lite/backends/udisks2/udisksstoragevolume.cpp
similarity index 100%
rename from solid-lite/backends/udisks2/udisksstoragevolume.cpp
rename to 3rdparty/solid-lite/backends/udisks2/udisksstoragevolume.cpp
diff --git a/solid-lite/backends/udisks2/udisksstoragevolume.h b/3rdparty/solid-lite/backends/udisks2/udisksstoragevolume.h
similarity index 100%
rename from solid-lite/backends/udisks2/udisksstoragevolume.h
rename to 3rdparty/solid-lite/backends/udisks2/udisksstoragevolume.h
diff --git a/solid-lite/backends/wmi/wmiblock.cpp b/3rdparty/solid-lite/backends/wmi/wmiblock.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmiblock.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmiblock.cpp
diff --git a/solid-lite/backends/wmi/wmiblock.h b/3rdparty/solid-lite/backends/wmi/wmiblock.h
similarity index 100%
rename from solid-lite/backends/wmi/wmiblock.h
rename to 3rdparty/solid-lite/backends/wmi/wmiblock.h
diff --git a/solid-lite/backends/wmi/wmicdrom.cpp b/3rdparty/solid-lite/backends/wmi/wmicdrom.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmicdrom.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmicdrom.cpp
diff --git a/solid-lite/backends/wmi/wmicdrom.h b/3rdparty/solid-lite/backends/wmi/wmicdrom.h
similarity index 100%
rename from solid-lite/backends/wmi/wmicdrom.h
rename to 3rdparty/solid-lite/backends/wmi/wmicdrom.h
diff --git a/solid-lite/backends/wmi/wmidevice.cpp b/3rdparty/solid-lite/backends/wmi/wmidevice.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmidevice.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmidevice.cpp
diff --git a/solid-lite/backends/wmi/wmidevice.h b/3rdparty/solid-lite/backends/wmi/wmidevice.h
similarity index 100%
rename from solid-lite/backends/wmi/wmidevice.h
rename to 3rdparty/solid-lite/backends/wmi/wmidevice.h
diff --git a/solid-lite/backends/wmi/wmideviceinterface.cpp b/3rdparty/solid-lite/backends/wmi/wmideviceinterface.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmideviceinterface.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmideviceinterface.cpp
diff --git a/solid-lite/backends/wmi/wmideviceinterface.h b/3rdparty/solid-lite/backends/wmi/wmideviceinterface.h
similarity index 100%
rename from solid-lite/backends/wmi/wmideviceinterface.h
rename to 3rdparty/solid-lite/backends/wmi/wmideviceinterface.h
diff --git a/solid-lite/backends/wmi/wmigenericinterface.cpp b/3rdparty/solid-lite/backends/wmi/wmigenericinterface.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmigenericinterface.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmigenericinterface.cpp
diff --git a/solid-lite/backends/wmi/wmigenericinterface.h b/3rdparty/solid-lite/backends/wmi/wmigenericinterface.h
similarity index 100%
rename from solid-lite/backends/wmi/wmigenericinterface.h
rename to 3rdparty/solid-lite/backends/wmi/wmigenericinterface.h
diff --git a/solid-lite/backends/wmi/wmimanager.cpp b/3rdparty/solid-lite/backends/wmi/wmimanager.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmimanager.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmimanager.cpp
diff --git a/solid-lite/backends/wmi/wmimanager.h b/3rdparty/solid-lite/backends/wmi/wmimanager.h
similarity index 100%
rename from solid-lite/backends/wmi/wmimanager.h
rename to 3rdparty/solid-lite/backends/wmi/wmimanager.h
diff --git a/solid-lite/backends/wmi/wmiopticaldisc.cpp b/3rdparty/solid-lite/backends/wmi/wmiopticaldisc.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmiopticaldisc.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmiopticaldisc.cpp
diff --git a/solid-lite/backends/wmi/wmiopticaldisc.h b/3rdparty/solid-lite/backends/wmi/wmiopticaldisc.h
similarity index 100%
rename from solid-lite/backends/wmi/wmiopticaldisc.h
rename to 3rdparty/solid-lite/backends/wmi/wmiopticaldisc.h
diff --git a/solid-lite/backends/wmi/wmiportablemediaplayer.cpp b/3rdparty/solid-lite/backends/wmi/wmiportablemediaplayer.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmiportablemediaplayer.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmiportablemediaplayer.cpp
diff --git a/solid-lite/backends/wmi/wmiportablemediaplayer.h b/3rdparty/solid-lite/backends/wmi/wmiportablemediaplayer.h
similarity index 100%
rename from solid-lite/backends/wmi/wmiportablemediaplayer.h
rename to 3rdparty/solid-lite/backends/wmi/wmiportablemediaplayer.h
diff --git a/solid-lite/backends/wmi/wmiquery.cpp b/3rdparty/solid-lite/backends/wmi/wmiquery.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmiquery.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmiquery.cpp
diff --git a/solid-lite/backends/wmi/wmiquery.h b/3rdparty/solid-lite/backends/wmi/wmiquery.h
similarity index 100%
rename from solid-lite/backends/wmi/wmiquery.h
rename to 3rdparty/solid-lite/backends/wmi/wmiquery.h
diff --git a/solid-lite/backends/wmi/wmistorage.cpp b/3rdparty/solid-lite/backends/wmi/wmistorage.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmistorage.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmistorage.cpp
diff --git a/solid-lite/backends/wmi/wmistorage.h b/3rdparty/solid-lite/backends/wmi/wmistorage.h
similarity index 100%
rename from solid-lite/backends/wmi/wmistorage.h
rename to 3rdparty/solid-lite/backends/wmi/wmistorage.h
diff --git a/solid-lite/backends/wmi/wmistorageaccess.cpp b/3rdparty/solid-lite/backends/wmi/wmistorageaccess.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmistorageaccess.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmistorageaccess.cpp
diff --git a/solid-lite/backends/wmi/wmistorageaccess.h b/3rdparty/solid-lite/backends/wmi/wmistorageaccess.h
similarity index 100%
rename from solid-lite/backends/wmi/wmistorageaccess.h
rename to 3rdparty/solid-lite/backends/wmi/wmistorageaccess.h
diff --git a/solid-lite/backends/wmi/wmivolume.cpp b/3rdparty/solid-lite/backends/wmi/wmivolume.cpp
similarity index 100%
rename from solid-lite/backends/wmi/wmivolume.cpp
rename to 3rdparty/solid-lite/backends/wmi/wmivolume.cpp
diff --git a/solid-lite/backends/wmi/wmivolume.h b/3rdparty/solid-lite/backends/wmi/wmivolume.h
similarity index 100%
rename from solid-lite/backends/wmi/wmivolume.h
rename to 3rdparty/solid-lite/backends/wmi/wmivolume.h
diff --git a/solid-lite/block.cpp b/3rdparty/solid-lite/block.cpp
similarity index 100%
rename from solid-lite/block.cpp
rename to 3rdparty/solid-lite/block.cpp
diff --git a/solid-lite/block.h b/3rdparty/solid-lite/block.h
similarity index 100%
rename from solid-lite/block.h
rename to 3rdparty/solid-lite/block.h
diff --git a/solid-lite/block_p.h b/3rdparty/solid-lite/block_p.h
similarity index 100%
rename from solid-lite/block_p.h
rename to 3rdparty/solid-lite/block_p.h
diff --git a/solid-lite/config-solid.h.cmake b/3rdparty/solid-lite/config-solid.h.cmake
similarity index 100%
rename from solid-lite/config-solid.h.cmake
rename to 3rdparty/solid-lite/config-solid.h.cmake
diff --git a/solid-lite/device.cpp b/3rdparty/solid-lite/device.cpp
similarity index 100%
rename from solid-lite/device.cpp
rename to 3rdparty/solid-lite/device.cpp
diff --git a/solid-lite/device.h b/3rdparty/solid-lite/device.h
similarity index 100%
rename from solid-lite/device.h
rename to 3rdparty/solid-lite/device.h
diff --git a/solid-lite/device_p.h b/3rdparty/solid-lite/device_p.h
similarity index 100%
rename from solid-lite/device_p.h
rename to 3rdparty/solid-lite/device_p.h
diff --git a/solid-lite/deviceinterface.cpp b/3rdparty/solid-lite/deviceinterface.cpp
similarity index 100%
rename from solid-lite/deviceinterface.cpp
rename to 3rdparty/solid-lite/deviceinterface.cpp
diff --git a/solid-lite/deviceinterface.h b/3rdparty/solid-lite/deviceinterface.h
similarity index 100%
rename from solid-lite/deviceinterface.h
rename to 3rdparty/solid-lite/deviceinterface.h
diff --git a/solid-lite/deviceinterface_p.h b/3rdparty/solid-lite/deviceinterface_p.h
similarity index 100%
rename from solid-lite/deviceinterface_p.h
rename to 3rdparty/solid-lite/deviceinterface_p.h
diff --git a/solid-lite/devicemanager.cpp b/3rdparty/solid-lite/devicemanager.cpp
similarity index 100%
rename from solid-lite/devicemanager.cpp
rename to 3rdparty/solid-lite/devicemanager.cpp
diff --git a/solid-lite/devicemanager_p.h b/3rdparty/solid-lite/devicemanager_p.h
similarity index 100%
rename from solid-lite/devicemanager_p.h
rename to 3rdparty/solid-lite/devicemanager_p.h
diff --git a/solid-lite/devicenotifier.h b/3rdparty/solid-lite/devicenotifier.h
similarity index 100%
rename from solid-lite/devicenotifier.h
rename to 3rdparty/solid-lite/devicenotifier.h
diff --git a/solid-lite/genericinterface.cpp b/3rdparty/solid-lite/genericinterface.cpp
similarity index 100%
rename from solid-lite/genericinterface.cpp
rename to 3rdparty/solid-lite/genericinterface.cpp
diff --git a/solid-lite/genericinterface.h b/3rdparty/solid-lite/genericinterface.h
similarity index 100%
rename from solid-lite/genericinterface.h
rename to 3rdparty/solid-lite/genericinterface.h
diff --git a/solid-lite/genericinterface_p.h b/3rdparty/solid-lite/genericinterface_p.h
similarity index 100%
rename from solid-lite/genericinterface_p.h
rename to 3rdparty/solid-lite/genericinterface_p.h
diff --git a/solid-lite/ifaces/CMakeLists.txt b/3rdparty/solid-lite/ifaces/CMakeLists.txt
similarity index 100%
rename from solid-lite/ifaces/CMakeLists.txt
rename to 3rdparty/solid-lite/ifaces/CMakeLists.txt
diff --git a/solid-lite/ifaces/block.cpp b/3rdparty/solid-lite/ifaces/block.cpp
similarity index 100%
rename from solid-lite/ifaces/block.cpp
rename to 3rdparty/solid-lite/ifaces/block.cpp
diff --git a/solid-lite/ifaces/block.h b/3rdparty/solid-lite/ifaces/block.h
similarity index 100%
rename from solid-lite/ifaces/block.h
rename to 3rdparty/solid-lite/ifaces/block.h
diff --git a/solid-lite/ifaces/device.cpp b/3rdparty/solid-lite/ifaces/device.cpp
similarity index 100%
rename from solid-lite/ifaces/device.cpp
rename to 3rdparty/solid-lite/ifaces/device.cpp
diff --git a/solid-lite/ifaces/device.h b/3rdparty/solid-lite/ifaces/device.h
similarity index 100%
rename from solid-lite/ifaces/device.h
rename to 3rdparty/solid-lite/ifaces/device.h
diff --git a/solid-lite/ifaces/deviceinterface.cpp b/3rdparty/solid-lite/ifaces/deviceinterface.cpp
similarity index 100%
rename from solid-lite/ifaces/deviceinterface.cpp
rename to 3rdparty/solid-lite/ifaces/deviceinterface.cpp
diff --git a/solid-lite/ifaces/deviceinterface.h b/3rdparty/solid-lite/ifaces/deviceinterface.h
similarity index 100%
rename from solid-lite/ifaces/deviceinterface.h
rename to 3rdparty/solid-lite/ifaces/deviceinterface.h
diff --git a/solid-lite/ifaces/devicemanager.cpp b/3rdparty/solid-lite/ifaces/devicemanager.cpp
similarity index 100%
rename from solid-lite/ifaces/devicemanager.cpp
rename to 3rdparty/solid-lite/ifaces/devicemanager.cpp
diff --git a/solid-lite/ifaces/devicemanager.h b/3rdparty/solid-lite/ifaces/devicemanager.h
similarity index 100%
rename from solid-lite/ifaces/devicemanager.h
rename to 3rdparty/solid-lite/ifaces/devicemanager.h
diff --git a/solid-lite/ifaces/genericinterface.cpp b/3rdparty/solid-lite/ifaces/genericinterface.cpp
similarity index 100%
rename from solid-lite/ifaces/genericinterface.cpp
rename to 3rdparty/solid-lite/ifaces/genericinterface.cpp
diff --git a/solid-lite/ifaces/genericinterface.h b/3rdparty/solid-lite/ifaces/genericinterface.h
similarity index 100%
rename from solid-lite/ifaces/genericinterface.h
rename to 3rdparty/solid-lite/ifaces/genericinterface.h
diff --git a/solid-lite/ifaces/opticaldisc.cpp b/3rdparty/solid-lite/ifaces/opticaldisc.cpp
similarity index 100%
rename from solid-lite/ifaces/opticaldisc.cpp
rename to 3rdparty/solid-lite/ifaces/opticaldisc.cpp
diff --git a/solid-lite/ifaces/opticaldisc.h b/3rdparty/solid-lite/ifaces/opticaldisc.h
similarity index 100%
rename from solid-lite/ifaces/opticaldisc.h
rename to 3rdparty/solid-lite/ifaces/opticaldisc.h
diff --git a/solid-lite/ifaces/opticaldrive.cpp b/3rdparty/solid-lite/ifaces/opticaldrive.cpp
similarity index 100%
rename from solid-lite/ifaces/opticaldrive.cpp
rename to 3rdparty/solid-lite/ifaces/opticaldrive.cpp
diff --git a/solid-lite/ifaces/opticaldrive.h b/3rdparty/solid-lite/ifaces/opticaldrive.h
similarity index 100%
rename from solid-lite/ifaces/opticaldrive.h
rename to 3rdparty/solid-lite/ifaces/opticaldrive.h
diff --git a/solid-lite/ifaces/portablemediaplayer.cpp b/3rdparty/solid-lite/ifaces/portablemediaplayer.cpp
similarity index 100%
rename from solid-lite/ifaces/portablemediaplayer.cpp
rename to 3rdparty/solid-lite/ifaces/portablemediaplayer.cpp
diff --git a/solid-lite/ifaces/portablemediaplayer.h b/3rdparty/solid-lite/ifaces/portablemediaplayer.h
similarity index 100%
rename from solid-lite/ifaces/portablemediaplayer.h
rename to 3rdparty/solid-lite/ifaces/portablemediaplayer.h
diff --git a/solid-lite/ifaces/storageaccess.cpp b/3rdparty/solid-lite/ifaces/storageaccess.cpp
similarity index 100%
rename from solid-lite/ifaces/storageaccess.cpp
rename to 3rdparty/solid-lite/ifaces/storageaccess.cpp
diff --git a/solid-lite/ifaces/storageaccess.h b/3rdparty/solid-lite/ifaces/storageaccess.h
similarity index 100%
rename from solid-lite/ifaces/storageaccess.h
rename to 3rdparty/solid-lite/ifaces/storageaccess.h
diff --git a/solid-lite/ifaces/storagedrive.cpp b/3rdparty/solid-lite/ifaces/storagedrive.cpp
similarity index 100%
rename from solid-lite/ifaces/storagedrive.cpp
rename to 3rdparty/solid-lite/ifaces/storagedrive.cpp
diff --git a/solid-lite/ifaces/storagedrive.h b/3rdparty/solid-lite/ifaces/storagedrive.h
similarity index 100%
rename from solid-lite/ifaces/storagedrive.h
rename to 3rdparty/solid-lite/ifaces/storagedrive.h
diff --git a/solid-lite/ifaces/storagevolume.cpp b/3rdparty/solid-lite/ifaces/storagevolume.cpp
similarity index 100%
rename from solid-lite/ifaces/storagevolume.cpp
rename to 3rdparty/solid-lite/ifaces/storagevolume.cpp
diff --git a/solid-lite/ifaces/storagevolume.h b/3rdparty/solid-lite/ifaces/storagevolume.h
similarity index 100%
rename from solid-lite/ifaces/storagevolume.h
rename to 3rdparty/solid-lite/ifaces/storagevolume.h
diff --git a/solid-lite/managerbase.cpp b/3rdparty/solid-lite/managerbase.cpp
similarity index 100%
rename from solid-lite/managerbase.cpp
rename to 3rdparty/solid-lite/managerbase.cpp
diff --git a/solid-lite/managerbase_p.h b/3rdparty/solid-lite/managerbase_p.h
similarity index 100%
rename from solid-lite/managerbase_p.h
rename to 3rdparty/solid-lite/managerbase_p.h
diff --git a/solid-lite/opticaldisc.cpp b/3rdparty/solid-lite/opticaldisc.cpp
similarity index 100%
rename from solid-lite/opticaldisc.cpp
rename to 3rdparty/solid-lite/opticaldisc.cpp
diff --git a/solid-lite/opticaldisc.h b/3rdparty/solid-lite/opticaldisc.h
similarity index 100%
rename from solid-lite/opticaldisc.h
rename to 3rdparty/solid-lite/opticaldisc.h
diff --git a/solid-lite/opticaldisc_p.h b/3rdparty/solid-lite/opticaldisc_p.h
similarity index 100%
rename from solid-lite/opticaldisc_p.h
rename to 3rdparty/solid-lite/opticaldisc_p.h
diff --git a/solid-lite/opticaldrive.cpp b/3rdparty/solid-lite/opticaldrive.cpp
similarity index 100%
rename from solid-lite/opticaldrive.cpp
rename to 3rdparty/solid-lite/opticaldrive.cpp
diff --git a/solid-lite/opticaldrive.h b/3rdparty/solid-lite/opticaldrive.h
similarity index 100%
rename from solid-lite/opticaldrive.h
rename to 3rdparty/solid-lite/opticaldrive.h
diff --git a/solid-lite/opticaldrive_p.h b/3rdparty/solid-lite/opticaldrive_p.h
similarity index 100%
rename from solid-lite/opticaldrive_p.h
rename to 3rdparty/solid-lite/opticaldrive_p.h
diff --git a/solid-lite/portablemediaplayer.cpp b/3rdparty/solid-lite/portablemediaplayer.cpp
similarity index 100%
rename from solid-lite/portablemediaplayer.cpp
rename to 3rdparty/solid-lite/portablemediaplayer.cpp
diff --git a/solid-lite/portablemediaplayer.h b/3rdparty/solid-lite/portablemediaplayer.h
similarity index 100%
rename from solid-lite/portablemediaplayer.h
rename to 3rdparty/solid-lite/portablemediaplayer.h
diff --git a/solid-lite/portablemediaplayer_p.h b/3rdparty/solid-lite/portablemediaplayer_p.h
similarity index 100%
rename from solid-lite/portablemediaplayer_p.h
rename to 3rdparty/solid-lite/portablemediaplayer_p.h
diff --git a/solid-lite/predicate.cpp b/3rdparty/solid-lite/predicate.cpp
similarity index 100%
rename from solid-lite/predicate.cpp
rename to 3rdparty/solid-lite/predicate.cpp
diff --git a/solid-lite/predicate.h b/3rdparty/solid-lite/predicate.h
similarity index 100%
rename from solid-lite/predicate.h
rename to 3rdparty/solid-lite/predicate.h
diff --git a/solid-lite/predicate_lexer.c b/3rdparty/solid-lite/predicate_lexer.c
similarity index 100%
rename from solid-lite/predicate_lexer.c
rename to 3rdparty/solid-lite/predicate_lexer.c
diff --git a/solid-lite/predicate_lexer.l b/3rdparty/solid-lite/predicate_lexer.l
similarity index 100%
rename from solid-lite/predicate_lexer.l
rename to 3rdparty/solid-lite/predicate_lexer.l
diff --git a/solid-lite/predicate_parser.c b/3rdparty/solid-lite/predicate_parser.c
similarity index 100%
rename from solid-lite/predicate_parser.c
rename to 3rdparty/solid-lite/predicate_parser.c
diff --git a/solid-lite/predicate_parser.h b/3rdparty/solid-lite/predicate_parser.h
similarity index 100%
rename from solid-lite/predicate_parser.h
rename to 3rdparty/solid-lite/predicate_parser.h
diff --git a/solid-lite/predicate_parser.y b/3rdparty/solid-lite/predicate_parser.y
similarity index 100%
rename from solid-lite/predicate_parser.y
rename to 3rdparty/solid-lite/predicate_parser.y
diff --git a/solid-lite/predicateparse.cpp b/3rdparty/solid-lite/predicateparse.cpp
similarity index 100%
rename from solid-lite/predicateparse.cpp
rename to 3rdparty/solid-lite/predicateparse.cpp
diff --git a/solid-lite/predicateparse.h b/3rdparty/solid-lite/predicateparse.h
similarity index 100%
rename from solid-lite/predicateparse.h
rename to 3rdparty/solid-lite/predicateparse.h
diff --git a/solid-lite/solid_export.h b/3rdparty/solid-lite/solid_export.h
similarity index 100%
rename from solid-lite/solid_export.h
rename to 3rdparty/solid-lite/solid_export.h
diff --git a/solid-lite/soliddefs_p.h b/3rdparty/solid-lite/soliddefs_p.h
similarity index 100%
rename from solid-lite/soliddefs_p.h
rename to 3rdparty/solid-lite/soliddefs_p.h
diff --git a/solid-lite/solidnamespace.cpp b/3rdparty/solid-lite/solidnamespace.cpp
similarity index 100%
rename from solid-lite/solidnamespace.cpp
rename to 3rdparty/solid-lite/solidnamespace.cpp
diff --git a/solid-lite/solidnamespace.h b/3rdparty/solid-lite/solidnamespace.h
similarity index 100%
rename from solid-lite/solidnamespace.h
rename to 3rdparty/solid-lite/solidnamespace.h
diff --git a/solid-lite/storageaccess.cpp b/3rdparty/solid-lite/storageaccess.cpp
similarity index 100%
rename from solid-lite/storageaccess.cpp
rename to 3rdparty/solid-lite/storageaccess.cpp
diff --git a/solid-lite/storageaccess.h b/3rdparty/solid-lite/storageaccess.h
similarity index 100%
rename from solid-lite/storageaccess.h
rename to 3rdparty/solid-lite/storageaccess.h
diff --git a/solid-lite/storageaccess_p.h b/3rdparty/solid-lite/storageaccess_p.h
similarity index 100%
rename from solid-lite/storageaccess_p.h
rename to 3rdparty/solid-lite/storageaccess_p.h
diff --git a/solid-lite/storagedrive.cpp b/3rdparty/solid-lite/storagedrive.cpp
similarity index 100%
rename from solid-lite/storagedrive.cpp
rename to 3rdparty/solid-lite/storagedrive.cpp
diff --git a/solid-lite/storagedrive.h b/3rdparty/solid-lite/storagedrive.h
similarity index 100%
rename from solid-lite/storagedrive.h
rename to 3rdparty/solid-lite/storagedrive.h
diff --git a/solid-lite/storagedrive_p.h b/3rdparty/solid-lite/storagedrive_p.h
similarity index 100%
rename from solid-lite/storagedrive_p.h
rename to 3rdparty/solid-lite/storagedrive_p.h
diff --git a/solid-lite/storagevolume.cpp b/3rdparty/solid-lite/storagevolume.cpp
similarity index 100%
rename from solid-lite/storagevolume.cpp
rename to 3rdparty/solid-lite/storagevolume.cpp
diff --git a/solid-lite/storagevolume.h b/3rdparty/solid-lite/storagevolume.h
similarity index 100%
rename from solid-lite/storagevolume.h
rename to 3rdparty/solid-lite/storagevolume.h
diff --git a/solid-lite/storagevolume_p.h b/3rdparty/solid-lite/storagevolume_p.h
similarity index 100%
rename from solid-lite/storagevolume_p.h
rename to 3rdparty/solid-lite/storagevolume_p.h
diff --git a/solid-lite/xdgbasedirs.cpp b/3rdparty/solid-lite/xdgbasedirs.cpp
similarity index 100%
rename from solid-lite/xdgbasedirs.cpp
rename to 3rdparty/solid-lite/xdgbasedirs.cpp
diff --git a/solid-lite/xdgbasedirs_p.h b/3rdparty/solid-lite/xdgbasedirs_p.h
similarity index 100%
rename from solid-lite/xdgbasedirs_p.h
rename to 3rdparty/solid-lite/xdgbasedirs_p.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0713260ed..2b5bc0916 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -331,13 +331,13 @@ include_directories( ${CMAKE_SOURCE_DIR}/gui
                      ${CMAKE_SOURCE_DIR}/devices
                      ${CMAKE_SOURCE_DIR}/dynamic
                      ${CMAKE_SOURCE_DIR}/support
-                     ${CMAKE_SOURCE_DIR}/sha2
                      ${CMAKE_SOURCE_DIR}/streams
                      ${CMAKE_SOURCE_DIR}/tags
-                     ${CMAKE_BINARY_DIR}/support
                      ${CMAKE_SOURCE_DIR}/online
+                     ${CMAKE_SOURCE_DIR}/3rdparty
                      ${CMAKE_SOURCE_DIR}
                      ${CMAKE_BINARY_DIR}
+                     ${CMAKE_BINARY_DIR}/support
 )
 
 if (ENABLE_QT5)
@@ -468,7 +468,7 @@ if (TAGLIB_FOUND)
     else (WIN32)
         set (ENABLE_DEVICES_SUPPORT 1)
         if (NOT ENABLE_KDE_SUPPORT)
-            add_subdirectory(solid-lite)
+            add_subdirectory(3rdparty/solid-lite)
         endif (NOT ENABLE_KDE_SUPPORT)
         if (ENABLE_MTP)
             find_package(Mtp)
@@ -535,7 +535,7 @@ endif (MSVC)
 
 add_subdirectory(po)
 add_subdirectory(support)
-add_subdirectory(sha2)
+add_subdirectory(3rdparty/sha2)
 
 IF( ENABLE_KDE_SUPPORT )
     include_directories( ${KDE4_INCLUDES})
@@ -589,9 +589,8 @@ ELSE( ENABLE_KDE_SUPPORT )
     SET( XDG_APPS_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/applications" )
 
     if (WIN32)
-        add_subdirectory(qtsingleapplication)
+        add_subdirectory(3rdparty/qtsingleapplication)
         TARGET_LINK_LIBRARIES(cantata qtsingleapplication)
-        include_directories(${CMAKE_BINARY_DIR}/qtsingleapplication)
     endif (WIN32)
 ENDIF( ENABLE_KDE_SUPPORT )
 
@@ -620,10 +619,9 @@ if (NOT WIN32)
     endif (CDDB_FOUND OR MUSICBRAINZ5_FOUND)
 endif (NOT WIN32)
 
-add_subdirectory(qtiocompressor)
-add_subdirectory(qjson)
+add_subdirectory(3rdparty/qtiocompressor)
+add_subdirectory(3rdparty/qjson)
 TARGET_LINK_LIBRARIES(cantata qtiocompressor qjson)
-include_directories(${CMAKE_BINARY_DIR}/qtiocompressor)
 
 ADD_SUBDIRECTORY( icons )
 
diff --git a/gui/coverdialog.cpp b/gui/coverdialog.cpp
index de572b1e0..c615b409d 100644
--- a/gui/coverdialog.cpp
+++ b/gui/coverdialog.cpp
@@ -31,7 +31,7 @@
 #include "utils.h"
 #include "spinner.h"
 #include "icon.h"
-#include "sha2.h"
+#include "sha2/sha2.h"
 #include "qjson/parser.h"
 #include <QVBoxLayout>
 #include <QLabel>