diff --git a/dbms/CMakeLists.txt b/dbms/CMakeLists.txt
index e50b5294093..5442995c568 100644
--- a/dbms/CMakeLists.txt
+++ b/dbms/CMakeLists.txt
@@ -1,13 +1,13 @@
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/find_vectorclass.cmake)
 
-set (CONFIG_VERSION ${CMAKE_CURRENT_BINARY_DIR}/include/DB/Common/config_version.h)
-set (CONFIG_COMMON ${CMAKE_CURRENT_BINARY_DIR}/include/DB/Common/config.h)
+set (CONFIG_VERSION ${CMAKE_CURRENT_BINARY_DIR}/src/Common/config_version.h)
+set (CONFIG_COMMON ${CMAKE_CURRENT_BINARY_DIR}/src/Common/config.h)
 set (CONFIG_BUILD ${CMAKE_CURRENT_BINARY_DIR}/src/Common/config_build.cpp)
 
 include (cmake/version.cmake)
 message (STATUS "Will build ${VERSION_FULL}")
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/include/DB/Common/config.h.in ${CONFIG_COMMON})
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/include/DB/Common/config_version.h.in ${CONFIG_VERSION})
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/Common/config.h.in ${CONFIG_COMMON})
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/src/Common/config_version.h.in ${CONFIG_VERSION})
 
 get_property (BUILD_COMPILE_DEFINITIONS DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY COMPILE_DEFINITIONS)
 get_property (BUILD_INCLUDE_DIRECTORIES DIRECTORY ${ClickHouse_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
@@ -23,7 +23,7 @@ include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libfarmhash)
 include_directories (BEFORE ${ClickHouse_SOURCE_DIR}/contrib/libmetrohash/src)
 include_directories (${ClickHouse_SOURCE_DIR}/libs/libdaemon/include)
 include_directories (${ODBC_INCLUDE_DIRECTORIES})
-include_directories (${ClickHouse_BINARY_DIR}/dbms/include)
+include_directories (${ClickHouse_BINARY_DIR}/dbms/src)
 
 if (NOT NO_WERROR)
     set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
@@ -35,7 +35,7 @@ find_package (Threads)
 add_subdirectory (src)
 
 add_library(string_utils
-    include/DB/Common/StringUtils.h
+    src/Common/StringUtils.h
     src/Common/StringUtils.cpp)
 
 set(dbms_headers)
@@ -80,9 +80,9 @@ list(REMOVE_ITEM dbms_sources
 
 if (APPLE OR CMAKE_SYSTEM MATCHES "FreeBSD")
     list(REMOVE_ITEM dbms_headers
-        include/DB/Common/AIO.h
-        include/DB/IO/WriteBufferAIO.h
-        include/DB/IO/ReadBufferAIO.h)
+        src/Common/AIO.h
+        src/IO/WriteBufferAIO.h
+        src/IO/ReadBufferAIO.h)
     list(REMOVE_ITEM dbms_sources
         src/IO/ReadBufferAIO.cpp
         src/IO/WriteBufferAIO.cpp)
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionArray.cpp b/dbms/src/AggregateFunctions/AggregateFunctionArray.cpp
index f5f00fa5636..162f51afb90 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionArray.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionArray.cpp
@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionArray.h>
+#include <AggregateFunctions/AggregateFunctionArray.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionArray.h b/dbms/src/AggregateFunctions/AggregateFunctionArray.h
similarity index 96%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionArray.h
rename to dbms/src/AggregateFunctions/AggregateFunctionArray.h
index 77d865726ee..e4396ba4fbf 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionArray.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionArray.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Columns/ColumnArray.h>
+#include <DataTypes/DataTypeArray.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionAvg.cpp b/dbms/src/AggregateFunctions/AggregateFunctionAvg.cpp
index 0770f12aeb5..cc424e1079a 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionAvg.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionAvg.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionAvg.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionAvg.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionAvg.h b/dbms/src/AggregateFunctions/AggregateFunctionAvg.h
similarity index 90%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionAvg.h
rename to dbms/src/AggregateFunctions/AggregateFunctionAvg.h
index 45fcd2f485f..9cdff36c4bc 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionAvg.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionAvg.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionCount.cpp b/dbms/src/AggregateFunctions/AggregateFunctionCount.cpp
index c8c0caf29f6..9786831cc6f 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionCount.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionCount.cpp
@@ -1,5 +1,5 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionCount.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionCount.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionCount.h b/dbms/src/AggregateFunctions/AggregateFunctionCount.h
similarity index 95%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionCount.h
rename to dbms/src/AggregateFunctions/AggregateFunctionCount.h
index cf2a2fb83a2..c3fb7019463 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionCount.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionCount.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <DB/IO/VarInt.h>
+#include <IO/VarInt.h>
 
 #include <array>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/AggregateFunctions/INullaryAggregateFunction.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <AggregateFunctions/INullaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <Columns/ColumnNullable.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionDebug.cpp b/dbms/src/AggregateFunctions/AggregateFunctionDebug.cpp
index 956e7a172c6..35deb1c207a 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionDebug.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionDebug.cpp
@@ -1,9 +1,9 @@
-#include <DB/AggregateFunctions/INullaryAggregateFunction.h>
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <AggregateFunctions/INullaryAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp b/dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp
index fa21bc9c0a6..9890f3ef4f9 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -1,10 +1,10 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Common/StringUtils.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Common/StringUtils.h>
 #include <Poco/String.h>
 
 
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionFactory.h b/dbms/src/AggregateFunctions/AggregateFunctionFactory.h
similarity index 97%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionFactory.h
rename to dbms/src/AggregateFunctions/AggregateFunctionFactory.h
index 9493f3fbb43..ade5f84065e 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionFactory.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <unordered_map>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionGroupArray.cpp b/dbms/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
index 13614ddaf4d..5f52e80eb4a 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionGroupArray.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionGroupArray.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionGroupArray.h b/dbms/src/AggregateFunctions/AggregateFunctionGroupArray.h
similarity index 94%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionGroupArray.h
rename to dbms/src/AggregateFunctions/AggregateFunctionGroupArray.h
index 76bcb4a702a..eb9f035f5fe 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionGroupArray.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionGroupArray.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnArray.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
 #define AGGREGATE_FUNCTION_GROUP_ARRAY_MAX_ARRAY_SIZE 0xFFFFFF
 
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp b/dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp
index b94bcfb6da5..b8139b9f033 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionGroupUniqArray.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionGroupUniqArray.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionGroupUniqArray.h b/dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
similarity index 95%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionGroupUniqArray.h
rename to dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
index 01ee33059bd..fd2640c64cb 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionGroupUniqArray.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionGroupUniqArray.h
@@ -1,17 +1,17 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnArray.h>
 
-#include <DB/Common/HashTable/HashSet.h>
+#include <Common/HashTable/HashSet.h>
 
-#include <DB/AggregateFunctions/AggregateFunctionGroupArray.h>
+#include <AggregateFunctions/AggregateFunctionGroupArray.h>
 
 #define AGGREGATE_FUNCTION_GROUP_ARRAY_UNIQ_MAX_SIZE 0xFFFFFF
 
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionIf.cpp b/dbms/src/AggregateFunctions/AggregateFunctionIf.cpp
index 50b5bd879a2..1c1bb29a9c6 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionIf.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionIf.cpp
@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionIf.h>
+#include <AggregateFunctions/AggregateFunctionIf.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionIf.h b/dbms/src/AggregateFunctions/AggregateFunctionIf.h
similarity index 96%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionIf.h
rename to dbms/src/AggregateFunctions/AggregateFunctionIf.h
index 9b2dff3b19c..5c132fdd622 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionIf.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionIf.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionMerge.cpp b/dbms/src/AggregateFunctions/AggregateFunctionMerge.cpp
index c4dbdbb956e..b211bcba4bd 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionMerge.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionMerge.cpp
@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionMerge.h>
+#include <AggregateFunctions/AggregateFunctionMerge.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionMerge.h b/dbms/src/AggregateFunctions/AggregateFunctionMerge.h
similarity index 95%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionMerge.h
rename to dbms/src/AggregateFunctions/AggregateFunctionMerge.h
index 00fe676df28..bf4ad82c98d 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionMerge.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionMerge.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionNull.cpp b/dbms/src/AggregateFunctions/AggregateFunctionNull.cpp
index 0c7fa79e2be..bfa2bcb032c 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionNull.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionNull.cpp
@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionNull.h>
+#include <AggregateFunctions/AggregateFunctionNull.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionNull.h b/dbms/src/AggregateFunctions/AggregateFunctionNull.h
similarity index 97%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionNull.h
rename to dbms/src/AggregateFunctions/AggregateFunctionNull.h
index 2c06eed1e34..5c0bba68184 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionNull.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionNull.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <array>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantile.h b/dbms/src/AggregateFunctions/AggregateFunctionQuantile.h
similarity index 94%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionQuantile.h
rename to dbms/src/AggregateFunctions/AggregateFunctionQuantile.h
index 709ea869ea6..eb7ae69aca0 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -1,19 +1,19 @@
 #pragma once
 
-#include <DB/AggregateFunctions/ReservoirSampler.h>
+#include <AggregateFunctions/ReservoirSampler.h>
 
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileDeterministic.h b/dbms/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.h
similarity index 94%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileDeterministic.h
rename to dbms/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.h
index 124dc966cec..5e24a5af46f 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileDeterministic.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.h
@@ -1,19 +1,19 @@
 #pragma once
 
-#include <DB/AggregateFunctions/ReservoirSamplerDeterministic.h>
+#include <AggregateFunctions/ReservoirSamplerDeterministic.h>
 
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp b/dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp
index f1e473eb517..4558bbffb9c 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileExact.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileExact.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileExact.h b/dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.h
similarity index 95%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileExact.h
rename to dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.h
index efcd003bf97..30717dd9c37 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileExact.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionQuantileExact.h
@@ -1,17 +1,17 @@
 #pragma once
 
-#include <DB/Common/PODArray.h>
+#include <Common/PODArray.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/QuantilesCommon.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/QuantilesCommon.h>
 
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnArray.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp b/dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp
index 3ae340c8b7c..119cd4d6693 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileExactWeighted.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h b/dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h
similarity index 97%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h
rename to dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h
index d72a77e4e3c..e5ca9f8acc1 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <DB/Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashMap.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
-#include <DB/AggregateFunctions/QuantilesCommon.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/QuantilesCommon.h>
 
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnArray.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h b/dbms/src/AggregateFunctions/AggregateFunctionQuantileTDigest.h
similarity index 98%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h
rename to dbms/src/AggregateFunctions/AggregateFunctionQuantileTDigest.h
index cb5ab696bb4..b404dc08192 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionQuantileTDigest.h
@@ -7,15 +7,15 @@
 #include <vector>
 #include <algorithm>
 
-#include <DB/Common/RadixSort.h>
-#include <DB/Common/PODArray.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
-#include <DB/AggregateFunctions/QuantilesCommon.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <Common/RadixSort.h>
+#include <Common/PODArray.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/QuantilesCommon.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTiming.h b/dbms/src/AggregateFunctions/AggregateFunctionQuantileTiming.h
similarity index 98%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTiming.h
rename to dbms/src/AggregateFunctions/AggregateFunctionQuantileTiming.h
index 810fd8ecf9d..210e377b884 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionQuantileTiming.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionQuantileTiming.h
@@ -2,21 +2,21 @@
 
 #include <limits>
 
-#include <DB/Common/MemoryTracker.h>
-#include <DB/Common/HashTable/Hash.h>
+#include <Common/MemoryTracker.h>
+#include <Common/HashTable/Hash.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
-#include <DB/AggregateFunctions/QuantilesCommon.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/QuantilesCommon.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
 
 #include <ext/range.hpp>
 
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionSequenceMatch.h b/dbms/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
similarity index 97%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionSequenceMatch.h
rename to dbms/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
index 770ab97f6b4..cf38edfd38f 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionSequenceMatch.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionSequenceMatch.h
@@ -1,17 +1,17 @@
 #pragma once
 
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Parsers/CommonParsers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <Parsers/CommonParsers.h>
 #include <ext/range.hpp>
 #include <boost/range/iterator_range_core.hpp>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Common/PODArray.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ASTLiteral.h>
+#include <Common/PODArray.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 #include <bitset>
 #include <stack>
 
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionState.cpp b/dbms/src/AggregateFunctions/AggregateFunctionState.cpp
index 0c0d8bb28a5..f9d60a2f885 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionState.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionState.cpp
@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/AggregateFunctionState.h>
+#include <AggregateFunctions/AggregateFunctionState.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionState.h b/dbms/src/AggregateFunctions/AggregateFunctionState.h
similarity index 95%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionState.h
rename to dbms/src/AggregateFunctions/AggregateFunctionState.h
index 8c400c22883..59e5f984399 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionState.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionState.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionSum.cpp b/dbms/src/AggregateFunctions/AggregateFunctionSum.cpp
index 65bb1b3a50c..ae2b91796e2 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionSum.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionSum.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionSum.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionSum.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionSum.h b/dbms/src/AggregateFunctions/AggregateFunctionSum.h
similarity index 89%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionSum.h
rename to dbms/src/AggregateFunctions/AggregateFunctionSum.h
index d695269953c..10bbc7d8d8b 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionSum.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionSum.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnVector.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnVector.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionUniq.h b/dbms/src/AggregateFunctions/AggregateFunctionUniq.h
similarity index 94%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionUniq.h
rename to dbms/src/AggregateFunctions/AggregateFunctionUniq.h
index 2ecffeed0d0..da266bd9919 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionUniq.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionUniq.h
@@ -3,26 +3,26 @@
 #include <city.h>
 #include <type_traits>
 
-#include <DB/AggregateFunctions/UniquesHashSet.h>
+#include <AggregateFunctions/UniquesHashSet.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeTuple.h>
 
-#include <DB/Interpreters/AggregationCommon.h>
-#include <DB/Common/HashTable/HashSet.h>
-#include <DB/Common/HyperLogLogWithSmallSetOptimization.h>
-#include <DB/Common/CombinedCardinalityEstimator.h>
+#include <Interpreters/AggregationCommon.h>
+#include <Common/HashTable/HashSet.h>
+#include <Common/HyperLogLogWithSmallSetOptimization.h>
+#include <Common/CombinedCardinalityEstimator.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnTuple.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/UniqCombinedBiasData.h>
-#include <DB/AggregateFunctions/UniqVariadicHash.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/UniqCombinedBiasData.h>
+#include <AggregateFunctions/UniqVariadicHash.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.cpp b/dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.cpp
index b71fe178553..16df4b273bd 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionUniqUpTo.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionUniqUpTo.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionUniqUpTo.h b/dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
similarity index 96%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionUniqUpTo.h
rename to dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
index 92f11845aa4..b7946f5e0c7 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionUniqUpTo.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionUniqUpTo.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/Core/FieldVisitors.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/UniqVariadicHash.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Core/FieldVisitors.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/UniqVariadicHash.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <Columns/ColumnsNumber.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionsArgMinMax.h b/dbms/src/AggregateFunctions/AggregateFunctionsArgMinMax.h
similarity index 94%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionsArgMinMax.h
rename to dbms/src/AggregateFunctions/AggregateFunctionsArgMinMax.h
index 16e7db37bd9..1d779118338 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionsArgMinMax.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsArgMinMax.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/AggregateFunctions/AggregateFunctionsMinMaxAny.h>
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionsMinMaxAny.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionsMinMaxAny.cpp b/dbms/src/AggregateFunctions/AggregateFunctionsMinMaxAny.cpp
index 70b69211ddc..6979005a214 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionsMinMaxAny.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsMinMaxAny.cpp
@@ -1,5 +1,5 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/HelpersMinMaxAny.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/HelpersMinMaxAny.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionsMinMaxAny.h b/dbms/src/AggregateFunctions/AggregateFunctionsMinMaxAny.h
similarity index 98%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionsMinMaxAny.h
rename to dbms/src/AggregateFunctions/AggregateFunctionsMinMaxAny.h
index 0400b6ae680..882905342eb 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionsMinMaxAny.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsMinMaxAny.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
 
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionsQuantile.cpp b/dbms/src/AggregateFunctions/AggregateFunctionsQuantile.cpp
index b569f5e3781..360ae6263e5 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionsQuantile.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsQuantile.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantile.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantile.h>
 
 namespace DB
 {
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionsQuantileDeterministic.cpp b/dbms/src/AggregateFunctions/AggregateFunctionsQuantileDeterministic.cpp
index 85f620e9ae1..6430c5ab708 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionsQuantileDeterministic.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsQuantileDeterministic.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileDeterministic.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileDeterministic.h>
 
 namespace DB
 {
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionsQuantileTDigest.cpp b/dbms/src/AggregateFunctions/AggregateFunctionsQuantileTDigest.cpp
index 2747bb1b32a..258bd679441 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionsQuantileTDigest.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsQuantileTDigest.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileTDigest.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileTDigest.h>
 
 namespace DB
 {
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionsQuantileTiming.cpp b/dbms/src/AggregateFunctions/AggregateFunctionsQuantileTiming.cpp
index 17cfdd4fe36..93509a96b9e 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionsQuantileTiming.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsQuantileTiming.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileTiming.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionQuantileTiming.h>
 
 namespace DB
 {
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionsSequenceMatch.cpp b/dbms/src/AggregateFunctions/AggregateFunctionsSequenceMatch.cpp
index d36f95ed398..2e0ae447cad 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionsSequenceMatch.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsSequenceMatch.cpp
@@ -1,5 +1,5 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionSequenceMatch.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionSequenceMatch.h>
 
 namespace DB
 {
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionsStatistics.cpp b/dbms/src/AggregateFunctions/AggregateFunctionsStatistics.cpp
index 3007307fa06..8bac6348500 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionsStatistics.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsStatistics.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/Helpers.h>
-#include <DB/AggregateFunctions/AggregateFunctionsStatistics.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionsStatistics.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/AggregateFunctionsStatistics.h b/dbms/src/AggregateFunctions/AggregateFunctionsStatistics.h
similarity index 98%
rename from dbms/include/DB/AggregateFunctions/AggregateFunctionsStatistics.h
rename to dbms/src/AggregateFunctions/AggregateFunctionsStatistics.h
index a999525ae8c..a061327e855 100644
--- a/dbms/include/DB/AggregateFunctions/AggregateFunctionsStatistics.h
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsStatistics.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/AggregateFunctions/IUnaryAggregateFunction.h>
-#include <DB/AggregateFunctions/IBinaryAggregateFunction.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <AggregateFunctions/IUnaryAggregateFunction.h>
+#include <AggregateFunctions/IBinaryAggregateFunction.h>
+#include <Columns/ColumnsNumber.h>
 
 #include <cmath>
 
diff --git a/dbms/src/AggregateFunctions/AggregateFunctionsUniq.cpp b/dbms/src/AggregateFunctions/AggregateFunctionsUniq.cpp
index 952ce731d5a..4de23b84f1e 100644
--- a/dbms/src/AggregateFunctions/AggregateFunctionsUniq.cpp
+++ b/dbms/src/AggregateFunctions/AggregateFunctionsUniq.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionUniq.h>
-#include <DB/AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionUniq.h>
+#include <AggregateFunctions/Helpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/Helpers.h b/dbms/src/AggregateFunctions/Helpers.h
similarity index 96%
rename from dbms/include/DB/AggregateFunctions/Helpers.h
rename to dbms/src/AggregateFunctions/Helpers.h
index 14c85efe825..2e26a568d1f 100644
--- a/dbms/include/DB/AggregateFunctions/Helpers.h
+++ b/dbms/src/AggregateFunctions/Helpers.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeEnum.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/HelpersMinMaxAny.h b/dbms/src/AggregateFunctions/HelpersMinMaxAny.h
similarity index 96%
rename from dbms/include/DB/AggregateFunctions/HelpersMinMaxAny.h
rename to dbms/src/AggregateFunctions/HelpersMinMaxAny.h
index 9a9d6c028af..95651d67d8a 100644
--- a/dbms/include/DB/AggregateFunctions/HelpersMinMaxAny.h
+++ b/dbms/src/AggregateFunctions/HelpersMinMaxAny.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/AggregateFunctions/AggregateFunctionsArgMinMax.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <AggregateFunctions/AggregateFunctionsArgMinMax.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypesNumber.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/IAggregateFunction.h b/dbms/src/AggregateFunctions/IAggregateFunction.h
similarity index 97%
rename from dbms/include/DB/AggregateFunctions/IAggregateFunction.h
rename to dbms/src/AggregateFunctions/IAggregateFunction.h
index e80edf81fad..ea78314b34c 100644
--- a/dbms/include/DB/AggregateFunctions/IAggregateFunction.h
+++ b/dbms/src/AggregateFunctions/IAggregateFunction.h
@@ -2,10 +2,10 @@
 
 #include <memory>
 
-#include <DB/Core/Row.h>
-#include <DB/DataTypes/IDataType.h>
-#include <DB/Common/typeid_cast.h>
-#include <DB/Common/Arena.h>
+#include <Core/Row.h>
+#include <DataTypes/IDataType.h>
+#include <Common/typeid_cast.h>
+#include <Common/Arena.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/IBinaryAggregateFunction.h b/dbms/src/AggregateFunctions/IBinaryAggregateFunction.h
similarity index 93%
rename from dbms/include/DB/AggregateFunctions/IBinaryAggregateFunction.h
rename to dbms/src/AggregateFunctions/IBinaryAggregateFunction.h
index 63f46a4ed84..94aea8d947b 100644
--- a/dbms/include/DB/AggregateFunctions/IBinaryAggregateFunction.h
+++ b/dbms/src/AggregateFunctions/IBinaryAggregateFunction.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <IO/WriteHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/INullaryAggregateFunction.h b/dbms/src/AggregateFunctions/INullaryAggregateFunction.h
similarity index 94%
rename from dbms/include/DB/AggregateFunctions/INullaryAggregateFunction.h
rename to dbms/src/AggregateFunctions/INullaryAggregateFunction.h
index cfb1da4bed0..e3232fe1149 100644
--- a/dbms/include/DB/AggregateFunctions/INullaryAggregateFunction.h
+++ b/dbms/src/AggregateFunctions/INullaryAggregateFunction.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <IO/WriteHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/IUnaryAggregateFunction.h b/dbms/src/AggregateFunctions/IUnaryAggregateFunction.h
similarity index 94%
rename from dbms/include/DB/AggregateFunctions/IUnaryAggregateFunction.h
rename to dbms/src/AggregateFunctions/IUnaryAggregateFunction.h
index 74a934cd6d2..e915d2fe7ba 100644
--- a/dbms/include/DB/AggregateFunctions/IUnaryAggregateFunction.h
+++ b/dbms/src/AggregateFunctions/IUnaryAggregateFunction.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <IO/WriteHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/QuantilesCommon.h b/dbms/src/AggregateFunctions/QuantilesCommon.h
similarity index 95%
rename from dbms/include/DB/AggregateFunctions/QuantilesCommon.h
rename to dbms/src/AggregateFunctions/QuantilesCommon.h
index fb66b2678a7..4af47e3bfe5 100644
--- a/dbms/include/DB/AggregateFunctions/QuantilesCommon.h
+++ b/dbms/src/AggregateFunctions/QuantilesCommon.h
@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include <DB/Core/Field.h>
-#include <DB/Core/FieldVisitors.h>
+#include <Core/Field.h>
+#include <Core/FieldVisitors.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/ReservoirSampler.h b/dbms/src/AggregateFunctions/ReservoirSampler.h
similarity index 98%
rename from dbms/include/DB/AggregateFunctions/ReservoirSampler.h
rename to dbms/src/AggregateFunctions/ReservoirSampler.h
index b154d7f715d..0ed951a2821 100644
--- a/dbms/include/DB/AggregateFunctions/ReservoirSampler.h
+++ b/dbms/src/AggregateFunctions/ReservoirSampler.h
@@ -5,10 +5,10 @@
 #include <climits>
 #include <sstream>
 #include <common/Common.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/PODArray.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/PODArray.h>
 #include <Poco/Exception.h>
 #include <boost/random.hpp>
 
diff --git a/dbms/include/DB/AggregateFunctions/ReservoirSamplerDeterministic.h b/dbms/src/AggregateFunctions/ReservoirSamplerDeterministic.h
similarity index 96%
rename from dbms/include/DB/AggregateFunctions/ReservoirSamplerDeterministic.h
rename to dbms/src/AggregateFunctions/ReservoirSamplerDeterministic.h
index 2e504617a8c..daf7ad8fb3c 100644
--- a/dbms/include/DB/AggregateFunctions/ReservoirSamplerDeterministic.h
+++ b/dbms/src/AggregateFunctions/ReservoirSamplerDeterministic.h
@@ -4,13 +4,13 @@
 #include <algorithm>
 #include <climits>
 #include <sstream>
-#include <DB/AggregateFunctions/ReservoirSampler.h>
+#include <AggregateFunctions/ReservoirSampler.h>
 #include <common/Common.h>
-#include <DB/Common/HashTable/Hash.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/PODArray.h>
+#include <Common/HashTable/Hash.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/PODArray.h>
 #include <Poco/Exception.h>
 #include <boost/random.hpp>
 
diff --git a/dbms/src/AggregateFunctions/UniqCombinedBiasData.cpp b/dbms/src/AggregateFunctions/UniqCombinedBiasData.cpp
index f653a26af9a..a3a3176e199 100644
--- a/dbms/src/AggregateFunctions/UniqCombinedBiasData.cpp
+++ b/dbms/src/AggregateFunctions/UniqCombinedBiasData.cpp
@@ -1,4 +1,4 @@
-#include <DB/AggregateFunctions/UniqCombinedBiasData.h>
+#include <AggregateFunctions/UniqCombinedBiasData.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/AggregateFunctions/UniqCombinedBiasData.h b/dbms/src/AggregateFunctions/UniqCombinedBiasData.h
similarity index 100%
rename from dbms/include/DB/AggregateFunctions/UniqCombinedBiasData.h
rename to dbms/src/AggregateFunctions/UniqCombinedBiasData.h
diff --git a/dbms/include/DB/AggregateFunctions/UniqVariadicHash.h b/dbms/src/AggregateFunctions/UniqVariadicHash.h
similarity index 96%
rename from dbms/include/DB/AggregateFunctions/UniqVariadicHash.h
rename to dbms/src/AggregateFunctions/UniqVariadicHash.h
index 4f88c65dfab..f74aed2cd97 100644
--- a/dbms/include/DB/AggregateFunctions/UniqVariadicHash.h
+++ b/dbms/src/AggregateFunctions/UniqVariadicHash.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include <city.h>
-#include <DB/Core/Defines.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/UInt128.h>
-#include <DB/Columns/ColumnTuple.h>
+#include <Core/Defines.h>
+#include <Common/SipHash.h>
+#include <Common/UInt128.h>
+#include <Columns/ColumnTuple.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/AggregateFunctions/UniquesHashSet.h b/dbms/src/AggregateFunctions/UniquesHashSet.h
similarity index 98%
rename from dbms/include/DB/AggregateFunctions/UniquesHashSet.h
rename to dbms/src/AggregateFunctions/UniquesHashSet.h
index 4d12e312f97..a0352469240 100644
--- a/dbms/include/DB/AggregateFunctions/UniquesHashSet.h
+++ b/dbms/src/AggregateFunctions/UniquesHashSet.h
@@ -4,14 +4,14 @@
 
 #include <common/Common.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/VarInt.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/VarInt.h>
 
-#include <DB/Common/HashTable/HashTableAllocator.h>
-#include <DB/Common/HashTable/Hash.h>
+#include <Common/HashTable/HashTableAllocator.h>
+#include <Common/HashTable/Hash.h>
 
 
 /** Approximate calculation of anything, as a rule, is constructed according to the following scheme:
diff --git a/dbms/include/DB/Analyzers/AnalyzeArrayJoins.h b/dbms/src/Analyzers/AnalyzeArrayJoins.h
similarity index 97%
rename from dbms/include/DB/Analyzers/AnalyzeArrayJoins.h
rename to dbms/src/Analyzers/AnalyzeArrayJoins.h
index dfef672d8d2..cb551321376 100644
--- a/dbms/include/DB/Analyzers/AnalyzeArrayJoins.h
+++ b/dbms/src/Analyzers/AnalyzeArrayJoins.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 #include <unordered_map>
 #include <vector>
 
diff --git a/dbms/src/Analyzers/AnalyzeColumns.cpp b/dbms/src/Analyzers/AnalyzeColumns.cpp
index 6288cb85294..e1b3332b047 100644
--- a/dbms/src/Analyzers/AnalyzeColumns.cpp
+++ b/dbms/src/Analyzers/AnalyzeColumns.cpp
@@ -1,15 +1,15 @@
 #include <vector>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ASTAsterisk.h>
-#include <DB/Parsers/ASTQualifiedAsterisk.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/CollectAliases.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTAsterisk.h>
+#include <Parsers/ASTQualifiedAsterisk.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 #include <Poco/String.h>
 
 
diff --git a/dbms/include/DB/Analyzers/AnalyzeColumns.h b/dbms/src/Analyzers/AnalyzeColumns.h
similarity index 94%
rename from dbms/include/DB/Analyzers/AnalyzeColumns.h
rename to dbms/src/Analyzers/AnalyzeColumns.h
index 1c81f6b263e..cf93bbc5ed6 100644
--- a/dbms/include/DB/Analyzers/AnalyzeColumns.h
+++ b/dbms/src/Analyzers/AnalyzeColumns.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Analyzers/CollectTables.h>
+#include <Parsers/IAST.h>
+#include <Analyzers/CollectTables.h>
 #include <unordered_map>
 
 
diff --git a/dbms/src/Analyzers/AnalyzeLambdas.cpp b/dbms/src/Analyzers/AnalyzeLambdas.cpp
index abeba7515d4..210a97173f0 100644
--- a/dbms/src/Analyzers/AnalyzeLambdas.cpp
+++ b/dbms/src/Analyzers/AnalyzeLambdas.cpp
@@ -1,12 +1,12 @@
 #include <vector>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Analyzers/AnalyzeLambdas.h b/dbms/src/Analyzers/AnalyzeLambdas.h
similarity index 96%
rename from dbms/include/DB/Analyzers/AnalyzeLambdas.h
rename to dbms/src/Analyzers/AnalyzeLambdas.h
index 4a2bf715531..0a693737295 100644
--- a/dbms/include/DB/Analyzers/AnalyzeLambdas.h
+++ b/dbms/src/Analyzers/AnalyzeLambdas.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 #include <vector>
 
 
diff --git a/dbms/src/Analyzers/AnalyzeResultOfQuery.cpp b/dbms/src/Analyzers/AnalyzeResultOfQuery.cpp
index 862a63812c9..1a5bce62a65 100644
--- a/dbms/src/Analyzers/AnalyzeResultOfQuery.cpp
+++ b/dbms/src/Analyzers/AnalyzeResultOfQuery.cpp
@@ -1,13 +1,13 @@
-#include <DB/Analyzers/AnalyzeResultOfQuery.h>
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Parsers/ASTSelectQuery.h>
+#include <Analyzers/AnalyzeResultOfQuery.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Interpreters/Context.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ASTSelectQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Analyzers/AnalyzeResultOfQuery.h b/dbms/src/Analyzers/AnalyzeResultOfQuery.h
similarity index 91%
rename from dbms/include/DB/Analyzers/AnalyzeResultOfQuery.h
rename to dbms/src/Analyzers/AnalyzeResultOfQuery.h
index 6ddb0215c11..5d902353a6f 100644
--- a/dbms/include/DB/Analyzers/AnalyzeResultOfQuery.h
+++ b/dbms/src/Analyzers/AnalyzeResultOfQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Core/Block.h>
+#include <Parsers/IAST.h>
+#include <Core/Block.h>
 
 
 namespace DB
diff --git a/dbms/src/Analyzers/CollectAliases.cpp b/dbms/src/Analyzers/CollectAliases.cpp
index 7ecd318b4c2..9fd449bb0c3 100644
--- a/dbms/src/Analyzers/CollectAliases.cpp
+++ b/dbms/src/Analyzers/CollectAliases.cpp
@@ -1,9 +1,9 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/CollectAliases.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Analyzers/CollectAliases.h b/dbms/src/Analyzers/CollectAliases.h
similarity index 97%
rename from dbms/include/DB/Analyzers/CollectAliases.h
rename to dbms/src/Analyzers/CollectAliases.h
index 378375feea5..021ce8fb5d8 100644
--- a/dbms/include/DB/Analyzers/CollectAliases.h
+++ b/dbms/src/Analyzers/CollectAliases.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 #include <unordered_map>
 
 
diff --git a/dbms/src/Analyzers/CollectTables.cpp b/dbms/src/Analyzers/CollectTables.cpp
index 9f2d3193429..eba86a081f4 100644
--- a/dbms/src/Analyzers/CollectTables.cpp
+++ b/dbms/src/Analyzers/CollectTables.cpp
@@ -1,16 +1,16 @@
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/AnalyzeResultOfQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/TableFunctions/TableFunctionFactory.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSubquery.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/AnalyzeResultOfQuery.h>
+#include <Interpreters/Context.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSubquery.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Analyzers/CollectTables.h b/dbms/src/Analyzers/CollectTables.h
similarity index 94%
rename from dbms/include/DB/Analyzers/CollectTables.h
rename to dbms/src/Analyzers/CollectTables.h
index 17326c1cc0f..a860934e56b 100644
--- a/dbms/include/DB/Analyzers/CollectTables.h
+++ b/dbms/src/Analyzers/CollectTables.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Storages/IStorage.h>
+#include <Parsers/IAST.h>
+#include <Storages/IStorage.h>
 #include <vector>
 
 
diff --git a/dbms/src/Analyzers/OptimizeGroupOrderLimitBy.cpp b/dbms/src/Analyzers/OptimizeGroupOrderLimitBy.cpp
index bb69fbb6ffa..9fa732af42b 100644
--- a/dbms/src/Analyzers/OptimizeGroupOrderLimitBy.cpp
+++ b/dbms/src/Analyzers/OptimizeGroupOrderLimitBy.cpp
@@ -1,14 +1,14 @@
 #include <set>
 #include <unordered_set>
 
-#include <DB/Analyzers/OptimizeGroupOrderLimitBy.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTOrderByElement.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Functions/IFunction.h>
+#include <Analyzers/OptimizeGroupOrderLimitBy.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Interpreters/Context.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Parsers/ASTLiteral.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Analyzers/OptimizeGroupOrderLimitBy.h b/dbms/src/Analyzers/OptimizeGroupOrderLimitBy.h
similarity index 97%
rename from dbms/include/DB/Analyzers/OptimizeGroupOrderLimitBy.h
rename to dbms/src/Analyzers/OptimizeGroupOrderLimitBy.h
index c842a504f63..44d83193df4 100644
--- a/dbms/include/DB/Analyzers/OptimizeGroupOrderLimitBy.h
+++ b/dbms/src/Analyzers/OptimizeGroupOrderLimitBy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Analyzers/TranslatePositionalArguments.cpp b/dbms/src/Analyzers/TranslatePositionalArguments.cpp
index 09a1a075d26..c4a0b8814ec 100644
--- a/dbms/src/Analyzers/TranslatePositionalArguments.cpp
+++ b/dbms/src/Analyzers/TranslatePositionalArguments.cpp
@@ -1,9 +1,9 @@
-#include <DB/Analyzers/TranslatePositionalArguments.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTOrderByElement.h>
-#include <DB/Common/typeid_cast.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Analyzers/TranslatePositionalArguments.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Analyzers/TranslatePositionalArguments.h b/dbms/src/Analyzers/TranslatePositionalArguments.h
similarity index 90%
rename from dbms/include/DB/Analyzers/TranslatePositionalArguments.h
rename to dbms/src/Analyzers/TranslatePositionalArguments.h
index 57efa50af85..6209685eaeb 100644
--- a/dbms/include/DB/Analyzers/TranslatePositionalArguments.h
+++ b/dbms/src/Analyzers/TranslatePositionalArguments.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Analyzers/TypeAndConstantInference.cpp b/dbms/src/Analyzers/TypeAndConstantInference.cpp
index dae45b43163..080cee7d9e2 100644
--- a/dbms/src/Analyzers/TypeAndConstantInference.cpp
+++ b/dbms/src/Analyzers/TypeAndConstantInference.cpp
@@ -1,28 +1,28 @@
 #include <Poco/String.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Analyzers/AnalyzeResultOfQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTSubquery.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/DataTypes/FieldToDataType.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/DataTypes/DataTypeExpression.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/IFunction.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Analyzers/AnalyzeResultOfQuery.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTSubquery.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <Core/FieldVisitors.h>
+#include <DataTypes/FieldToDataType.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeExpression.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Analyzers/TypeAndConstantInference.h b/dbms/src/Analyzers/TypeAndConstantInference.h
similarity index 94%
rename from dbms/include/DB/Analyzers/TypeAndConstantInference.h
rename to dbms/src/Analyzers/TypeAndConstantInference.h
index 6df474a4dcd..8f4aad38231 100644
--- a/dbms/include/DB/Analyzers/TypeAndConstantInference.h
+++ b/dbms/src/Analyzers/TypeAndConstantInference.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/DataTypes/IDataType.h>
-#include <DB/Common/UInt128.h>
+#include <Parsers/IAST.h>
+#include <DataTypes/IDataType.h>
+#include <Common/UInt128.h>
 #include <unordered_map>
 
 
diff --git a/dbms/src/Analyzers/tests/analyze_columns.cpp b/dbms/src/Analyzers/tests/analyze_columns.cpp
index 5bf3dcb9905..ae93cec1fab 100644
--- a/dbms/src/Analyzers/tests/analyze_columns.cpp
+++ b/dbms/src/Analyzers/tests/analyze_columns.cpp
@@ -1,18 +1,18 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print found columns and corresponding tables.
diff --git a/dbms/src/Analyzers/tests/analyze_lambdas.cpp b/dbms/src/Analyzers/tests/analyze_lambdas.cpp
index 297e32958ae..19e1ca78259 100644
--- a/dbms/src/Analyzers/tests/analyze_lambdas.cpp
+++ b/dbms/src/Analyzers/tests/analyze_lambdas.cpp
@@ -1,12 +1,12 @@
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
 
 
 /// Parses query from stdin and print found higher order functions and query with rewritten names of lambda parameters.
diff --git a/dbms/src/Analyzers/tests/analyze_result_of_query.cpp b/dbms/src/Analyzers/tests/analyze_result_of_query.cpp
index 81fab48684f..03fc25c7376 100644
--- a/dbms/src/Analyzers/tests/analyze_result_of_query.cpp
+++ b/dbms/src/Analyzers/tests/analyze_result_of_query.cpp
@@ -1,14 +1,14 @@
-#include <DB/Analyzers/AnalyzeResultOfQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/AnalyzeResultOfQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print names and types of result columns.
diff --git a/dbms/src/Analyzers/tests/collect_aliases.cpp b/dbms/src/Analyzers/tests/collect_aliases.cpp
index a660d2b53a9..88b4183b8da 100644
--- a/dbms/src/Analyzers/tests/collect_aliases.cpp
+++ b/dbms/src/Analyzers/tests/collect_aliases.cpp
@@ -1,10 +1,10 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
+#include <Analyzers/CollectAliases.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
 
 
 /// Parses query from stdin and print found aliases.
diff --git a/dbms/src/Analyzers/tests/collect_tables.cpp b/dbms/src/Analyzers/tests/collect_tables.cpp
index b862f442b15..2b4c9378105 100644
--- a/dbms/src/Analyzers/tests/collect_tables.cpp
+++ b/dbms/src/Analyzers/tests/collect_tables.cpp
@@ -1,15 +1,15 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print found tables.
diff --git a/dbms/src/Analyzers/tests/optimize_group_order_limit_by.cpp b/dbms/src/Analyzers/tests/optimize_group_order_limit_by.cpp
index e0e4ea51d22..db8ea5e81ee 100644
--- a/dbms/src/Analyzers/tests/optimize_group_order_limit_by.cpp
+++ b/dbms/src/Analyzers/tests/optimize_group_order_limit_by.cpp
@@ -1,21 +1,21 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Analyzers/TranslatePositionalArguments.h>
-#include <DB/Analyzers/OptimizeGroupOrderLimitBy.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Analyzers/TranslatePositionalArguments.h>
+#include <Analyzers/OptimizeGroupOrderLimitBy.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print same query with optimized GROUP BY, ORDER BY, LIMIT BY.
diff --git a/dbms/src/Analyzers/tests/translate_positional_arguments.cpp b/dbms/src/Analyzers/tests/translate_positional_arguments.cpp
index ddf6a97612d..8db99dcf944 100644
--- a/dbms/src/Analyzers/tests/translate_positional_arguments.cpp
+++ b/dbms/src/Analyzers/tests/translate_positional_arguments.cpp
@@ -1,11 +1,11 @@
-#include <DB/Analyzers/TranslatePositionalArguments.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
+#include <Analyzers/TranslatePositionalArguments.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
 
 
 /// Parses query from stdin and print same query with translated positional arguments.
diff --git a/dbms/src/Analyzers/tests/type_and_constant_inference.cpp b/dbms/src/Analyzers/tests/type_and_constant_inference.cpp
index 478dfc90e57..7a2ac251896 100644
--- a/dbms/src/Analyzers/tests/type_and_constant_inference.cpp
+++ b/dbms/src/Analyzers/tests/type_and_constant_inference.cpp
@@ -1,19 +1,19 @@
-#include <DB/Analyzers/CollectAliases.h>
-#include <DB/Analyzers/CollectTables.h>
-#include <DB/Analyzers/AnalyzeColumns.h>
-#include <DB/Analyzers/AnalyzeLambdas.h>
-#include <DB/Analyzers/TypeAndConstantInference.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Analyzers/CollectAliases.h>
+#include <Analyzers/CollectTables.h>
+#include <Analyzers/AnalyzeColumns.h>
+#include <Analyzers/AnalyzeLambdas.h>
+#include <Analyzers/TypeAndConstantInference.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Databases/DatabaseMemory.h>
 
 
 /// Parses query from stdin and print data types of expressions; and for constant expressions, print its values.
diff --git a/dbms/src/Client/Benchmark.cpp b/dbms/src/Client/Benchmark.cpp
index b9b42492196..1e5e02ed320 100644
--- a/dbms/src/Client/Benchmark.cpp
+++ b/dbms/src/Client/Benchmark.cpp
@@ -12,30 +12,30 @@
 #include <Poco/File.h>
 #include <Poco/Util/Application.h>
 
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/ThreadPool.h>
-#include <DB/AggregateFunctions/ReservoirSampler.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
+#include <AggregateFunctions/ReservoirSampler.h>
 
 #include <boost/program_options.hpp>
 
-#include <DB/Common/ConcurrentBoundedQueue.h>
+#include <Common/ConcurrentBoundedQueue.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/randomSeed.h>
-#include <DB/Core/Types.h>
+#include <Common/Exception.h>
+#include <Common/randomSeed.h>
+#include <Core/Types.h>
 
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/Operators.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
 
-#include <DB/DataStreams/RemoteBlockInputStream.h>
+#include <DataStreams/RemoteBlockInputStream.h>
 
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/Context.h>
 
-#include <DB/Client/Connection.h>
+#include <Client/Connection.h>
 
 #include "InterruptListener.h"
 
diff --git a/dbms/src/Client/Client.cpp b/dbms/src/Client/Client.cpp
index eb01f807ca6..9e83089794d 100644
--- a/dbms/src/Client/Client.cpp
+++ b/dbms/src/Client/Client.cpp
@@ -11,39 +11,39 @@
 #include <boost/program_options.hpp>
 #include <Poco/File.h>
 #include <Poco/Util/Application.h>
-#include <DB/Common/ClickHouseRevision.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/ShellCommand.h>
-#include <DB/Core/Types.h>
-#include <DB/Core/QueryProcessingStage.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/ReadBufferFromMemory.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/AsynchronousBlockInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowInputStream.h>
-#include <DB/Parsers/ParserQuery.h>
-#include <DB/Parsers/ASTSetQuery.h>
-#include <DB/Parsers/ASTUseQuery.h>
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTQueryWithOutput.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Client/Connection.h>
+#include <Common/ClickHouseRevision.h>
+#include <Common/Stopwatch.h>
+#include <Common/Exception.h>
+#include <Common/ShellCommand.h>
+#include <Core/Types.h>
+#include <Core/QueryProcessingStage.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/AsynchronousBlockInputStream.h>
+#include <DataStreams/TabSeparatedRowInputStream.h>
+#include <Parsers/ParserQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTUseQuery.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTQueryWithOutput.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
+#include <Interpreters/Context.h>
+#include <Client/Connection.h>
 #include "InterruptListener.h"
-#include <DB/Common/ExternalTable.h>
-#include <DB/Common/UnicodeBar.h>
-#include <DB/Common/formatReadable.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Common/NetException.h>
+#include <Common/ExternalTable.h>
+#include <Common/UnicodeBar.h>
+#include <Common/formatReadable.h>
+#include <Columns/ColumnString.h>
+#include <Common/NetException.h>
 #include <common/readline_use.h>
 
 
diff --git a/dbms/src/Client/Connection.cpp b/dbms/src/Client/Connection.cpp
index d192dd61e10..35b389bd7e9 100644
--- a/dbms/src/Client/Connection.cpp
+++ b/dbms/src/Client/Connection.cpp
@@ -2,28 +2,28 @@
 
 #include <Poco/Net/NetException.h>
 
-#include <DB/Common/ClickHouseRevision.h>
+#include <Common/ClickHouseRevision.h>
 
-#include <DB/Core/Defines.h>
-#include <DB/Common/Exception.h>
+#include <Core/Defines.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/ReadBufferFromPocoSocket.h>
-#include <DB/IO/WriteBufferFromPocoSocket.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/copyData.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/ReadBufferFromPocoSocket.h>
+#include <IO/WriteBufferFromPocoSocket.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/copyData.h>
 
-#include <DB/DataStreams/NativeBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
+#include <DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/NativeBlockOutputStream.h>
 
-#include <DB/Client/Connection.h>
+#include <Client/Connection.h>
 
-#include <DB/Common/NetException.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/NetException.h>
+#include <Common/CurrentMetrics.h>
 
-#include <DB/Interpreters/ClientInfo.h>
+#include <Interpreters/ClientInfo.h>
 
 
 namespace CurrentMetrics
diff --git a/dbms/include/DB/Client/Connection.h b/dbms/src/Client/Connection.h
similarity index 95%
rename from dbms/include/DB/Client/Connection.h
rename to dbms/src/Client/Connection.h
index f7aaca79611..a636d41715e 100644
--- a/dbms/include/DB/Client/Connection.h
+++ b/dbms/src/Client/Connection.h
@@ -4,19 +4,19 @@
 
 #include <Poco/Net/StreamSocket.h>
 
-#include <DB/Common/Throttler.h>
+#include <Common/Throttler.h>
 
-#include <DB/Core/Block.h>
-#include <DB/Core/Defines.h>
-#include <DB/Core/Progress.h>
-#include <DB/Core/Protocol.h>
-#include <DB/Core/QueryProcessingStage.h>
+#include <Core/Block.h>
+#include <Core/Defines.h>
+#include <Core/Progress.h>
+#include <Core/Protocol.h>
+#include <Core/QueryProcessingStage.h>
 
-#include <DB/DataStreams/IBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/BlockStreamProfileInfo.h>
+#include <DataStreams/IBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/BlockStreamProfileInfo.h>
 
-#include <DB/Interpreters/Settings.h>
+#include <Interpreters/Settings.h>
 
 #include <atomic>
 
diff --git a/dbms/include/DB/Client/ConnectionPool.h b/dbms/src/Client/ConnectionPool.h
similarity index 98%
rename from dbms/include/DB/Client/ConnectionPool.h
rename to dbms/src/Client/ConnectionPool.h
index 16323dfd094..61fa9ad4ca0 100644
--- a/dbms/include/DB/Client/ConnectionPool.h
+++ b/dbms/src/Client/ConnectionPool.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Common/PoolBase.h>
+#include <Common/PoolBase.h>
 
-#include <DB/Client/Connection.h>
+#include <Client/Connection.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Client/ConnectionPoolWithFailover.h b/dbms/src/Client/ConnectionPoolWithFailover.h
similarity index 97%
rename from dbms/include/DB/Client/ConnectionPoolWithFailover.h
rename to dbms/src/Client/ConnectionPoolWithFailover.h
index cf3ecc7abfd..995f19df835 100644
--- a/dbms/include/DB/Client/ConnectionPoolWithFailover.h
+++ b/dbms/src/Client/ConnectionPoolWithFailover.h
@@ -5,10 +5,10 @@
 #include <Poco/Net/NetException.h>
 #include <Poco/Net/DNS.h>
 
-#include <DB/Common/PoolWithFailoverBase.h>
+#include <Common/PoolWithFailoverBase.h>
 
-#include <DB/Common/getFQDNOrHostName.h>
-#include <DB/Client/ConnectionPool.h>
+#include <Common/getFQDNOrHostName.h>
+#include <Client/ConnectionPool.h>
 
 
 namespace DB
diff --git a/dbms/src/Client/InterruptListener.h b/dbms/src/Client/InterruptListener.h
index 889fa9f3bc7..9bda0c852d0 100644
--- a/dbms/src/Client/InterruptListener.h
+++ b/dbms/src/Client/InterruptListener.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <signal.h>
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 
 namespace DB
diff --git a/dbms/src/Client/MultiplexedConnections.cpp b/dbms/src/Client/MultiplexedConnections.cpp
index 34222fbf968..9920664d58d 100644
--- a/dbms/src/Client/MultiplexedConnections.cpp
+++ b/dbms/src/Client/MultiplexedConnections.cpp
@@ -1,4 +1,4 @@
-#include <DB/Client/MultiplexedConnections.h>
+#include <Client/MultiplexedConnections.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Client/MultiplexedConnections.h b/dbms/src/Client/MultiplexedConnections.h
similarity index 98%
rename from dbms/include/DB/Client/MultiplexedConnections.h
rename to dbms/src/Client/MultiplexedConnections.h
index e91b24a18e5..8cee99d10aa 100644
--- a/dbms/include/DB/Client/MultiplexedConnections.h
+++ b/dbms/src/Client/MultiplexedConnections.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Common/Throttler.h>
-#include <DB/Client/Connection.h>
-#include <DB/Client/ConnectionPool.h>
+#include <Common/Throttler.h>
+#include <Client/Connection.h>
+#include <Client/ConnectionPool.h>
 #include <Poco/ScopedLock.h>
 #include <mutex>
 
diff --git a/dbms/src/Client/tests/test_connect.cpp b/dbms/src/Client/tests/test_connect.cpp
index 31b2fdae7c2..e31240bc467 100644
--- a/dbms/src/Client/tests/test_connect.cpp
+++ b/dbms/src/Client/tests/test_connect.cpp
@@ -4,8 +4,8 @@
 
 #include <iostream>
 #include <Poco/Net/StreamSocket.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <IO/ReadHelpers.h>
 
 
 /** In a loop it connects to the server and immediately breaks the connection.
diff --git a/dbms/src/Columns/ColumnAggregateFunction.cpp b/dbms/src/Columns/ColumnAggregateFunction.cpp
index deaf548cdb1..67c5ac096db 100644
--- a/dbms/src/Columns/ColumnAggregateFunction.cpp
+++ b/dbms/src/Columns/ColumnAggregateFunction.cpp
@@ -1,6 +1,6 @@
-#include <DB/AggregateFunctions/AggregateFunctionState.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
-#include <DB/Common/SipHash.h>
+#include <AggregateFunctions/AggregateFunctionState.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Common/SipHash.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Columns/ColumnAggregateFunction.h b/dbms/src/Columns/ColumnAggregateFunction.h
similarity index 95%
rename from dbms/include/DB/Columns/ColumnAggregateFunction.h
rename to dbms/src/Columns/ColumnAggregateFunction.h
index 9db709fa100..fe71faff9ec 100644
--- a/dbms/include/DB/Columns/ColumnAggregateFunction.h
+++ b/dbms/src/Columns/ColumnAggregateFunction.h
@@ -1,16 +1,16 @@
 #pragma once
 
-#include <DB/Common/Arena.h>
+#include <Common/Arena.h>
 
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
-#include <DB/Columns/IColumn.h>
+#include <Columns/IColumn.h>
 
-#include <DB/Core/Field.h>
+#include <Core/Field.h>
 
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/src/Columns/ColumnArray.cpp b/dbms/src/Columns/ColumnArray.cpp
index 995e713a058..dd793ce59fd 100644
--- a/dbms/src/Columns/ColumnArray.cpp
+++ b/dbms/src/Columns/ColumnArray.cpp
@@ -1,13 +1,13 @@
 #include <string.h> // memcpy
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsCommon.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsCommon.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/Arena.h>
-#include <DB/Common/SipHash.h>
+#include <Common/Exception.h>
+#include <Common/Arena.h>
+#include <Common/SipHash.h>
 
 
 
diff --git a/dbms/include/DB/Columns/ColumnArray.h b/dbms/src/Columns/ColumnArray.h
similarity index 98%
rename from dbms/include/DB/Columns/ColumnArray.h
rename to dbms/src/Columns/ColumnArray.h
index d3a7013c3b9..48bff9cb7f1 100644
--- a/dbms/include/DB/Columns/ColumnArray.h
+++ b/dbms/src/Columns/ColumnArray.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Columns/IColumn.h>
-#include <DB/Columns/ColumnVector.h>
+#include <Columns/IColumn.h>
+#include <Columns/ColumnVector.h>
 
 
 namespace DB
diff --git a/dbms/src/Columns/ColumnConst.cpp b/dbms/src/Columns/ColumnConst.cpp
index 03cd600819f..5b0987f69f5 100644
--- a/dbms/src/Columns/ColumnConst.cpp
+++ b/dbms/src/Columns/ColumnConst.cpp
@@ -1,14 +1,14 @@
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeArray.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/DataTypes/DataTypeTuple.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <ext/enumerate.hpp>
 
 
diff --git a/dbms/include/DB/Columns/ColumnConst.h b/dbms/src/Columns/ColumnConst.h
similarity index 98%
rename from dbms/include/DB/Columns/ColumnConst.h
rename to dbms/src/Columns/ColumnConst.h
index a0a74018510..72a60034384 100644
--- a/dbms/include/DB/Columns/ColumnConst.h
+++ b/dbms/src/Columns/ColumnConst.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/Core/Field.h>
-#include <DB/Common/Exception.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/IColumn.h>
-#include <DB/Columns/ColumnsCommon.h>
-#include <DB/DataTypes/IDataType.h>
+#include <Core/Field.h>
+#include <Common/Exception.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/IColumn.h>
+#include <Columns/ColumnsCommon.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/src/Columns/ColumnConstAggregateFunction.cpp b/dbms/src/Columns/ColumnConstAggregateFunction.cpp
index b4b9565b528..6cb06e37e22 100644
--- a/dbms/src/Columns/ColumnConstAggregateFunction.cpp
+++ b/dbms/src/Columns/ColumnConstAggregateFunction.cpp
@@ -1,5 +1,5 @@
-#include <DB/Columns/ColumnConstAggregateFunction.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnConstAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Columns/ColumnConstAggregateFunction.h b/dbms/src/Columns/ColumnConstAggregateFunction.h
similarity index 96%
rename from dbms/include/DB/Columns/ColumnConstAggregateFunction.h
rename to dbms/src/Columns/ColumnConstAggregateFunction.h
index 0ad3ba3cae5..2c89d1786a7 100644
--- a/dbms/include/DB/Columns/ColumnConstAggregateFunction.h
+++ b/dbms/src/Columns/ColumnConstAggregateFunction.h
@@ -1,6 +1,6 @@
 #pragma once
-#include <DB/Columns/ColumnConst.h>
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/Columns/ColumnExpression.cpp b/dbms/src/Columns/ColumnExpression.cpp
index 6f9448c5de3..8381943721e 100644
--- a/dbms/src/Columns/ColumnExpression.cpp
+++ b/dbms/src/Columns/ColumnExpression.cpp
@@ -1,5 +1,5 @@
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Columns/ColumnExpression.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Columns/ColumnExpression.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Columns/ColumnExpression.h b/dbms/src/Columns/ColumnExpression.h
similarity index 93%
rename from dbms/include/DB/Columns/ColumnExpression.h
rename to dbms/src/Columns/ColumnExpression.h
index 8ded7861447..ab0ca1a648b 100644
--- a/dbms/include/DB/Columns/ColumnExpression.h
+++ b/dbms/src/Columns/ColumnExpression.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Columns/IColumnDummy.h>
+#include <Core/NamesAndTypes.h>
+#include <Columns/IColumnDummy.h>
 
 
 namespace DB
diff --git a/dbms/src/Columns/ColumnFixedString.cpp b/dbms/src/Columns/ColumnFixedString.cpp
index a6959188334..6aeee31e18e 100644
--- a/dbms/src/Columns/ColumnFixedString.cpp
+++ b/dbms/src/Columns/ColumnFixedString.cpp
@@ -1,10 +1,10 @@
-#include <DB/Common/Arena.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/memcpySmall.h>
+#include <Common/Arena.h>
+#include <Common/SipHash.h>
+#include <Common/memcpySmall.h>
 
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Columns/ColumnFixedString.h>
+#include <Columns/ColumnFixedString.h>
 
 #if __SSE2__
     #include <emmintrin.h>
diff --git a/dbms/include/DB/Columns/ColumnFixedString.h b/dbms/src/Columns/ColumnFixedString.h
similarity index 98%
rename from dbms/include/DB/Columns/ColumnFixedString.h
rename to dbms/src/Columns/ColumnFixedString.h
index 0755424e4c5..8331544432a 100644
--- a/dbms/include/DB/Columns/ColumnFixedString.h
+++ b/dbms/src/Columns/ColumnFixedString.h
@@ -2,8 +2,8 @@
 
 #include <string.h> // memcpy
 
-#include <DB/Common/PODArray.h>
-#include <DB/Columns/IColumn.h>
+#include <Common/PODArray.h>
+#include <Columns/IColumn.h>
 
 
 namespace DB
diff --git a/dbms/src/Columns/ColumnNullable.cpp b/dbms/src/Columns/ColumnNullable.cpp
index 84a63b41520..fa6f2d1a677 100644
--- a/dbms/src/Columns/ColumnNullable.cpp
+++ b/dbms/src/Columns/ColumnNullable.cpp
@@ -1,10 +1,10 @@
-#include <DB/Common/Arena.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/NaNUtils.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
+#include <Common/Arena.h>
+#include <Common/SipHash.h>
+#include <Common/NaNUtils.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Columns/ColumnNullable.h b/dbms/src/Columns/ColumnNullable.h
similarity index 98%
rename from dbms/include/DB/Columns/ColumnNullable.h
rename to dbms/src/Columns/ColumnNullable.h
index 078dd5eec71..733f4302642 100644
--- a/dbms/include/DB/Columns/ColumnNullable.h
+++ b/dbms/src/Columns/ColumnNullable.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Columns/IColumn.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/IColumn.h>
+#include <Columns/ColumnsNumber.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Columns/ColumnSet.h b/dbms/src/Columns/ColumnSet.h
similarity index 96%
rename from dbms/include/DB/Columns/ColumnSet.h
rename to dbms/src/Columns/ColumnSet.h
index d4794c9732f..59e9c85a904 100644
--- a/dbms/include/DB/Columns/ColumnSet.h
+++ b/dbms/src/Columns/ColumnSet.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Columns/IColumnDummy.h>
+#include <Columns/IColumnDummy.h>
 
 
 namespace DB
diff --git a/dbms/src/Columns/ColumnString.cpp b/dbms/src/Columns/ColumnString.cpp
index 175a807a0f6..1f91f9b5258 100644
--- a/dbms/src/Columns/ColumnString.cpp
+++ b/dbms/src/Columns/ColumnString.cpp
@@ -1,8 +1,8 @@
-#include <DB/Core/Defines.h>
+#include <Core/Defines.h>
 
-#include <DB/Common/Collator.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsCommon.h>
+#include <Common/Collator.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsCommon.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Columns/ColumnString.h b/dbms/src/Columns/ColumnString.h
similarity index 97%
rename from dbms/include/DB/Columns/ColumnString.h
rename to dbms/src/Columns/ColumnString.h
index a151772d1bb..ecc19c4a35c 100644
--- a/dbms/include/DB/Columns/ColumnString.h
+++ b/dbms/src/Columns/ColumnString.h
@@ -2,11 +2,11 @@
 
 #include <string.h>
 
-#include <DB/Columns/IColumn.h>
-#include <DB/Common/PODArray.h>
-#include <DB/Common/Arena.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/memcpySmall.h>
+#include <Columns/IColumn.h>
+#include <Common/PODArray.h>
+#include <Common/Arena.h>
+#include <Common/SipHash.h>
+#include <Common/memcpySmall.h>
 
 
 class Collator;
diff --git a/dbms/src/Columns/ColumnTuple.cpp b/dbms/src/Columns/ColumnTuple.cpp
index e0d9907e7ef..74a9803df89 100644
--- a/dbms/src/Columns/ColumnTuple.cpp
+++ b/dbms/src/Columns/ColumnTuple.cpp
@@ -1,4 +1,4 @@
-#include <DB/Columns/ColumnTuple.h>
+#include <Columns/ColumnTuple.h>
 #include <ext/map.hpp>
 #include <ext/range.hpp>
 
diff --git a/dbms/include/DB/Columns/ColumnTuple.h b/dbms/src/Columns/ColumnTuple.h
similarity index 98%
rename from dbms/include/DB/Columns/ColumnTuple.h
rename to dbms/src/Columns/ColumnTuple.h
index 2e9a8ace978..643e3ffa71f 100644
--- a/dbms/include/DB/Columns/ColumnTuple.h
+++ b/dbms/src/Columns/ColumnTuple.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Block.h>
+#include <Core/Block.h>
 
 
 namespace DB
diff --git a/dbms/src/Columns/ColumnVector.cpp b/dbms/src/Columns/ColumnVector.cpp
index ab5a0e50f86..3b8ca65017e 100644
--- a/dbms/src/Columns/ColumnVector.cpp
+++ b/dbms/src/Columns/ColumnVector.cpp
@@ -1,15 +1,15 @@
 #include <cstring>
 #include <cmath>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/Arena.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/NaNUtils.h>
+#include <Common/Exception.h>
+#include <Common/Arena.h>
+#include <Common/SipHash.h>
+#include <Common/NaNUtils.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Columns/ColumnVector.h>
+#include <Columns/ColumnVector.h>
 
 #include <ext/bit_cast.hpp>
 
diff --git a/dbms/include/DB/Columns/ColumnVector.h b/dbms/src/Columns/ColumnVector.h
similarity index 99%
rename from dbms/include/DB/Columns/ColumnVector.h
rename to dbms/src/Columns/ColumnVector.h
index ca169299aa5..dbddd50b7ad 100644
--- a/dbms/include/DB/Columns/ColumnVector.h
+++ b/dbms/src/Columns/ColumnVector.h
@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include <DB/Columns/IColumn.h>
+#include <Columns/IColumn.h>
 
 
 namespace DB
diff --git a/dbms/src/Columns/ColumnsCommon.cpp b/dbms/src/Columns/ColumnsCommon.cpp
index 4381e36ce00..5e0aa6f791d 100644
--- a/dbms/src/Columns/ColumnsCommon.cpp
+++ b/dbms/src/Columns/ColumnsCommon.cpp
@@ -2,7 +2,7 @@
     #include <emmintrin.h>
 #endif
 
-#include <DB/Columns/IColumn.h>
+#include <Columns/IColumn.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Columns/ColumnsCommon.h b/dbms/src/Columns/ColumnsCommon.h
similarity index 94%
rename from dbms/include/DB/Columns/ColumnsCommon.h
rename to dbms/src/Columns/ColumnsCommon.h
index 91a77618c13..a13afcb41d9 100644
--- a/dbms/include/DB/Columns/ColumnsCommon.h
+++ b/dbms/src/Columns/ColumnsCommon.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Columns/IColumn.h>
+#include <Columns/IColumn.h>
 
 
 /// Common helper methods for implementation of different columns.
diff --git a/dbms/include/DB/Columns/ColumnsNumber.h b/dbms/src/Columns/ColumnsNumber.h
similarity index 90%
rename from dbms/include/DB/Columns/ColumnsNumber.h
rename to dbms/src/Columns/ColumnsNumber.h
index 52f6e7f4a61..bb632c52906 100644
--- a/dbms/include/DB/Columns/ColumnsNumber.h
+++ b/dbms/src/Columns/ColumnsNumber.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Types.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnConst.h>
+#include <Core/Types.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Columns/IColumn.h b/dbms/src/Columns/IColumn.h
similarity index 98%
rename from dbms/include/DB/Columns/IColumn.h
rename to dbms/src/Columns/IColumn.h
index 43b95eca9cc..6166338501e 100644
--- a/dbms/include/DB/Columns/IColumn.h
+++ b/dbms/src/Columns/IColumn.h
@@ -2,12 +2,12 @@
 
 #include <memory>
 
-#include <DB/Common/PODArray.h>
-#include <DB/Common/typeid_cast.h>
+#include <Common/PODArray.h>
+#include <Common/typeid_cast.h>
 
-#include <DB/Core/Field.h>
-#include <DB/Common/Exception.h>
-#include <DB/Core/StringRef.h>
+#include <Core/Field.h>
+#include <Common/Exception.h>
+#include <Core/StringRef.h>
 
 
 class SipHash;
diff --git a/dbms/include/DB/Columns/IColumnDummy.h b/dbms/src/Columns/IColumnDummy.h
similarity index 98%
rename from dbms/include/DB/Columns/IColumnDummy.h
rename to dbms/src/Columns/IColumnDummy.h
index 9ea9ab0f1f3..6b83f7b7255 100644
--- a/dbms/include/DB/Columns/IColumnDummy.h
+++ b/dbms/src/Columns/IColumnDummy.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Columns/IColumn.h>
-#include <DB/Columns/ColumnsCommon.h>
+#include <Columns/IColumn.h>
+#include <Columns/ColumnsCommon.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/AIO.h b/dbms/src/Common/AIO.h
similarity index 99%
rename from dbms/include/DB/Common/AIO.h
rename to dbms/src/Common/AIO.h
index 7208688091e..5702a8bc683 100644
--- a/dbms/include/DB/Common/AIO.h
+++ b/dbms/src/Common/AIO.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 #include <common/logger_useful.h>
 #include <common/singleton.h>
 #include <Poco/Logger.h>
diff --git a/dbms/include/DB/Common/Allocator.h b/dbms/src/Common/Allocator.h
similarity index 99%
rename from dbms/include/DB/Common/Allocator.h
rename to dbms/src/Common/Allocator.h
index 849b71a6eac..89f4e40ff42 100644
--- a/dbms/include/DB/Common/Allocator.h
+++ b/dbms/src/Common/Allocator.h
@@ -7,8 +7,8 @@
 #include <string.h>
 #include <sys/mman.h>
 
-#include <DB/Common/MemoryTracker.h>
-#include <DB/Common/Exception.h>
+#include <Common/MemoryTracker.h>
+#include <Common/Exception.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/Arena.h b/dbms/src/Common/Arena.h
similarity index 97%
rename from dbms/include/DB/Common/Arena.h
rename to dbms/src/Common/Arena.h
index 06ea2f3ec9a..498da69570f 100644
--- a/dbms/include/DB/Common/Arena.h
+++ b/dbms/src/Common/Arena.h
@@ -5,9 +5,9 @@
 #include <vector>
 #include <boost/noncopyable.hpp>
 #include <common/likely.h>
-#include <DB/Core/Defines.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/Allocator.h>
+#include <Core/Defines.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Allocator.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Common/ArenaWithFreeLists.h b/dbms/src/Common/ArenaWithFreeLists.h
similarity index 98%
rename from dbms/include/DB/Common/ArenaWithFreeLists.h
rename to dbms/src/Common/ArenaWithFreeLists.h
index db4c81c3166..08a3c84d8ca 100644
--- a/dbms/include/DB/Common/ArenaWithFreeLists.h
+++ b/dbms/src/Common/ArenaWithFreeLists.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Common/Arena.h>
-#include <DB/Common/BitHelpers.h>
+#include <Common/Arena.h>
+#include <Common/BitHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/AutoArray.h b/dbms/src/Common/AutoArray.h
similarity index 100%
rename from dbms/include/DB/Common/AutoArray.h
rename to dbms/src/Common/AutoArray.h
diff --git a/dbms/include/DB/Common/BitHelpers.h b/dbms/src/Common/BitHelpers.h
similarity index 100%
rename from dbms/include/DB/Common/BitHelpers.h
rename to dbms/src/Common/BitHelpers.h
diff --git a/dbms/src/Common/ClickHouseRevision.cpp b/dbms/src/Common/ClickHouseRevision.cpp
index 9d222c1b5e4..ea48dcdc54f 100644
--- a/dbms/src/Common/ClickHouseRevision.cpp
+++ b/dbms/src/Common/ClickHouseRevision.cpp
@@ -1,5 +1,5 @@
-#include <DB/Common/ClickHouseRevision.h>
-#include <DB/Common/config_version.h>
+#include <Common/ClickHouseRevision.h>
+#include <Common/config_version.h>
 
 namespace ClickHouseRevision
 {
diff --git a/dbms/include/DB/Common/ClickHouseRevision.h b/dbms/src/Common/ClickHouseRevision.h
similarity index 100%
rename from dbms/include/DB/Common/ClickHouseRevision.h
rename to dbms/src/Common/ClickHouseRevision.h
diff --git a/dbms/src/Common/Collator.cpp b/dbms/src/Common/Collator.cpp
index 34c2c5d1fad..4bf8bd7b57a 100644
--- a/dbms/src/Common/Collator.cpp
+++ b/dbms/src/Common/Collator.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/Collator.h>
+#include <Common/Collator.h>
 
 #pragma GCC diagnostic push
 #ifdef __APPLE__
@@ -7,8 +7,8 @@
 #include <unicode/ucol.h>
 #pragma GCC diagnostic pop
 
-#include <DB/Common/Exception.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/Exception.h>
+#include <IO/WriteHelpers.h>
 #include <common/Common.h>
 #include <Poco/String.h>
 
diff --git a/dbms/include/DB/Common/Collator.h b/dbms/src/Common/Collator.h
similarity index 100%
rename from dbms/include/DB/Common/Collator.h
rename to dbms/src/Common/Collator.h
diff --git a/dbms/include/DB/Common/CombinedCardinalityEstimator.h b/dbms/src/Common/CombinedCardinalityEstimator.h
similarity index 98%
rename from dbms/include/DB/Common/CombinedCardinalityEstimator.h
rename to dbms/src/Common/CombinedCardinalityEstimator.h
index 068805ff7a3..fa4b07ade3b 100644
--- a/dbms/include/DB/Common/CombinedCardinalityEstimator.h
+++ b/dbms/src/Common/CombinedCardinalityEstimator.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Common/HashTable/SmallTable.h>
-#include <DB/Common/HashTable/HashSet.h>
-#include <DB/Common/HyperLogLogCounter.h>
-#include <DB/Core/Defines.h>
+#include <Common/HashTable/SmallTable.h>
+#include <Common/HashTable/HashSet.h>
+#include <Common/HyperLogLogCounter.h>
+#include <Core/Defines.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/CompactArray.h b/dbms/src/Common/CompactArray.h
similarity index 98%
rename from dbms/include/DB/Common/CompactArray.h
rename to dbms/src/Common/CompactArray.h
index d06f7461e87..c53fb4d5b7b 100644
--- a/dbms/include/DB/Common/CompactArray.h
+++ b/dbms/src/Common/CompactArray.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Core/Defines.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Core/Defines.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Common/ConcurrentBoundedQueue.h b/dbms/src/Common/ConcurrentBoundedQueue.h
similarity index 99%
rename from dbms/include/DB/Common/ConcurrentBoundedQueue.h
rename to dbms/src/Common/ConcurrentBoundedQueue.h
index 1beb04e5c0f..cbcfd1b5eb8 100644
--- a/dbms/include/DB/Common/ConcurrentBoundedQueue.h
+++ b/dbms/src/Common/ConcurrentBoundedQueue.h
@@ -6,7 +6,7 @@
 #include <Poco/Mutex.h>
 #include <Poco/Semaphore.h>
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 namespace detail
 {
diff --git a/dbms/src/Common/ConfigProcessor.cpp b/dbms/src/Common/ConfigProcessor.cpp
index ed8b7f50680..ba9a73189ea 100644
--- a/dbms/src/Common/ConfigProcessor.cpp
+++ b/dbms/src/Common/ConfigProcessor.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/ConfigProcessor.h>
+#include <Common/ConfigProcessor.h>
 #include <sys/utsname.h>
 #include <cerrno>
 #include <cstring>
diff --git a/dbms/include/DB/Common/ConfigProcessor.h b/dbms/src/Common/ConfigProcessor.h
similarity index 100%
rename from dbms/include/DB/Common/ConfigProcessor.h
rename to dbms/src/Common/ConfigProcessor.h
diff --git a/dbms/include/DB/Common/CounterInFile.h b/dbms/src/Common/CounterInFile.h
similarity index 96%
rename from dbms/include/DB/Common/CounterInFile.h
rename to dbms/src/Common/CounterInFile.h
index 13af5b5fe4f..2c79605f74b 100644
--- a/dbms/include/DB/Common/CounterInFile.h
+++ b/dbms/src/Common/CounterInFile.h
@@ -11,11 +11,11 @@
 #include <mutex>
 #include <Poco/ScopedLock.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/Exception.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 #include <common/Common.h>
 
diff --git a/dbms/src/Common/CurrentMetrics.cpp b/dbms/src/Common/CurrentMetrics.cpp
index 2877bc8b6d4..5f23ded3e1b 100644
--- a/dbms/src/Common/CurrentMetrics.cpp
+++ b/dbms/src/Common/CurrentMetrics.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/CurrentMetrics.h>
 
 
 /// Available metrics. Add something here as you wish.
diff --git a/dbms/include/DB/Common/CurrentMetrics.h b/dbms/src/Common/CurrentMetrics.h
similarity index 99%
rename from dbms/include/DB/Common/CurrentMetrics.h
rename to dbms/src/Common/CurrentMetrics.h
index a0e90c726c8..e677bd2e1d8 100644
--- a/dbms/include/DB/Common/CurrentMetrics.h
+++ b/dbms/src/Common/CurrentMetrics.h
@@ -4,7 +4,7 @@
 #include <cstdint>
 #include <utility>
 #include <atomic>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 /** Allows to count number of simultaneously happening processes or current value of some metric.
   *  - for high-level profiling.
diff --git a/dbms/src/Common/Exception.cpp b/dbms/src/Common/Exception.cpp
index cbf327bf6a1..2a94cb0b3b3 100644
--- a/dbms/src/Common/Exception.cpp
+++ b/dbms/src/Common/Exception.cpp
@@ -6,9 +6,9 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/Exception.h b/dbms/src/Common/Exception.h
similarity index 99%
rename from dbms/include/DB/Common/Exception.h
rename to dbms/src/Common/Exception.h
index 039ee70f5a1..aa3f4544b74 100644
--- a/dbms/include/DB/Common/Exception.h
+++ b/dbms/src/Common/Exception.h
@@ -6,7 +6,7 @@
 
 #include <Poco/Exception.h>
 
-#include <DB/Common/StackTrace.h>
+#include <Common/StackTrace.h>
 
 namespace Poco { class Logger; }
 
diff --git a/dbms/include/DB/Common/ExternalTable.h b/dbms/src/Common/ExternalTable.h
similarity index 96%
rename from dbms/include/DB/Common/ExternalTable.h
rename to dbms/src/Common/ExternalTable.h
index 349467201a9..b46c9a39e4e 100644
--- a/dbms/include/DB/Common/ExternalTable.h
+++ b/dbms/src/Common/ExternalTable.h
@@ -2,18 +2,18 @@
 
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string.hpp>
-#include <DB/DataStreams/AsynchronousBlockInputStream.h>
-#include <DB/DataTypes/DataTypeFactory.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/IO/copyData.h>
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/Storages/StorageMemory.h>
-#include <DB/Client/Connection.h>
+#include <DataStreams/AsynchronousBlockInputStream.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <Interpreters/Context.h>
+#include <IO/copyData.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/ReadBufferFromFile.h>
+#include <Storages/StorageMemory.h>
+#include <Client/Connection.h>
 #include <Poco/Net/HTMLForm.h>
 #include <Poco/Net/PartHandler.h>
 #include <Poco/Net/MessageHeader.h>
-#include <DB/Common/HTMLForm.h>
+#include <Common/HTMLForm.h>
 
 
 namespace DB
diff --git a/dbms/src/Common/FileChecker.cpp b/dbms/src/Common/FileChecker.cpp
index eaeb686a54a..fb5a12c5bf7 100644
--- a/dbms/src/Common/FileChecker.cpp
+++ b/dbms/src/Common/FileChecker.cpp
@@ -1,13 +1,13 @@
 #include <common/JSON.h>
 #include <Poco/Path.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/escapeForFileName.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <Common/escapeForFileName.h>
 
-#include <DB/Common/FileChecker.h>
+#include <Common/FileChecker.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/FileChecker.h b/dbms/src/Common/FileChecker.h
similarity index 100%
rename from dbms/include/DB/Common/FileChecker.h
rename to dbms/src/Common/FileChecker.h
diff --git a/dbms/include/DB/Common/HTMLForm.h b/dbms/src/Common/HTMLForm.h
similarity index 96%
rename from dbms/include/DB/Common/HTMLForm.h
rename to dbms/src/Common/HTMLForm.h
index f3c3bf49a84..2490d613160 100644
--- a/dbms/include/DB/Common/HTMLForm.h
+++ b/dbms/src/Common/HTMLForm.h
@@ -5,7 +5,7 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/URI.h>
 
-#include <DB/IO/ReadHelpers.h>
+#include <IO/ReadHelpers.h>
 
 
 /** Somehow, in case of POST, Poco::Net::HTMLForm doesn't read parameters from URL, only from body.
diff --git a/dbms/include/DB/Common/HashTable/ClearableHashMap.h b/dbms/src/Common/HashTable/ClearableHashMap.h
similarity index 93%
rename from dbms/include/DB/Common/HashTable/ClearableHashMap.h
rename to dbms/src/Common/HashTable/ClearableHashMap.h
index 76a1f0e6dee..b68ed180927 100644
--- a/dbms/include/DB/Common/HashTable/ClearableHashMap.h
+++ b/dbms/src/Common/HashTable/ClearableHashMap.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Common/HashTable/ClearableHashSet.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/ClearableHashSet.h>
 
 
 template <typename Key, typename Mapped, typename Hash>
diff --git a/dbms/include/DB/Common/HashTable/ClearableHashSet.h b/dbms/src/Common/HashTable/ClearableHashSet.h
similarity index 98%
rename from dbms/include/DB/Common/HashTable/ClearableHashSet.h
rename to dbms/src/Common/HashTable/ClearableHashSet.h
index 4eb2351a084..b793d3ce099 100644
--- a/dbms/include/DB/Common/HashTable/ClearableHashSet.h
+++ b/dbms/src/Common/HashTable/ClearableHashSet.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <type_traits>
-#include <DB/Common/HashTable/HashSet.h>
+#include <Common/HashTable/HashSet.h>
 
 
 /** Хеш-таблица, позволяющая очищать таблицу за O(1).
diff --git a/dbms/include/DB/Common/HashTable/Hash.h b/dbms/src/Common/HashTable/Hash.h
similarity index 99%
rename from dbms/include/DB/Common/HashTable/Hash.h
rename to dbms/src/Common/HashTable/Hash.h
index b1606fcc78e..ed3bc228b65 100644
--- a/dbms/include/DB/Common/HashTable/Hash.h
+++ b/dbms/src/Common/HashTable/Hash.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 
 /** Хэш функции, которые лучше чем тривиальная функция std::hash.
diff --git a/dbms/include/DB/Common/HashTable/HashMap.h b/dbms/src/Common/HashTable/HashMap.h
similarity index 98%
rename from dbms/include/DB/Common/HashTable/HashMap.h
rename to dbms/src/Common/HashTable/HashMap.h
index 180483a5c7b..438022f7c02 100644
--- a/dbms/include/DB/Common/HashTable/HashMap.h
+++ b/dbms/src/Common/HashTable/HashMap.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Common/HashTable/Hash.h>
-#include <DB/Common/HashTable/HashTable.h>
-#include <DB/Common/HashTable/HashTableAllocator.h>
+#include <Common/HashTable/Hash.h>
+#include <Common/HashTable/HashTable.h>
+#include <Common/HashTable/HashTableAllocator.h>
 
 
 /** NOTE HashMap could only be used for memmoveable (position independent) types.
diff --git a/dbms/include/DB/Common/HashTable/HashSet.h b/dbms/src/Common/HashTable/HashSet.h
similarity index 89%
rename from dbms/include/DB/Common/HashTable/HashSet.h
rename to dbms/src/Common/HashTable/HashSet.h
index 19388fa4831..cbec22ee472 100644
--- a/dbms/include/DB/Common/HashTable/HashSet.h
+++ b/dbms/src/Common/HashTable/HashSet.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <DB/Common/HashTable/Hash.h>
-#include <DB/Common/HashTable/HashTable.h>
-#include <DB/Common/HashTable/HashTableAllocator.h>
+#include <Common/HashTable/Hash.h>
+#include <Common/HashTable/HashTable.h>
+#include <Common/HashTable/HashTableAllocator.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/VarInt.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/VarInt.h>
 
 /** NOTE HashSet could only be used for memmoveable (position independent) types.
   * Example: std::string is not position independent in libstdc++ with C++11 ABI or in libc++.
diff --git a/dbms/include/DB/Common/HashTable/HashTable.h b/dbms/src/Common/HashTable/HashTable.h
similarity index 99%
rename from dbms/include/DB/Common/HashTable/HashTable.h
rename to dbms/src/Common/HashTable/HashTable.h
index fea570f59c0..54044801316 100644
--- a/dbms/include/DB/Common/HashTable/HashTable.h
+++ b/dbms/src/Common/HashTable/HashTable.h
@@ -10,22 +10,22 @@
 
 #include <common/likely.h>
 
-#include <DB/Core/Defines.h>
-#include <DB/Core/Types.h>
-#include <DB/Common/Exception.h>
+#include <Core/Defines.h>
+#include <Core/Types.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/VarInt.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/VarInt.h>
 
-#include <DB/Common/HashTable/HashTableAllocator.h>
+#include <Common/HashTable/HashTableAllocator.h>
 
 #ifdef DBMS_HASH_MAP_DEBUG_RESIZES
     #include <iostream>
     #include <iomanip>
-    #include <DB/Common/Stopwatch.h>
+    #include <Common/Stopwatch.h>
 #endif
 
 /** NOTE HashTable could only be used for memmoveable (position independent) types.
diff --git a/dbms/include/DB/Common/HashTable/HashTableAllocator.h b/dbms/src/Common/HashTable/HashTableAllocator.h
similarity index 84%
rename from dbms/include/DB/Common/HashTable/HashTableAllocator.h
rename to dbms/src/Common/HashTable/HashTableAllocator.h
index 8f938a2f711..eccf29c8b42 100644
--- a/dbms/include/DB/Common/HashTable/HashTableAllocator.h
+++ b/dbms/src/Common/HashTable/HashTableAllocator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/Allocator.h>
+#include <Common/Allocator.h>
 
 
 using HashTableAllocator = Allocator<true>;
diff --git a/dbms/include/DB/Common/HashTable/SmallTable.h b/dbms/src/Common/HashTable/SmallTable.h
similarity index 99%
rename from dbms/include/DB/Common/HashTable/SmallTable.h
rename to dbms/src/Common/HashTable/SmallTable.h
index eb13d6b8b92..39436947d41 100644
--- a/dbms/include/DB/Common/HashTable/SmallTable.h
+++ b/dbms/src/Common/HashTable/SmallTable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashMap.h>
 
 
 /** Замена хэш-таблицы для маленького количества (единицы) ключей.
diff --git a/dbms/include/DB/Common/HashTable/TwoLevelHashMap.h b/dbms/src/Common/HashTable/TwoLevelHashMap.h
similarity index 94%
rename from dbms/include/DB/Common/HashTable/TwoLevelHashMap.h
rename to dbms/src/Common/HashTable/TwoLevelHashMap.h
index e55f730d0c9..00213ca8e6f 100644
--- a/dbms/include/DB/Common/HashTable/TwoLevelHashMap.h
+++ b/dbms/src/Common/HashTable/TwoLevelHashMap.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Common/HashTable/TwoLevelHashTable.h>
-#include <DB/Common/HashTable/HashMap.h>
+#include <Common/HashTable/TwoLevelHashTable.h>
+#include <Common/HashTable/HashMap.h>
 
 
 template
diff --git a/dbms/include/DB/Common/HashTable/TwoLevelHashTable.h b/dbms/src/Common/HashTable/TwoLevelHashTable.h
similarity index 99%
rename from dbms/include/DB/Common/HashTable/TwoLevelHashTable.h
rename to dbms/src/Common/HashTable/TwoLevelHashTable.h
index 41f7a2bf881..519b0db7110 100644
--- a/dbms/include/DB/Common/HashTable/TwoLevelHashTable.h
+++ b/dbms/src/Common/HashTable/TwoLevelHashTable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/HashTable/HashTable.h>
+#include <Common/HashTable/HashTable.h>
 
 
 /** Двухуровневая хэш-таблица.
diff --git a/dbms/include/DB/Common/HyperLogLogBiasEstimator.h b/dbms/src/Common/HyperLogLogBiasEstimator.h
similarity index 99%
rename from dbms/include/DB/Common/HyperLogLogBiasEstimator.h
rename to dbms/src/Common/HyperLogLogBiasEstimator.h
index 38c85908011..75116de1ce9 100644
--- a/dbms/include/DB/Common/HyperLogLogBiasEstimator.h
+++ b/dbms/src/Common/HyperLogLogBiasEstimator.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 #include <algorithm>
 #include <limits>
diff --git a/dbms/include/DB/Common/HyperLogLogCounter.h b/dbms/src/Common/HyperLogLogCounter.h
similarity index 98%
rename from dbms/include/DB/Common/HyperLogLogCounter.h
rename to dbms/src/Common/HyperLogLogCounter.h
index bd99cfbca46..f98c2c22ee3 100644
--- a/dbms/include/DB/Common/HyperLogLogCounter.h
+++ b/dbms/src/Common/HyperLogLogCounter.h
@@ -1,15 +1,15 @@
 #pragma once
 
 #include <common/Common.h>
-#include <DB/Common/HyperLogLogBiasEstimator.h>
-#include <DB/Common/CompactArray.h>
-#include <DB/Common/HashTable/Hash.h>
+#include <Common/HyperLogLogBiasEstimator.h>
+#include <Common/CompactArray.h>
+#include <Common/HashTable/Hash.h>
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Core/Defines.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Core/Defines.h>
 
 #include <cmath>
 #include <cstring>
diff --git a/dbms/include/DB/Common/HyperLogLogWithSmallSetOptimization.h b/dbms/src/Common/HyperLogLogWithSmallSetOptimization.h
similarity index 97%
rename from dbms/include/DB/Common/HyperLogLogWithSmallSetOptimization.h
rename to dbms/src/Common/HyperLogLogWithSmallSetOptimization.h
index f102a5d7e74..06237a4e33e 100644
--- a/dbms/include/DB/Common/HyperLogLogWithSmallSetOptimization.h
+++ b/dbms/src/Common/HyperLogLogWithSmallSetOptimization.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Common/HyperLogLogCounter.h>
-#include <DB/Common/HashTable/SmallTable.h>
+#include <Common/HyperLogLogCounter.h>
+#include <Common/HashTable/SmallTable.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Common/Increment.h b/dbms/src/Common/Increment.h
similarity index 98%
rename from dbms/include/DB/Common/Increment.h
rename to dbms/src/Common/Increment.h
index 49a43aff712..fafc424073c 100644
--- a/dbms/include/DB/Common/Increment.h
+++ b/dbms/src/Common/Increment.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/CounterInFile.h>
+#include <Common/CounterInFile.h>
 
 
 /** Позволяет получать авто-инкрементное число, храня его в файле.
diff --git a/dbms/include/DB/Common/LRUCache.h b/dbms/src/Common/LRUCache.h
similarity index 100%
rename from dbms/include/DB/Common/LRUCache.h
rename to dbms/src/Common/LRUCache.h
diff --git a/dbms/src/Common/Macros.cpp b/dbms/src/Common/Macros.cpp
index 2dd677bcba1..cb3d43cd21c 100644
--- a/dbms/src/Common/Macros.cpp
+++ b/dbms/src/Common/Macros.cpp
@@ -1,5 +1,5 @@
-#include <DB/Common/Macros.h>
-#include <DB/Common/Exception.h>
+#include <Common/Macros.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Common/Macros.h b/dbms/src/Common/Macros.h
similarity index 96%
rename from dbms/include/DB/Common/Macros.h
rename to dbms/src/Common/Macros.h
index fb85efcc3df..0e6cfe94c39 100644
--- a/dbms/include/DB/Common/Macros.h
+++ b/dbms/src/Common/Macros.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <map>
 
diff --git a/dbms/src/Common/MemoryTracker.cpp b/dbms/src/Common/MemoryTracker.cpp
index 7e1ec5ff683..cc9d608f02b 100644
--- a/dbms/src/Common/MemoryTracker.cpp
+++ b/dbms/src/Common/MemoryTracker.cpp
@@ -1,11 +1,11 @@
 #include <common/likely.h>
 #include <common/logger_useful.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/formatReadable.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/Exception.h>
+#include <Common/formatReadable.h>
+#include <IO/WriteHelpers.h>
 #include <iomanip>
 
-#include <DB/Common/MemoryTracker.h>
+#include <Common/MemoryTracker.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/MemoryTracker.h b/dbms/src/Common/MemoryTracker.h
similarity index 99%
rename from dbms/include/DB/Common/MemoryTracker.h
rename to dbms/src/Common/MemoryTracker.h
index a0eabeb1bae..3117a2aee15 100644
--- a/dbms/include/DB/Common/MemoryTracker.h
+++ b/dbms/src/Common/MemoryTracker.h
@@ -2,7 +2,7 @@
 
 #include <atomic>
 #include <common/Common.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/CurrentMetrics.h>
 
 
 namespace CurrentMetrics
diff --git a/dbms/include/DB/Common/NaNUtils.h b/dbms/src/Common/NaNUtils.h
similarity index 100%
rename from dbms/include/DB/Common/NaNUtils.h
rename to dbms/src/Common/NaNUtils.h
diff --git a/dbms/include/DB/Common/NetException.h b/dbms/src/Common/NetException.h
similarity index 96%
rename from dbms/include/DB/Common/NetException.h
rename to dbms/src/Common/NetException.h
index e1e54e6c35d..aef98bcd079 100644
--- a/dbms/include/DB/Common/NetException.h
+++ b/dbms/src/Common/NetException.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/OptimizedRegularExpression.h b/dbms/src/Common/OptimizedRegularExpression.h
similarity index 99%
rename from dbms/include/DB/Common/OptimizedRegularExpression.h
rename to dbms/src/Common/OptimizedRegularExpression.h
index 03452d025c6..d6a6475c1fb 100644
--- a/dbms/include/DB/Common/OptimizedRegularExpression.h
+++ b/dbms/src/Common/OptimizedRegularExpression.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include <DB/Common/config.h>
+#include <Common/config.h>
 #include <re2/re2.h>
 #if USE_RE2_ST
     #include <re2_st/re2.h>
diff --git a/dbms/include/DB/Common/OptimizedRegularExpression.inl b/dbms/src/Common/OptimizedRegularExpression.inl
similarity index 99%
rename from dbms/include/DB/Common/OptimizedRegularExpression.inl
rename to dbms/src/Common/OptimizedRegularExpression.inl
index 8c0913093f9..2689901ca99 100644
--- a/dbms/include/DB/Common/OptimizedRegularExpression.inl
+++ b/dbms/src/Common/OptimizedRegularExpression.inl
@@ -2,7 +2,7 @@
 
 #include <Poco/Exception.h>
 
-#include <DB/Common/OptimizedRegularExpression.h>
+#include <Common/OptimizedRegularExpression.h>
 
 
 #define MIN_LENGTH_FOR_STRSTR 3
diff --git a/dbms/include/DB/Common/PODArray.h b/dbms/src/Common/PODArray.h
similarity index 99%
rename from dbms/include/DB/Common/PODArray.h
rename to dbms/src/Common/PODArray.h
index e5ee32402fc..2d42c1c39dc 100644
--- a/dbms/include/DB/Common/PODArray.h
+++ b/dbms/src/Common/PODArray.h
@@ -11,9 +11,9 @@
 #include <common/likely.h>
 #include <common/strong_typedef.h>
 
-#include <DB/Common/Allocator.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/BitHelpers.h>
+#include <Common/Allocator.h>
+#include <Common/Exception.h>
+#include <Common/BitHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/PoolBase.h b/dbms/src/Common/PoolBase.h
similarity index 99%
rename from dbms/include/DB/Common/PoolBase.h
rename to dbms/src/Common/PoolBase.h
index 13fd6f7007d..44cbc799cb4 100644
--- a/dbms/include/DB/Common/PoolBase.h
+++ b/dbms/src/Common/PoolBase.h
@@ -6,7 +6,7 @@
 #include <boost/noncopyable.hpp>
 
 #include <common/logger_useful.h>
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 /// This type specifies the possible behaviors of an object pool allocator.
 enum class PoolMode
diff --git a/dbms/include/DB/Common/PoolWithFailoverBase.h b/dbms/src/Common/PoolWithFailoverBase.h
similarity index 98%
rename from dbms/include/DB/Common/PoolWithFailoverBase.h
rename to dbms/src/Common/PoolWithFailoverBase.h
index b4bcb26a4bf..1dbc9e490de 100644
--- a/dbms/include/DB/Common/PoolWithFailoverBase.h
+++ b/dbms/src/Common/PoolWithFailoverBase.h
@@ -3,12 +3,12 @@
 #include <time.h>
 #include <cstdlib>
 #include <random>
-#include <DB/Common/PoolBase.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/NetException.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/randomSeed.h>
-#include <DB/Interpreters/Settings.h>
+#include <Common/PoolBase.h>
+#include <Common/ProfileEvents.h>
+#include <Common/NetException.h>
+#include <Common/Exception.h>
+#include <Common/randomSeed.h>
+#include <Interpreters/Settings.h>
 
 namespace DB
 {
diff --git a/dbms/src/Common/ProfileEvents.cpp b/dbms/src/Common/ProfileEvents.cpp
index cd3c0da8a74..044d7240de9 100644
--- a/dbms/src/Common/ProfileEvents.cpp
+++ b/dbms/src/Common/ProfileEvents.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/ProfileEvents.h>
+#include <Common/ProfileEvents.h>
 
 
 /// Available events. Add something here as you wish.
diff --git a/dbms/include/DB/Common/ProfileEvents.h b/dbms/src/Common/ProfileEvents.h
similarity index 100%
rename from dbms/include/DB/Common/ProfileEvents.h
rename to dbms/src/Common/ProfileEvents.h
diff --git a/dbms/include/DB/Common/ProfilingScopedRWLock.h b/dbms/src/Common/ProfilingScopedRWLock.h
similarity index 91%
rename from dbms/include/DB/Common/ProfilingScopedRWLock.h
rename to dbms/src/Common/ProfilingScopedRWLock.h
index cdab6b15671..5e7523a25bd 100644
--- a/dbms/include/DB/Common/ProfilingScopedRWLock.h
+++ b/dbms/src/Common/ProfilingScopedRWLock.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Poco/RWLock.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/Stopwatch.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Stopwatch.h>
 
 /*
  TODO: replace locks with std::shared_mutex - std::unique_lock - std::shared_lock when c++17
diff --git a/dbms/include/DB/Common/RadixSort.h b/dbms/src/Common/RadixSort.h
similarity index 99%
rename from dbms/include/DB/Common/RadixSort.h
rename to dbms/src/Common/RadixSort.h
index 648e35e9e12..39a21a8e02f 100644
--- a/dbms/include/DB/Common/RadixSort.h
+++ b/dbms/src/Common/RadixSort.h
@@ -9,8 +9,8 @@
 #include <type_traits>
 
 #include <ext/bit_cast.hpp>
-#include <DB/Core/Types.h>
-#include <DB/Core/Defines.h>
+#include <Core/Types.h>
+#include <Core/Defines.h>
 
 
 /** Поразрядная сортировка, обладает следующей функциональностью:
diff --git a/dbms/src/Common/ShellCommand.cpp b/dbms/src/Common/ShellCommand.cpp
index 4bd75ca6fa8..a4c16ee5c48 100644
--- a/dbms/src/Common/ShellCommand.cpp
+++ b/dbms/src/Common/ShellCommand.cpp
@@ -4,10 +4,10 @@
 #include <fcntl.h>
 #include <dlfcn.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/ShellCommand.h>
-#include <DB/IO/WriteBufferFromVector.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/Exception.h>
+#include <Common/ShellCommand.h>
+#include <IO/WriteBufferFromVector.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/ShellCommand.h b/dbms/src/Common/ShellCommand.h
similarity index 97%
rename from dbms/include/DB/Common/ShellCommand.h
rename to dbms/src/Common/ShellCommand.h
index 3931eaae90b..21ccab08878 100644
--- a/dbms/include/DB/Common/ShellCommand.h
+++ b/dbms/src/Common/ShellCommand.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <memory>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/WriteBufferFromFile.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/SimpleCache.h b/dbms/src/Common/SimpleCache.h
similarity index 100%
rename from dbms/include/DB/Common/SimpleCache.h
rename to dbms/src/Common/SimpleCache.h
diff --git a/dbms/include/DB/Common/SipHash.h b/dbms/src/Common/SipHash.h
similarity index 99%
rename from dbms/include/DB/Common/SipHash.h
rename to dbms/src/Common/SipHash.h
index dfcbae74306..62b76ce5ce6 100644
--- a/dbms/include/DB/Common/SipHash.h
+++ b/dbms/src/Common/SipHash.h
@@ -13,7 +13,7 @@
 
 #include <cstdint>
 #include <cstddef>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 #define ROTL(x,b) static_cast<u64>( ((x) << (b)) | ( (x) >> (64 - (b))) )
 
diff --git a/dbms/include/DB/Common/SmallObjectPool.h b/dbms/src/Common/SmallObjectPool.h
similarity index 98%
rename from dbms/include/DB/Common/SmallObjectPool.h
rename to dbms/src/Common/SmallObjectPool.h
index b4704781bea..f3002f6ebcb 100644
--- a/dbms/include/DB/Common/SmallObjectPool.h
+++ b/dbms/src/Common/SmallObjectPool.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/Arena.h>
+#include <Common/Arena.h>
 #include <common/likely.h>
 #include <ext/range.hpp>
 #include <ext/size.hpp>
diff --git a/dbms/src/Common/StackTrace.cpp b/dbms/src/Common/StackTrace.cpp
index 2916f34f662..8c6ffa74350 100644
--- a/dbms/src/Common/StackTrace.cpp
+++ b/dbms/src/Common/StackTrace.cpp
@@ -7,7 +7,7 @@
 
 #include <sstream>
 
-#include <DB/Common/StackTrace.h>
+#include <Common/StackTrace.h>
 
 
 StackTrace::StackTrace()
diff --git a/dbms/include/DB/Common/StackTrace.h b/dbms/src/Common/StackTrace.h
similarity index 100%
rename from dbms/include/DB/Common/StackTrace.h
rename to dbms/src/Common/StackTrace.h
diff --git a/dbms/include/DB/Common/Stopwatch.h b/dbms/src/Common/Stopwatch.h
similarity index 100%
rename from dbms/include/DB/Common/Stopwatch.h
rename to dbms/src/Common/Stopwatch.h
diff --git a/dbms/include/DB/Common/StringSearcher.h b/dbms/src/Common/StringSearcher.h
similarity index 99%
rename from dbms/include/DB/Common/StringSearcher.h
rename to dbms/src/Common/StringSearcher.h
index 0070e002403..00edba6fe47 100644
--- a/dbms/include/DB/Common/StringSearcher.h
+++ b/dbms/src/Common/StringSearcher.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/UTF8Helpers.h>
+#include <Common/UTF8Helpers.h>
 #include <ext/range.hpp>
 #include <Poco/UTF8Encoding.h>
 #include <Poco/Unicode.h>
diff --git a/dbms/src/Common/StringUtils.cpp b/dbms/src/Common/StringUtils.cpp
index ee8dd7aa011..fd8d7d44ec7 100644
--- a/dbms/src/Common/StringUtils.cpp
+++ b/dbms/src/Common/StringUtils.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/StringUtils.h>
+#include <Common/StringUtils.h>
 
 namespace detail
 {
diff --git a/dbms/include/DB/Common/StringUtils.h b/dbms/src/Common/StringUtils.h
similarity index 98%
rename from dbms/include/DB/Common/StringUtils.h
rename to dbms/src/Common/StringUtils.h
index fbbd2903166..69cd0336cf8 100644
--- a/dbms/include/DB/Common/StringUtils.h
+++ b/dbms/src/Common/StringUtils.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 #include <string>
 #include <cstring>
 
diff --git a/dbms/include/DB/Common/StringView.h b/dbms/src/Common/StringView.h
similarity index 100%
rename from dbms/include/DB/Common/StringView.h
rename to dbms/src/Common/StringView.h
diff --git a/dbms/src/Common/ThreadPool.cpp b/dbms/src/Common/ThreadPool.cpp
index 57d9c6bd1c5..f71ebc238f6 100644
--- a/dbms/src/Common/ThreadPool.cpp
+++ b/dbms/src/Common/ThreadPool.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/ThreadPool.h>
+#include <Common/ThreadPool.h>
 #include <iostream>
 
 
diff --git a/dbms/include/DB/Common/ThreadPool.h b/dbms/src/Common/ThreadPool.h
similarity index 100%
rename from dbms/include/DB/Common/ThreadPool.h
rename to dbms/src/Common/ThreadPool.h
diff --git a/dbms/include/DB/Common/Throttler.h b/dbms/src/Common/Throttler.h
similarity index 96%
rename from dbms/include/DB/Common/Throttler.h
rename to dbms/src/Common/Throttler.h
index 3d0a75662e3..6cd0175022b 100644
--- a/dbms/include/DB/Common/Throttler.h
+++ b/dbms/src/Common/Throttler.h
@@ -2,9 +2,9 @@
 
 #include <mutex>
 #include <memory>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/Stopwatch.h>
+#include <Common/Exception.h>
+#include <IO/WriteHelpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Common/UInt128.h b/dbms/src/Common/UInt128.h
similarity index 97%
rename from dbms/include/DB/Common/UInt128.h
rename to dbms/src/Common/UInt128.h
index 207cb5fdc68..3df43e0a8f5 100644
--- a/dbms/include/DB/Common/UInt128.h
+++ b/dbms/src/Common/UInt128.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Common/HashTable/Hash.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/HashTable/Hash.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/UTF8Helpers.h b/dbms/src/Common/UTF8Helpers.h
similarity index 94%
rename from dbms/include/DB/Common/UTF8Helpers.h
rename to dbms/src/Common/UTF8Helpers.h
index 2199eca4cad..35c197a321e 100644
--- a/dbms/include/DB/Common/UTF8Helpers.h
+++ b/dbms/src/Common/UTF8Helpers.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Types.h>
-#include <DB/Common/BitHelpers.h>
+#include <Core/Types.h>
+#include <Common/BitHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/UnicodeBar.h b/dbms/src/Common/UnicodeBar.h
similarity index 98%
rename from dbms/include/DB/Common/UnicodeBar.h
rename to dbms/src/Common/UnicodeBar.h
index 9410d87f25e..6182784fef7 100644
--- a/dbms/include/DB/Common/UnicodeBar.h
+++ b/dbms/src/Common/UnicodeBar.h
@@ -3,7 +3,7 @@
 #include <cstring>
 #include <cmath>
 #include <string>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 #define UNICODE_BAR_CHAR_SIZE (strlen("█"))
 
diff --git a/dbms/src/Common/VirtualColumnUtils.cpp b/dbms/src/Common/VirtualColumnUtils.cpp
index a5c225c7da5..258067092cf 100644
--- a/dbms/src/Common/VirtualColumnUtils.cpp
+++ b/dbms/src/Common/VirtualColumnUtils.cpp
@@ -1,18 +1,18 @@
 #include <numeric>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
 
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSelectQuery.h>
 
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnsNumber.h>
 
-#include <DB/Common/VirtualColumnUtils.h>
+#include <Common/VirtualColumnUtils.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/VirtualColumnUtils.h b/dbms/src/Common/VirtualColumnUtils.h
similarity index 95%
rename from dbms/include/DB/Common/VirtualColumnUtils.h
rename to dbms/src/Common/VirtualColumnUtils.h
index bcb455df704..eb1cc5106b7 100644
--- a/dbms/include/DB/Common/VirtualColumnUtils.h
+++ b/dbms/src/Common/VirtualColumnUtils.h
@@ -2,9 +2,9 @@
 
 #include <set>
 
-#include <DB/Core/Block.h>
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Parsers/IAST.h>
+#include <Core/Block.h>
+#include <Core/NamesAndTypes.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/Volnitsky.h b/dbms/src/Common/Volnitsky.h
similarity index 99%
rename from dbms/include/DB/Common/Volnitsky.h
rename to dbms/src/Common/Volnitsky.h
index 132cd882a07..f0baf9ec321 100644
--- a/dbms/include/DB/Common/Volnitsky.h
+++ b/dbms/src/Common/Volnitsky.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Common/StringSearcher.h>
-#include <DB/Common/StringUtils.h>
+#include <Common/StringSearcher.h>
+#include <Common/StringUtils.h>
 #include <Poco/UTF8Encoding.h>
 #include <Poco/Unicode.h>
 #include <ext/range.hpp>
diff --git a/dbms/include/DB/Common/config.h.in b/dbms/src/Common/config.h.in
similarity index 100%
rename from dbms/include/DB/Common/config.h.in
rename to dbms/src/Common/config.h.in
diff --git a/dbms/include/DB/Common/config_build.h b/dbms/src/Common/config_build.h
similarity index 100%
rename from dbms/include/DB/Common/config_build.h
rename to dbms/src/Common/config_build.h
diff --git a/dbms/include/DB/Common/config_version.h.in b/dbms/src/Common/config_version.h.in
similarity index 100%
rename from dbms/include/DB/Common/config_version.h.in
rename to dbms/src/Common/config_version.h.in
diff --git a/dbms/src/Common/escapeForFileName.cpp b/dbms/src/Common/escapeForFileName.cpp
index 8892e098264..58a36539c36 100644
--- a/dbms/src/Common/escapeForFileName.cpp
+++ b/dbms/src/Common/escapeForFileName.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Common/escapeForFileName.h>
+#include <IO/ReadHelpers.h>
+#include <Common/StringUtils.h>
+#include <Common/escapeForFileName.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Common/escapeForFileName.h b/dbms/src/Common/escapeForFileName.h
similarity index 100%
rename from dbms/include/DB/Common/escapeForFileName.h
rename to dbms/src/Common/escapeForFileName.h
diff --git a/dbms/src/Common/formatReadable.cpp b/dbms/src/Common/formatReadable.cpp
index edfd4ca4749..f78fd9ce9f5 100644
--- a/dbms/src/Common/formatReadable.cpp
+++ b/dbms/src/Common/formatReadable.cpp
@@ -2,10 +2,10 @@
 #include <sstream>
 #include <iomanip>
 
-#include <DB/Common/formatReadable.h>
-#include <DB/IO/DoubleConverter.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/formatReadable.h>
+#include <IO/DoubleConverter.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
 
 
 static void formatReadable(double size, DB::WriteBuffer & out, int precision, const char ** units, size_t units_size, double delimiter)
diff --git a/dbms/include/DB/Common/formatReadable.h b/dbms/src/Common/formatReadable.h
similarity index 96%
rename from dbms/include/DB/Common/formatReadable.h
rename to dbms/src/Common/formatReadable.h
index 13fb14c996e..51992d4c188 100644
--- a/dbms/include/DB/Common/formatReadable.h
+++ b/dbms/src/Common/formatReadable.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include <DB/IO/WriteBuffer.h>
+#include <IO/WriteBuffer.h>
 
 
 /// Выводит переданный размер в байтах в виде 123.45 GiB.
diff --git a/dbms/src/Common/getFQDNOrHostName.cpp b/dbms/src/Common/getFQDNOrHostName.cpp
index 630ab9bd2f3..08ec015919e 100644
--- a/dbms/src/Common/getFQDNOrHostName.cpp
+++ b/dbms/src/Common/getFQDNOrHostName.cpp
@@ -1,5 +1,5 @@
 #include <Poco/Net/DNS.h>
-#include <DB/Common/getFQDNOrHostName.h>
+#include <Common/getFQDNOrHostName.h>
 
 
 namespace
diff --git a/dbms/include/DB/Common/getFQDNOrHostName.h b/dbms/src/Common/getFQDNOrHostName.h
similarity index 100%
rename from dbms/include/DB/Common/getFQDNOrHostName.h
rename to dbms/src/Common/getFQDNOrHostName.h
diff --git a/dbms/src/Common/getMultipleKeysFromConfig.cpp b/dbms/src/Common/getMultipleKeysFromConfig.cpp
index 89ef2fe0793..1191e667ef1 100644
--- a/dbms/src/Common/getMultipleKeysFromConfig.cpp
+++ b/dbms/src/Common/getMultipleKeysFromConfig.cpp
@@ -1,7 +1,7 @@
-#include <DB/Common/getMultipleKeysFromConfig.h>
+#include <Common/getMultipleKeysFromConfig.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
-#include <DB/Common/StringUtils.h>
+#include <Common/StringUtils.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Common/getMultipleKeysFromConfig.h b/dbms/src/Common/getMultipleKeysFromConfig.h
similarity index 100%
rename from dbms/include/DB/Common/getMultipleKeysFromConfig.h
rename to dbms/src/Common/getMultipleKeysFromConfig.h
diff --git a/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp b/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp
index 3653b175574..75ab9d4f10c 100644
--- a/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp
+++ b/dbms/src/Common/getNumberOfPhysicalCPUCores.cpp
@@ -1,10 +1,10 @@
-#include <DB/Common/getNumberOfPhysicalCPUCores.h>
+#include <Common/getNumberOfPhysicalCPUCores.h>
 #include <thread>
 
 #if defined(__x86_64__)
 
     #include <cpuid/libcpuid.h>
-    #include <DB/Common/Exception.h>
+    #include <Common/Exception.h>
 
     namespace DB { namespace ErrorCodes { extern const int CPUID_ERROR; }}
 
diff --git a/dbms/include/DB/Common/getNumberOfPhysicalCPUCores.h b/dbms/src/Common/getNumberOfPhysicalCPUCores.h
similarity index 100%
rename from dbms/include/DB/Common/getNumberOfPhysicalCPUCores.h
rename to dbms/src/Common/getNumberOfPhysicalCPUCores.h
diff --git a/dbms/src/Common/hex.cpp b/dbms/src/Common/hex.cpp
index fafb5cbf265..34c044993e6 100644
--- a/dbms/src/Common/hex.cpp
+++ b/dbms/src/Common/hex.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/hex.h>
+#include <Common/hex.h>
 
 const char * const char_to_digit_table = (
     "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
diff --git a/dbms/include/DB/Common/hex.h b/dbms/src/Common/hex.h
similarity index 100%
rename from dbms/include/DB/Common/hex.h
rename to dbms/src/Common/hex.h
diff --git a/dbms/include/DB/Common/interpolate.h b/dbms/src/Common/interpolate.h
similarity index 100%
rename from dbms/include/DB/Common/interpolate.h
rename to dbms/src/Common/interpolate.h
diff --git a/dbms/src/Common/isLocalAddress.cpp b/dbms/src/Common/isLocalAddress.cpp
index 6c245c06027..a1b24f2e0ce 100644
--- a/dbms/src/Common/isLocalAddress.cpp
+++ b/dbms/src/Common/isLocalAddress.cpp
@@ -1,9 +1,9 @@
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 #include <Poco/Util/Application.h>
 #include <Poco/Net/NetworkInterface.h>
 #include <Poco/Net/SocketAddress.h>
 
-#include <DB/Common/isLocalAddress.h>
+#include <Common/isLocalAddress.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/isLocalAddress.h b/dbms/src/Common/isLocalAddress.h
similarity index 100%
rename from dbms/include/DB/Common/isLocalAddress.h
rename to dbms/src/Common/isLocalAddress.h
diff --git a/dbms/src/Common/localBackup.cpp b/dbms/src/Common/localBackup.cpp
index 06ca5fbaafc..da9cf9988c2 100644
--- a/dbms/src/Common/localBackup.cpp
+++ b/dbms/src/Common/localBackup.cpp
@@ -7,7 +7,7 @@
 #include <Poco/DirectoryIterator.h>
 #include <Poco/File.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Common/localBackup.h b/dbms/src/Common/localBackup.h
similarity index 100%
rename from dbms/include/DB/Common/localBackup.h
rename to dbms/src/Common/localBackup.h
diff --git a/dbms/include/DB/Common/memcpySmall.h b/dbms/src/Common/memcpySmall.h
similarity index 98%
rename from dbms/include/DB/Common/memcpySmall.h
rename to dbms/src/Common/memcpySmall.h
index fde36ebd90c..1ed21fa82a5 100644
--- a/dbms/include/DB/Common/memcpySmall.h
+++ b/dbms/src/Common/memcpySmall.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string.h>
-#include <DB/Core/Defines.h>
+#include <Core/Defines.h>
 
 #if __SSE2__
 #include <emmintrin.h>
diff --git a/dbms/src/Common/randomSeed.cpp b/dbms/src/Common/randomSeed.cpp
index 17ea27ef6d5..39ca7837ced 100644
--- a/dbms/src/Common/randomSeed.cpp
+++ b/dbms/src/Common/randomSeed.cpp
@@ -2,9 +2,9 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/randomSeed.h>
-#include <DB/Core/Types.h>
+#include <Common/Exception.h>
+#include <Common/randomSeed.h>
+#include <Core/Types.h>
 
 #ifdef __APPLE__
 #include <common/apple_rt.h>
diff --git a/dbms/include/DB/Common/randomSeed.h b/dbms/src/Common/randomSeed.h
similarity index 84%
rename from dbms/include/DB/Common/randomSeed.h
rename to dbms/src/Common/randomSeed.h
index bc9eb367f5f..e2b8310f79c 100644
--- a/dbms/include/DB/Common/randomSeed.h
+++ b/dbms/src/Common/randomSeed.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstdint>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 /** Returns a number suitable as seed for PRNG. Use clock_gettime, pid and so on. */
 DB::UInt64 randomSeed();
diff --git a/dbms/src/Common/setThreadName.cpp b/dbms/src/Common/setThreadName.cpp
index 01225e08c40..1a33c330027 100644
--- a/dbms/src/Common/setThreadName.cpp
+++ b/dbms/src/Common/setThreadName.cpp
@@ -7,8 +7,8 @@
 #include <sys/prctl.h>
 #endif
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/setThreadName.h>
+#include <Common/Exception.h>
+#include <Common/setThreadName.h>
 
 
 void setThreadName(const char * name)
diff --git a/dbms/include/DB/Common/setThreadName.h b/dbms/src/Common/setThreadName.h
similarity index 100%
rename from dbms/include/DB/Common/setThreadName.h
rename to dbms/src/Common/setThreadName.h
diff --git a/dbms/src/Common/tests/arena_with_free_lists.cpp b/dbms/src/Common/tests/arena_with_free_lists.cpp
index e82ace7bae6..5341be486f7 100644
--- a/dbms/src/Common/tests/arena_with_free_lists.cpp
+++ b/dbms/src/Common/tests/arena_with_free_lists.cpp
@@ -5,7 +5,7 @@
 #define USE_BAD_ARENA 0
 
 #if !USE_BAD_ARENA
-    #include <DB/Common/ArenaWithFreeLists.h>
+    #include <Common/ArenaWithFreeLists.h>
 #endif
 
 #include <memory>
@@ -13,14 +13,14 @@
 #include <sys/resource.h>
 #include <ext/bit_cast.hpp>
 #include <ext/size.hpp>
-#include <DB/Common/Arena.h>
+#include <Common/Arena.h>
 
-#include <DB/Core/StringRef.h>
-#include <DB/Core/Field.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Core/StringRef.h>
+#include <Core/Field.h>
+#include <Common/Stopwatch.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/ReadHelpers.h>
 
 using namespace DB;
 
diff --git a/dbms/src/Common/tests/auto_array.cpp b/dbms/src/Common/tests/auto_array.cpp
index f9ab45e86aa..55a2be909df 100644
--- a/dbms/src/Common/tests/auto_array.cpp
+++ b/dbms/src/Common/tests/auto_array.cpp
@@ -2,12 +2,12 @@
 #include <iomanip>
 #include <map>
 
-#include <DB/Core/Field.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Common/AutoArray.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Core/Field.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/AutoArray.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Common/tests/compact_array.cpp b/dbms/src/Common/tests/compact_array.cpp
index f728c5e284b..d7c09850ec3 100644
--- a/dbms/src/Common/tests/compact_array.cpp
+++ b/dbms/src/Common/tests/compact_array.cpp
@@ -4,9 +4,9 @@
 #pragma GCC diagnostic ignored "-Warray-bounds"
 #endif
 
-#include <DB/Common/CompactArray.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/ReadBufferFromFile.h>
+#include <Common/CompactArray.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadBufferFromFile.h>
 
 #include <boost/filesystem.hpp>
 
diff --git a/dbms/src/Common/tests/hash_table.cpp b/dbms/src/Common/tests/hash_table.cpp
index fa1bd693c22..4656f1f45e0 100644
--- a/dbms/src/Common/tests/hash_table.cpp
+++ b/dbms/src/Common/tests/hash_table.cpp
@@ -1,10 +1,10 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Interpreters/AggregationCommon.h>
 
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Common/HashTable/HashSet.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashSet.h>
 
 
 
diff --git a/dbms/src/Common/tests/hashes_test.cpp b/dbms/src/Common/tests/hashes_test.cpp
index f0b194c0c69..5e3ec3aa3fd 100644
--- a/dbms/src/Common/tests/hashes_test.cpp
+++ b/dbms/src/Common/tests/hashes_test.cpp
@@ -4,11 +4,11 @@
 #include <city.h>
 #include <openssl/md5.h>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
-#include <DB/Common/SipHash.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Common/SipHash.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Common/tests/int_hashes_perf.cpp b/dbms/src/Common/tests/int_hashes_perf.cpp
index 860110f161e..df3f8a60a94 100644
--- a/dbms/src/Common/tests/int_hashes_perf.cpp
+++ b/dbms/src/Common/tests/int_hashes_perf.cpp
@@ -6,8 +6,8 @@
 #include <iomanip>
 
 #include <Poco/Exception.h>
-#include <DB/Common/HashTable/Hash.h>
-#include <DB/Common/Stopwatch.h>
+#include <Common/HashTable/Hash.h>
+#include <Common/Stopwatch.h>
 
 #include "AvalancheTest.h"  /// Taken from SMHasher.
 
diff --git a/dbms/src/Common/tests/lru_cache.cpp b/dbms/src/Common/tests/lru_cache.cpp
index b1588c74f61..a3d58c4fa6b 100644
--- a/dbms/src/Common/tests/lru_cache.cpp
+++ b/dbms/src/Common/tests/lru_cache.cpp
@@ -1,5 +1,5 @@
-#include <DB/Common/LRUCache.h>
-#include <DB/Common/Exception.h>
+#include <Common/LRUCache.h>
+#include <Common/Exception.h>
 
 #include <iostream>
 #include <string>
diff --git a/dbms/src/Common/tests/parallel_aggregation.cpp b/dbms/src/Common/tests/parallel_aggregation.cpp
index e742211c6e6..47f48e0a5b0 100644
--- a/dbms/src/Common/tests/parallel_aggregation.cpp
+++ b/dbms/src/Common/tests/parallel_aggregation.cpp
@@ -5,18 +5,18 @@
 
 //#define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Interpreters/AggregationCommon.h>
 
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Common/HashTable/TwoLevelHashMap.h>
-//#include <DB/Common/HashTable/HashTableWithSmallLocks.h>
-//#include <DB/Common/HashTable/HashTableMerge.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/TwoLevelHashMap.h>
+//#include <Common/HashTable/HashTableWithSmallLocks.h>
+//#include <Common/HashTable/HashTableMerge.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
 
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
 
 
 using Key = UInt64;
diff --git a/dbms/src/Common/tests/parallel_aggregation2.cpp b/dbms/src/Common/tests/parallel_aggregation2.cpp
index e1a7ea14362..b7e0c47795a 100644
--- a/dbms/src/Common/tests/parallel_aggregation2.cpp
+++ b/dbms/src/Common/tests/parallel_aggregation2.cpp
@@ -5,18 +5,18 @@
 
 //#define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Interpreters/AggregationCommon.h>
 
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Common/HashTable/TwoLevelHashMap.h>
-//#include <DB/Common/HashTable/HashTableWithSmallLocks.h>
-//#include <DB/Common/HashTable/HashTableMerge.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/TwoLevelHashMap.h>
+//#include <Common/HashTable/HashTableWithSmallLocks.h>
+//#include <Common/HashTable/HashTableMerge.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
 
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
 
 
 using Key = UInt64;
diff --git a/dbms/src/Common/tests/pod_array.cpp b/dbms/src/Common/tests/pod_array.cpp
index 844206a2e37..fe586bafe63 100644
--- a/dbms/src/Common/tests/pod_array.cpp
+++ b/dbms/src/Common/tests/pod_array.cpp
@@ -1,5 +1,5 @@
-#include <DB/Common/PODArray.h>
-#include <DB/Core/Types.h>
+#include <Common/PODArray.h>
+#include <Core/Types.h>
 #include <iostream>
 
 #define ASSERT_CHECK(cond, res)                        \
diff --git a/dbms/src/Common/tests/radix_sort.cpp b/dbms/src/Common/tests/radix_sort.cpp
index 186e2ff29e0..20005474104 100644
--- a/dbms/src/Common/tests/radix_sort.cpp
+++ b/dbms/src/Common/tests/radix_sort.cpp
@@ -2,10 +2,10 @@
 #include <malloc.h>
 #endif
 #include <ext/bit_cast.hpp>
-#include <DB/Common/RadixSort.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Core/Defines.h>
+#include <Common/RadixSort.h>
+#include <Common/Stopwatch.h>
+#include <IO/ReadHelpers.h>
+#include <Core/Defines.h>
 
 using Key = double;
 
diff --git a/dbms/src/Common/tests/shell_command_test.cpp b/dbms/src/Common/tests/shell_command_test.cpp
index fe52b6c1198..564567373c8 100644
--- a/dbms/src/Common/tests/shell_command_test.cpp
+++ b/dbms/src/Common/tests/shell_command_test.cpp
@@ -1,9 +1,9 @@
 #include <iostream>
-#include <DB/Core/Types.h>
-#include <DB/Common/ShellCommand.h>
-#include <DB/IO/copyData.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromString.h>
+#include <Core/Types.h>
+#include <Common/ShellCommand.h>
+#include <IO/copyData.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromString.h>
 
 
 using namespace DB;
diff --git a/dbms/src/Common/tests/simple_cache.cpp b/dbms/src/Common/tests/simple_cache.cpp
index d7dd1437147..2d37110c8da 100644
--- a/dbms/src/Common/tests/simple_cache.cpp
+++ b/dbms/src/Common/tests/simple_cache.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <DB/Common/SimpleCache.h>
+#include <Common/SimpleCache.h>
 
 
 int func(int x, int y)
diff --git a/dbms/src/Common/tests/sip_hash.cpp b/dbms/src/Common/tests/sip_hash.cpp
index 5fe1365bd7b..546553b8979 100644
--- a/dbms/src/Common/tests/sip_hash.cpp
+++ b/dbms/src/Common/tests/sip_hash.cpp
@@ -4,7 +4,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/Common/SipHash.h>
+#include <Common/SipHash.h>
 
 /// Adapted version https://www.131002.net/siphash/siphash24.c
 
diff --git a/dbms/src/Common/tests/sip_hash_perf.cpp b/dbms/src/Common/tests/sip_hash_perf.cpp
index bf495d2d42d..6e77ee6a776 100644
--- a/dbms/src/Common/tests/sip_hash_perf.cpp
+++ b/dbms/src/Common/tests/sip_hash_perf.cpp
@@ -2,10 +2,10 @@
 #include <string>
 #include <iomanip>
 
-#include <DB/Common/SipHash.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Stopwatch.h>
+#include <Common/SipHash.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Stopwatch.h>
 
 
 /** Test this way:
diff --git a/dbms/src/Common/tests/small_table.cpp b/dbms/src/Common/tests/small_table.cpp
index 8781acb27f0..b542f8d60f2 100644
--- a/dbms/src/Common/tests/small_table.cpp
+++ b/dbms/src/Common/tests/small_table.cpp
@@ -1,9 +1,9 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Interpreters/AggregationCommon.h>
 
-#include <DB/Common/HashTable/SmallTable.h>
+#include <Common/HashTable/SmallTable.h>
 
 
 
diff --git a/dbms/src/Common/tests/thread_creation_latency.cpp b/dbms/src/Common/tests/thread_creation_latency.cpp
index d8cd39cf4d5..e4fa0c2f67b 100644
--- a/dbms/src/Common/tests/thread_creation_latency.cpp
+++ b/dbms/src/Common/tests/thread_creation_latency.cpp
@@ -1,13 +1,13 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/ReadHelpers.h>
+#include <IO/ReadHelpers.h>
 
-//#include <DB/Common/ThreadPool.h>
+//#include <Common/ThreadPool.h>
 
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
+#include <Common/Exception.h>
+#include <Common/ThreadPool.h>
 
 
 int x = 0;
diff --git a/dbms/src/Common/tests/thread_pool.cpp b/dbms/src/Common/tests/thread_pool.cpp
index a7b9241356f..c5a63c3c2f3 100644
--- a/dbms/src/Common/tests/thread_pool.cpp
+++ b/dbms/src/Common/tests/thread_pool.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/ThreadPool.h>
+#include <Common/ThreadPool.h>
 
 /** Reproduces bug in ThreadPool.
   * It get stuck if we call 'wait' many times from many other threads simultaneously.
diff --git a/dbms/include/DB/Common/typeid_cast.h b/dbms/src/Common/typeid_cast.h
similarity index 100%
rename from dbms/include/DB/Common/typeid_cast.h
rename to dbms/src/Common/typeid_cast.h
diff --git a/dbms/include/DB/Common/unaligned.h b/dbms/src/Common/unaligned.h
similarity index 91%
rename from dbms/include/DB/Common/unaligned.h
rename to dbms/src/Common/unaligned.h
index 78f6b6de6be..9eba86d36a3 100644
--- a/dbms/include/DB/Common/unaligned.h
+++ b/dbms/src/Common/unaligned.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Defines.h>
+#include <Core/Defines.h>
 #include <string.h>
 
 
diff --git a/dbms/src/Core/Block.cpp b/dbms/src/Core/Block.cpp
index 16338e6adb1..0a982249f87 100644
--- a/dbms/src/Core/Block.cpp
+++ b/dbms/src/Core/Block.cpp
@@ -1,15 +1,15 @@
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/Core/Block.h>
+#include <Core/Block.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/Operators.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnTuple.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
 
 #include <iterator>
 #include <memory>
diff --git a/dbms/include/DB/Core/Block.h b/dbms/src/Core/Block.h
similarity index 95%
rename from dbms/include/DB/Core/Block.h
rename to dbms/src/Core/Block.h
index 4ef2b53ef8e..f30be28f2f1 100644
--- a/dbms/include/DB/Core/Block.h
+++ b/dbms/src/Core/Block.h
@@ -4,13 +4,13 @@
 #include <map>
 #include <initializer_list>
 
-#include <DB/Common/Exception.h>
-#include <DB/Core/BlockInfo.h>
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Core/ColumnWithTypeAndName.h>
-#include <DB/Core/ColumnsWithTypeAndName.h>
-#include <DB/Core/ColumnNumbers.h>
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
+#include <Core/BlockInfo.h>
+#include <Core/NamesAndTypes.h>
+#include <Core/ColumnWithTypeAndName.h>
+#include <Core/ColumnsWithTypeAndName.h>
+#include <Core/ColumnNumbers.h>
+#include <Common/Exception.h>
 
 
 
diff --git a/dbms/src/Core/BlockInfo.cpp b/dbms/src/Core/BlockInfo.cpp
index 2e956645c82..9169288c7c1 100644
--- a/dbms/src/Core/BlockInfo.cpp
+++ b/dbms/src/Core/BlockInfo.cpp
@@ -1,11 +1,11 @@
-#include <DB/Core/Types.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/VarInt.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Core/BlockInfo.h>
+#include <Core/Types.h>
+#include <Common/Exception.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/VarInt.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Core/BlockInfo.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/BlockInfo.h b/dbms/src/Core/BlockInfo.h
similarity index 98%
rename from dbms/include/DB/Core/BlockInfo.h
rename to dbms/src/Core/BlockInfo.h
index 6b51fb4217d..f978f5c0a52 100644
--- a/dbms/include/DB/Core/BlockInfo.h
+++ b/dbms/src/Core/BlockInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/ColumnNumbers.h b/dbms/src/Core/ColumnNumbers.h
similarity index 100%
rename from dbms/include/DB/Core/ColumnNumbers.h
rename to dbms/src/Core/ColumnNumbers.h
diff --git a/dbms/src/Core/ColumnWithTypeAndName.cpp b/dbms/src/Core/ColumnWithTypeAndName.cpp
index 91508e15f49..9e0f31e43c3 100644
--- a/dbms/src/Core/ColumnWithTypeAndName.cpp
+++ b/dbms/src/Core/ColumnWithTypeAndName.cpp
@@ -1,6 +1,6 @@
-#include <DB/Core/ColumnsWithTypeAndName.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Core/ColumnsWithTypeAndName.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/ColumnWithTypeAndName.h b/dbms/src/Core/ColumnWithTypeAndName.h
similarity index 91%
rename from dbms/include/DB/Core/ColumnWithTypeAndName.h
rename to dbms/src/Core/ColumnWithTypeAndName.h
index 5d6b23f6edc..88c6fffadb6 100644
--- a/dbms/include/DB/Core/ColumnWithTypeAndName.h
+++ b/dbms/src/Core/ColumnWithTypeAndName.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Columns/IColumn.h>
-#include <DB/DataTypes/IDataType.h>
+#include <Columns/IColumn.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/ColumnsWithTypeAndName.h b/dbms/src/Core/ColumnsWithTypeAndName.h
similarity index 73%
rename from dbms/include/DB/Core/ColumnsWithTypeAndName.h
rename to dbms/src/Core/ColumnsWithTypeAndName.h
index fee1039c03a..a3ecdff08f6 100644
--- a/dbms/include/DB/Core/ColumnsWithTypeAndName.h
+++ b/dbms/src/Core/ColumnsWithTypeAndName.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <DB/Core/ColumnWithTypeAndName.h>
+#include <Core/ColumnWithTypeAndName.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/Defines.h b/dbms/src/Core/Defines.h
similarity index 100%
rename from dbms/include/DB/Core/Defines.h
rename to dbms/src/Core/Defines.h
diff --git a/dbms/src/Core/Field.cpp b/dbms/src/Core/Field.cpp
index 4f89a004454..9beaf0dfd29 100644
--- a/dbms/src/Core/Field.cpp
+++ b/dbms/src/Core/Field.cpp
@@ -1,12 +1,12 @@
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBufferFromString.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
 
-#include <DB/Core/Field.h>
-#include <DB/Core/FieldVisitors.h>
+#include <Core/Field.h>
+#include <Core/FieldVisitors.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/Field.h b/dbms/src/Core/Field.h
similarity index 99%
rename from dbms/include/DB/Core/Field.h
rename to dbms/src/Core/Field.h
index 3346ac45458..7c88cd2f07d 100644
--- a/dbms/include/DB/Core/Field.h
+++ b/dbms/src/Core/Field.h
@@ -5,8 +5,8 @@
 #include <type_traits>
 #include <functional>
 
-#include <DB/Common/Exception.h>
-#include <DB/Core/Types.h>
+#include <Common/Exception.h>
+#include <Core/Types.h>
 #include <common/strong_typedef.h>
 
 
diff --git a/dbms/src/Core/FieldVisitors.cpp b/dbms/src/Core/FieldVisitors.cpp
index 2468a11dee2..6abaf6e3139 100644
--- a/dbms/src/Core/FieldVisitors.cpp
+++ b/dbms/src/Core/FieldVisitors.cpp
@@ -1,11 +1,11 @@
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Common/SipHash.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
+#include <Core/FieldVisitors.h>
+#include <Common/SipHash.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/FieldVisitors.h b/dbms/src/Core/FieldVisitors.h
similarity index 99%
rename from dbms/include/DB/Core/FieldVisitors.h
rename to dbms/src/Core/FieldVisitors.h
index c783dedab3c..92a7ace374d 100644
--- a/dbms/include/DB/Core/FieldVisitors.h
+++ b/dbms/src/Core/FieldVisitors.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Field.h>
+#include <Core/Field.h>
 #include <common/DateLUT.h>
 
 
diff --git a/dbms/include/DB/Core/Names.h b/dbms/src/Core/Names.h
similarity index 100%
rename from dbms/include/DB/Core/Names.h
rename to dbms/src/Core/Names.h
diff --git a/dbms/src/Core/NamesAndTypes.cpp b/dbms/src/Core/NamesAndTypes.cpp
index 37e74b50af3..463b20ac56d 100644
--- a/dbms/src/Core/NamesAndTypes.cpp
+++ b/dbms/src/Core/NamesAndTypes.cpp
@@ -1,10 +1,10 @@
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/DataTypes/DataTypeFactory.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBufferFromString.h>
+#include <Core/NamesAndTypes.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromString.h>
 #include <sparsehash/dense_hash_map>
 
 
diff --git a/dbms/include/DB/Core/NamesAndTypes.h b/dbms/src/Core/NamesAndTypes.h
similarity index 97%
rename from dbms/include/DB/Core/NamesAndTypes.h
rename to dbms/src/Core/NamesAndTypes.h
index 8da9e1cc7fc..5da8a5a06a4 100644
--- a/dbms/include/DB/Core/NamesAndTypes.h
+++ b/dbms/src/Core/NamesAndTypes.h
@@ -5,8 +5,8 @@
 #include <string>
 #include <set>
 
-#include <DB/DataTypes/IDataType.h>
-#include <DB/Core/Names.h>
+#include <DataTypes/IDataType.h>
+#include <Core/Names.h>
 
 
 namespace DB
diff --git a/dbms/src/Core/Progress.cpp b/dbms/src/Core/Progress.cpp
index a8ace79eced..c96038ba290 100644
--- a/dbms/src/Core/Progress.cpp
+++ b/dbms/src/Core/Progress.cpp
@@ -1,9 +1,9 @@
-#include <DB/Core/Progress.h>
+#include <Core/Progress.h>
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/Progress.h b/dbms/src/Core/Progress.h
similarity index 98%
rename from dbms/include/DB/Core/Progress.h
rename to dbms/src/Core/Progress.h
index 4281a5057d4..c708c5feec8 100644
--- a/dbms/include/DB/Core/Progress.h
+++ b/dbms/src/Core/Progress.h
@@ -3,7 +3,7 @@
 #include <atomic>
 #include <common/Common.h>
 
-#include <DB/Core/Defines.h>
+#include <Core/Defines.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/Protocol.h b/dbms/src/Core/Protocol.h
similarity index 99%
rename from dbms/include/DB/Core/Protocol.h
rename to dbms/src/Core/Protocol.h
index 686089a48f4..70ce98a5e75 100644
--- a/dbms/include/DB/Core/Protocol.h
+++ b/dbms/src/Core/Protocol.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/QueryProcessingStage.h b/dbms/src/Core/QueryProcessingStage.h
similarity index 97%
rename from dbms/include/DB/Core/QueryProcessingStage.h
rename to dbms/src/Core/QueryProcessingStage.h
index b3e1e2ed882..58d6ea3ead3 100644
--- a/dbms/include/DB/Core/QueryProcessingStage.h
+++ b/dbms/src/Core/QueryProcessingStage.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/Row.h b/dbms/src/Core/Row.h
similarity index 85%
rename from dbms/include/DB/Core/Row.h
rename to dbms/src/Core/Row.h
index 00ccac2379f..b163f40a0e8 100644
--- a/dbms/include/DB/Core/Row.h
+++ b/dbms/src/Core/Row.h
@@ -2,8 +2,8 @@
 
 #include <vector>
 
-#include <DB/Common/AutoArray.h>
-#include <DB/Core/Field.h>
+#include <Common/AutoArray.h>
+#include <Core/Field.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/SortCursor.h b/dbms/src/Core/SortCursor.h
similarity index 97%
rename from dbms/include/DB/Core/SortCursor.h
rename to dbms/src/Core/SortCursor.h
index bd358d637c2..3d7b5610e3a 100644
--- a/dbms/include/DB/Core/SortCursor.h
+++ b/dbms/src/Core/SortCursor.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Core/SortDescription.h>
-#include <DB/Core/Block.h>
-#include <DB/Columns/IColumn.h>
-#include <DB/Columns/ColumnString.h>
+#include <Core/SortDescription.h>
+#include <Core/Block.h>
+#include <Columns/IColumn.h>
+#include <Columns/ColumnString.h>
 
 
 namespace DB
diff --git a/dbms/src/Core/SortDescription.cpp b/dbms/src/Core/SortDescription.cpp
index 1ff97cddfc4..f8e69cbd96c 100644
--- a/dbms/src/Core/SortDescription.cpp
+++ b/dbms/src/Core/SortDescription.cpp
@@ -1,8 +1,8 @@
 #include <sstream>
-#include <DB/Core/SortDescription.h>
-#include <DB/Common/Collator.h>
-#include <DB/IO/Operators.h>
-#include <DB/IO/WriteBufferFromString.h>
+#include <Core/SortDescription.h>
+#include <Common/Collator.h>
+#include <IO/Operators.h>
+#include <IO/WriteBufferFromString.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Core/SortDescription.h b/dbms/src/Core/SortDescription.h
similarity index 100%
rename from dbms/include/DB/Core/SortDescription.h
rename to dbms/src/Core/SortDescription.h
diff --git a/dbms/include/DB/Core/StringRef.h b/dbms/src/Core/StringRef.h
similarity index 99%
rename from dbms/include/DB/Core/StringRef.h
rename to dbms/src/Core/StringRef.h
index 68bc6ad3af9..5a397b401ee 100644
--- a/dbms/include/DB/Core/StringRef.h
+++ b/dbms/src/Core/StringRef.h
@@ -11,8 +11,8 @@
 
 #include <city.h>
 
-#include <DB/Core/Types.h>
-#include <DB/Common/unaligned.h>
+#include <Core/Types.h>
+#include <Common/unaligned.h>
 
 
 /// Штука, чтобы не создавать строки для поиска подстроки в хэш таблице.
diff --git a/dbms/include/DB/Core/Types.h b/dbms/src/Core/Types.h
similarity index 100%
rename from dbms/include/DB/Core/Types.h
rename to dbms/src/Core/Types.h
diff --git a/dbms/src/Core/tests/exception.cpp b/dbms/src/Core/tests/exception.cpp
index 36ebe62a48e..21a2c8d4444 100644
--- a/dbms/src/Core/tests/exception.cpp
+++ b/dbms/src/Core/tests/exception.cpp
@@ -2,7 +2,7 @@
 
 #include <Poco/Net/NetException.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Core/tests/field.cpp b/dbms/src/Core/tests/field.cpp
index a616a043e73..a62c64a3577 100644
--- a/dbms/src/Core/tests/field.cpp
+++ b/dbms/src/Core/tests/field.cpp
@@ -2,14 +2,14 @@
 #include <iomanip>
 #include <sstream>
 
-#include <DB/Core/Field.h>
-#include <DB/Core/FieldVisitors.h>
+#include <Core/Field.h>
+#include <Core/FieldVisitors.h>
 
-#include <DB/Common/Stopwatch.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <Common/Stopwatch.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <DataTypes/DataTypeString.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Core/tests/move_field.cpp b/dbms/src/Core/tests/move_field.cpp
index 54f85a0b63e..a57915e6c66 100644
--- a/dbms/src/Core/tests/move_field.cpp
+++ b/dbms/src/Core/tests/move_field.cpp
@@ -1,5 +1,5 @@
 #include <iostream>
-#include <DB/Core/Field.h>
+#include <Core/Field.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Core/tests/string_pool.cpp b/dbms/src/Core/tests/string_pool.cpp
index 9869c484dad..fa87dfd392a 100644
--- a/dbms/src/Core/tests/string_pool.cpp
+++ b/dbms/src/Core/tests/string_pool.cpp
@@ -4,16 +4,16 @@
 #include <unordered_map>
 #include <sparsehash/dense_hash_map>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
-#include <DB/Core/StringRef.h>
-#include <DB/Common/Arena.h>
+#include <Core/StringRef.h>
+#include <Common/Arena.h>
 
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
 
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
-#include <DB/Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashMap.h>
 
 int main(int argc, char ** argv)
 {
diff --git a/dbms/src/Core/tests/string_ref_hash.cpp b/dbms/src/Core/tests/string_ref_hash.cpp
index 8100caa5990..fc6f348ced2 100644
--- a/dbms/src/Core/tests/string_ref_hash.cpp
+++ b/dbms/src/Core/tests/string_ref_hash.cpp
@@ -1,8 +1,8 @@
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/Operators.h>
-#include <DB/Core/StringRef.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+#include <Core/StringRef.h>
 
 
 /** Calculates StringRefHash from stdin. For debugging.
diff --git a/dbms/include/DB/Core/toField.h b/dbms/src/Core/toField.h
similarity index 96%
rename from dbms/include/DB/Core/toField.h
rename to dbms/src/Core/toField.h
index 591ee5b8eca..76e8f859b4b 100644
--- a/dbms/include/DB/Core/toField.h
+++ b/dbms/src/Core/toField.h
@@ -3,7 +3,7 @@
 #include <common/Common.h>        /// VisitID_t
 #include <common/LocalDate.h>
 #include <common/LocalDateTime.h>
-#include <DB/Core/Field.h>
+#include <Core/Field.h>
 #include <mysqlxx/Null.h>
 
 
diff --git a/dbms/include/DB/DataStreams/AddingConstColumnBlockInputStream.h b/dbms/src/DataStreams/AddingConstColumnBlockInputStream.h
similarity index 90%
rename from dbms/include/DB/DataStreams/AddingConstColumnBlockInputStream.h
rename to dbms/src/DataStreams/AddingConstColumnBlockInputStream.h
index 0f5d1e2c616..7a430537f57 100644
--- a/dbms/include/DB/DataStreams/AddingConstColumnBlockInputStream.h
+++ b/dbms/src/DataStreams/AddingConstColumnBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Core/ColumnWithTypeAndName.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Columns/ColumnConst.h>
+#include <Core/ColumnWithTypeAndName.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/AddingDefaultBlockInputStream.h b/dbms/src/DataStreams/AddingDefaultBlockInputStream.h
similarity index 89%
rename from dbms/include/DB/DataStreams/AddingDefaultBlockInputStream.h
rename to dbms/src/DataStreams/AddingDefaultBlockInputStream.h
index d2ed6705608..10d3e5affab 100644
--- a/dbms/include/DB/DataStreams/AddingDefaultBlockInputStream.h
+++ b/dbms/src/DataStreams/AddingDefaultBlockInputStream.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Interpreters/evaluateMissingDefaults.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/ColumnDefault.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Interpreters/evaluateMissingDefaults.h>
+#include <Columns/ColumnConst.h>
+#include <Interpreters/Context.h>
+#include <Storages/ColumnDefault.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/AddingDefaultBlockOutputStream.cpp b/dbms/src/DataStreams/AddingDefaultBlockOutputStream.cpp
index 57a2058026a..7f370969203 100644
--- a/dbms/src/DataStreams/AddingDefaultBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/AddingDefaultBlockOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/DataStreams/AddingDefaultBlockOutputStream.h>
+#include <DataStreams/AddingDefaultBlockOutputStream.h>
 
-#include <DB/Core/Block.h>
+#include <Core/Block.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/AddingDefaultBlockOutputStream.h b/dbms/src/DataStreams/AddingDefaultBlockOutputStream.h
similarity index 84%
rename from dbms/include/DB/DataStreams/AddingDefaultBlockOutputStream.h
rename to dbms/src/DataStreams/AddingDefaultBlockOutputStream.h
index 7aa3588a550..fda6cd35c32 100644
--- a/dbms/include/DB/DataStreams/AddingDefaultBlockOutputStream.h
+++ b/dbms/src/DataStreams/AddingDefaultBlockOutputStream.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Storages/ColumnDefault.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/evaluateMissingDefaults.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <Columns/ColumnConst.h>
+#include <Storages/ColumnDefault.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/evaluateMissingDefaults.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/AggregatingBlockInputStream.cpp b/dbms/src/DataStreams/AggregatingBlockInputStream.cpp
index 34fb8b6e0f8..a6f6e4d6b25 100644
--- a/dbms/src/DataStreams/AggregatingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/AggregatingBlockInputStream.cpp
@@ -1,9 +1,9 @@
-#include <DB/Common/ClickHouseRevision.h>
+#include <Common/ClickHouseRevision.h>
 
-#include <DB/DataStreams/BlocksListBlockInputStream.h>
-#include <DB/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h>
-#include <DB/DataStreams/AggregatingBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/BlocksListBlockInputStream.h>
+#include <DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h>
+#include <DataStreams/AggregatingBlockInputStream.h>
+#include <DataStreams/NativeBlockInputStream.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/DataStreams/AggregatingBlockInputStream.h b/dbms/src/DataStreams/AggregatingBlockInputStream.h
similarity index 93%
rename from dbms/include/DB/DataStreams/AggregatingBlockInputStream.h
rename to dbms/src/DataStreams/AggregatingBlockInputStream.h
index 1b85a8299cc..195aa7d2282 100644
--- a/dbms/include/DB/DataStreams/AggregatingBlockInputStream.h
+++ b/dbms/src/DataStreams/AggregatingBlockInputStream.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Interpreters/Aggregator.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <Interpreters/Aggregator.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/AggregatingSortedBlockInputStream.cpp b/dbms/src/DataStreams/AggregatingSortedBlockInputStream.cpp
index 5aba7617130..f3d90697f52 100644
--- a/dbms/src/DataStreams/AggregatingSortedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/AggregatingSortedBlockInputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/DataStreams/AggregatingSortedBlockInputStream.h>
-#include <DB/Common/StringUtils.h>
+#include <DataStreams/AggregatingSortedBlockInputStream.h>
+#include <Common/StringUtils.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/AggregatingSortedBlockInputStream.h b/dbms/src/DataStreams/AggregatingSortedBlockInputStream.h
similarity index 93%
rename from dbms/include/DB/DataStreams/AggregatingSortedBlockInputStream.h
rename to dbms/src/DataStreams/AggregatingSortedBlockInputStream.h
index 33279cbb95e..8622f8ddbcd 100644
--- a/dbms/include/DB/DataStreams/AggregatingSortedBlockInputStream.h
+++ b/dbms/src/DataStreams/AggregatingSortedBlockInputStream.h
@@ -2,11 +2,11 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Core/Row.h>
-#include <DB/Core/ColumnNumbers.h>
-#include <DB/DataStreams/MergingSortedBlockInputStream.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
+#include <Core/Row.h>
+#include <Core/ColumnNumbers.h>
+#include <DataStreams/MergingSortedBlockInputStream.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/AsynchronousBlockInputStream.h b/dbms/src/DataStreams/AsynchronousBlockInputStream.h
similarity index 96%
rename from dbms/include/DB/DataStreams/AsynchronousBlockInputStream.h
rename to dbms/src/DataStreams/AsynchronousBlockInputStream.h
index 78ce63855e2..9e24a5801b0 100644
--- a/dbms/include/DB/DataStreams/AsynchronousBlockInputStream.h
+++ b/dbms/src/DataStreams/AsynchronousBlockInputStream.h
@@ -2,10 +2,10 @@
 
 #include <Poco/Event.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Common/ThreadPool.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Common/setThreadName.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/ThreadPool.h>
 
 
 namespace CurrentMetrics
diff --git a/dbms/src/DataStreams/BinaryRowInputStream.cpp b/dbms/src/DataStreams/BinaryRowInputStream.cpp
index 3b2081b01a8..3f903118a12 100644
--- a/dbms/src/DataStreams/BinaryRowInputStream.cpp
+++ b/dbms/src/DataStreams/BinaryRowInputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/Core/Block.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/DataStreams/BinaryRowInputStream.h>
+#include <Core/Block.h>
+#include <IO/ReadBuffer.h>
+#include <DataStreams/BinaryRowInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/BinaryRowInputStream.h b/dbms/src/DataStreams/BinaryRowInputStream.h
similarity index 89%
rename from dbms/include/DB/DataStreams/BinaryRowInputStream.h
rename to dbms/src/DataStreams/BinaryRowInputStream.h
index 0dfeedfbb87..86b7d9fa1c9 100644
--- a/dbms/include/DB/DataStreams/BinaryRowInputStream.h
+++ b/dbms/src/DataStreams/BinaryRowInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IRowInputStream.h>
+#include <DataStreams/IRowInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/BinaryRowOutputStream.cpp b/dbms/src/DataStreams/BinaryRowOutputStream.cpp
index dfb66416571..0277a22061c 100644
--- a/dbms/src/DataStreams/BinaryRowOutputStream.cpp
+++ b/dbms/src/DataStreams/BinaryRowOutputStream.cpp
@@ -1,7 +1,7 @@
-#include <DB/IO/WriteBuffer.h>
-#include <DB/Columns/IColumn.h>
-#include <DB/DataTypes/IDataType.h>
-#include <DB/DataStreams/BinaryRowOutputStream.h>
+#include <IO/WriteBuffer.h>
+#include <Columns/IColumn.h>
+#include <DataTypes/IDataType.h>
+#include <DataStreams/BinaryRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/BinaryRowOutputStream.h b/dbms/src/DataStreams/BinaryRowOutputStream.h
similarity index 92%
rename from dbms/include/DB/DataStreams/BinaryRowOutputStream.h
rename to dbms/src/DataStreams/BinaryRowOutputStream.h
index e62472107c8..f91b16cc79d 100644
--- a/dbms/include/DB/DataStreams/BinaryRowOutputStream.h
+++ b/dbms/src/DataStreams/BinaryRowOutputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/BlockExtraInfoInputStream.h b/dbms/src/DataStreams/BlockExtraInfoInputStream.h
similarity index 94%
rename from dbms/include/DB/DataStreams/BlockExtraInfoInputStream.h
rename to dbms/src/DataStreams/BlockExtraInfoInputStream.h
index ddf6a68c5b0..be816fe78ac 100644
--- a/dbms/include/DB/DataStreams/BlockExtraInfoInputStream.h
+++ b/dbms/src/DataStreams/BlockExtraInfoInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 namespace DB
 {
diff --git a/dbms/src/DataStreams/BlockIO.cpp b/dbms/src/DataStreams/BlockIO.cpp
index 83b0fac54e2..76f6aeb0b37 100644
--- a/dbms/src/DataStreams/BlockIO.cpp
+++ b/dbms/src/DataStreams/BlockIO.cpp
@@ -1,5 +1,5 @@
-#include <DB/Interpreters/ProcessList.h>
-#include <DB/DataStreams/BlockIO.h>
+#include <Interpreters/ProcessList.h>
+#include <DataStreams/BlockIO.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/BlockIO.h b/dbms/src/DataStreams/BlockIO.h
similarity index 95%
rename from dbms/include/DB/DataStreams/BlockIO.h
rename to dbms/src/DataStreams/BlockIO.h
index b98ca3094a8..c8c9333cb9d 100644
--- a/dbms/include/DB/DataStreams/BlockIO.h
+++ b/dbms/src/DataStreams/BlockIO.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.cpp b/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.cpp
index 1850843f298..6dfa9992e62 100644
--- a/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.cpp
+++ b/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/Common/Exception.h>
-#include <DB/DataStreams/BlockInputStreamFromRowInputStream.h>
+#include <Common/Exception.h>
+#include <DataStreams/BlockInputStreamFromRowInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/BlockInputStreamFromRowInputStream.h b/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.h
similarity index 90%
rename from dbms/include/DB/DataStreams/BlockInputStreamFromRowInputStream.h
rename to dbms/src/DataStreams/BlockInputStreamFromRowInputStream.h
index c885f119695..b589a767065 100644
--- a/dbms/include/DB/DataStreams/BlockInputStreamFromRowInputStream.h
+++ b/dbms/src/DataStreams/BlockInputStreamFromRowInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Defines.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/IRowInputStream.h>
+#include <Core/Defines.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IRowInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/BlockOutputStreamFromRowOutputStream.cpp b/dbms/src/DataStreams/BlockOutputStreamFromRowOutputStream.cpp
index f36ca527f09..ab56b9c3ff1 100644
--- a/dbms/src/DataStreams/BlockOutputStreamFromRowOutputStream.cpp
+++ b/dbms/src/DataStreams/BlockOutputStreamFromRowOutputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/BlockOutputStreamFromRowOutputStream.h b/dbms/src/DataStreams/BlockOutputStreamFromRowOutputStream.h
similarity index 91%
rename from dbms/include/DB/DataStreams/BlockOutputStreamFromRowOutputStream.h
rename to dbms/src/DataStreams/BlockOutputStreamFromRowOutputStream.h
index bedd66ec8db..b52b0ffca60 100644
--- a/dbms/include/DB/DataStreams/BlockOutputStreamFromRowOutputStream.h
+++ b/dbms/src/DataStreams/BlockOutputStreamFromRowOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/BlockStreamProfileInfo.cpp b/dbms/src/DataStreams/BlockStreamProfileInfo.cpp
index e4efc3e4ffc..b231a61d216 100644
--- a/dbms/src/DataStreams/BlockStreamProfileInfo.cpp
+++ b/dbms/src/DataStreams/BlockStreamProfileInfo.cpp
@@ -1,9 +1,9 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Core/Block.h>
+#include <Core/Block.h>
 
-#include <DB/DataStreams/BlockStreamProfileInfo.h>
+#include <DataStreams/BlockStreamProfileInfo.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/BlockStreamProfileInfo.h b/dbms/src/DataStreams/BlockStreamProfileInfo.h
similarity index 97%
rename from dbms/include/DB/DataStreams/BlockStreamProfileInfo.h
rename to dbms/src/DataStreams/BlockStreamProfileInfo.h
index c05035236f9..bb0c80f88a7 100644
--- a/dbms/include/DB/DataStreams/BlockStreamProfileInfo.h
+++ b/dbms/src/DataStreams/BlockStreamProfileInfo.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <vector>
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 #if __APPLE__
 #include <common/apple_rt.h>
diff --git a/dbms/include/DB/DataStreams/BlocksListBlockInputStream.h b/dbms/src/DataStreams/BlocksListBlockInputStream.h
similarity index 95%
rename from dbms/include/DB/DataStreams/BlocksListBlockInputStream.h
rename to dbms/src/DataStreams/BlocksListBlockInputStream.h
index dbf7c1cbbaa..a83748f399f 100644
--- a/dbms/include/DB/DataStreams/BlocksListBlockInputStream.h
+++ b/dbms/src/DataStreams/BlocksListBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/CSVRowInputStream.cpp b/dbms/src/DataStreams/CSVRowInputStream.cpp
index 5dea3cdbb49..05e64257276 100644
--- a/dbms/src/DataStreams/CSVRowInputStream.cpp
+++ b/dbms/src/DataStreams/CSVRowInputStream.cpp
@@ -1,9 +1,9 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/Operators.h>
+#include <IO/ReadHelpers.h>
+#include <IO/Operators.h>
 
-#include <DB/DataStreams/verbosePrintString.h>
-#include <DB/DataStreams/CSVRowInputStream.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataStreams/verbosePrintString.h>
+#include <DataStreams/CSVRowInputStream.h>
+#include <DataTypes/DataTypesNumber.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/CSVRowInputStream.h b/dbms/src/DataStreams/CSVRowInputStream.h
similarity index 96%
rename from dbms/include/DB/DataStreams/CSVRowInputStream.h
rename to dbms/src/DataStreams/CSVRowInputStream.h
index 75af3c38c0c..61bf3e11fb5 100644
--- a/dbms/include/DB/DataStreams/CSVRowInputStream.h
+++ b/dbms/src/DataStreams/CSVRowInputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IRowInputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/IRowInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/CSVRowOutputStream.cpp b/dbms/src/DataStreams/CSVRowOutputStream.cpp
index 9d2006904b8..438f2718ce2 100644
--- a/dbms/src/DataStreams/CSVRowOutputStream.cpp
+++ b/dbms/src/DataStreams/CSVRowOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/DataStreams/CSVRowOutputStream.h>
+#include <DataStreams/CSVRowOutputStream.h>
 
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/CSVRowOutputStream.h b/dbms/src/DataStreams/CSVRowOutputStream.h
similarity index 95%
rename from dbms/include/DB/DataStreams/CSVRowOutputStream.h
rename to dbms/src/DataStreams/CSVRowOutputStream.h
index ab00bb11cf2..81f536613af 100644
--- a/dbms/include/DB/DataStreams/CSVRowOutputStream.h
+++ b/dbms/src/DataStreams/CSVRowOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/CollapsingFinalBlockInputStream.cpp b/dbms/src/DataStreams/CollapsingFinalBlockInputStream.cpp
index f3cd16bd96e..3d35eb21cc6 100644
--- a/dbms/src/DataStreams/CollapsingFinalBlockInputStream.cpp
+++ b/dbms/src/DataStreams/CollapsingFinalBlockInputStream.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataStreams/CollapsingFinalBlockInputStream.h>
+#include <DataStreams/CollapsingFinalBlockInputStream.h>
 
 /// Maximum number of messages about incorrect data in the log.
 #define MAX_ERROR_MESSAGES 10
diff --git a/dbms/include/DB/DataStreams/CollapsingFinalBlockInputStream.h b/dbms/src/DataStreams/CollapsingFinalBlockInputStream.h
similarity index 98%
rename from dbms/include/DB/DataStreams/CollapsingFinalBlockInputStream.h
rename to dbms/src/DataStreams/CollapsingFinalBlockInputStream.h
index cb54dfd3812..a26869ff2aa 100644
--- a/dbms/include/DB/DataStreams/CollapsingFinalBlockInputStream.h
+++ b/dbms/src/DataStreams/CollapsingFinalBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <common/logger_useful.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Core/SortDescription.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Core/SortDescription.h>
+#include <Columns/ColumnsNumber.h>
 #include <queue>
 
 namespace DB
diff --git a/dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp b/dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp
index e1187bd8c2c..b6288eeae8f 100644
--- a/dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/CollapsingSortedBlockInputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/Core/FieldVisitors.h>
-#include <DB/DataStreams/CollapsingSortedBlockInputStream.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Core/FieldVisitors.h>
+#include <DataStreams/CollapsingSortedBlockInputStream.h>
+#include <Columns/ColumnsNumber.h>
 
 /// Maximum number of messages about incorrect data in the log.
 #define MAX_ERROR_MESSAGES 10
diff --git a/dbms/include/DB/DataStreams/CollapsingSortedBlockInputStream.h b/dbms/src/DataStreams/CollapsingSortedBlockInputStream.h
similarity index 98%
rename from dbms/include/DB/DataStreams/CollapsingSortedBlockInputStream.h
rename to dbms/src/DataStreams/CollapsingSortedBlockInputStream.h
index 2926ac8be0d..c229246813f 100644
--- a/dbms/include/DB/DataStreams/CollapsingSortedBlockInputStream.h
+++ b/dbms/src/DataStreams/CollapsingSortedBlockInputStream.h
@@ -2,7 +2,7 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/DataStreams/MergingSortedBlockInputStream.h>
+#include <DataStreams/MergingSortedBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/ColumnGathererStream.cpp b/dbms/src/DataStreams/ColumnGathererStream.cpp
index 179552fb37a..5e1d3d96153 100644
--- a/dbms/src/DataStreams/ColumnGathererStream.cpp
+++ b/dbms/src/DataStreams/ColumnGathererStream.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataStreams/ColumnGathererStream.h>
+#include <DataStreams/ColumnGathererStream.h>
 #include <common/logger_useful.h>
 #include <iomanip>
 
diff --git a/dbms/include/DB/DataStreams/ColumnGathererStream.h b/dbms/src/DataStreams/ColumnGathererStream.h
similarity index 96%
rename from dbms/include/DB/DataStreams/ColumnGathererStream.h
rename to dbms/src/DataStreams/ColumnGathererStream.h
index a3bd64d1910..f253899432d 100644
--- a/dbms/include/DB/DataStreams/ColumnGathererStream.h
+++ b/dbms/src/DataStreams/ColumnGathererStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Common/PODArray.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Common/PODArray.h>
 
 
 namespace Poco { class Logger; }
diff --git a/dbms/include/DB/DataStreams/ConcatBlockInputStream.h b/dbms/src/DataStreams/ConcatBlockInputStream.h
similarity index 96%
rename from dbms/include/DB/DataStreams/ConcatBlockInputStream.h
rename to dbms/src/DataStreams/ConcatBlockInputStream.h
index 71a870ca951..5133265208b 100644
--- a/dbms/include/DB/DataStreams/ConcatBlockInputStream.h
+++ b/dbms/src/DataStreams/ConcatBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/CountingBlockOutputStream.cpp b/dbms/src/DataStreams/CountingBlockOutputStream.cpp
index cd6b316ebb9..4988ebe8055 100644
--- a/dbms/src/DataStreams/CountingBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/CountingBlockOutputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/DataStreams/CountingBlockOutputStream.h>
-#include <DB/Common/ProfileEvents.h>
+#include <DataStreams/CountingBlockOutputStream.h>
+#include <Common/ProfileEvents.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/DataStreams/CountingBlockOutputStream.h b/dbms/src/DataStreams/CountingBlockOutputStream.h
similarity index 89%
rename from dbms/include/DB/DataStreams/CountingBlockOutputStream.h
rename to dbms/src/DataStreams/CountingBlockOutputStream.h
index a3f1c429a5a..f0fac50f7f0 100644
--- a/dbms/include/DB/DataStreams/CountingBlockOutputStream.h
+++ b/dbms/src/DataStreams/CountingBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Interpreters/ProcessList.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Interpreters/ProcessList.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/CreatingSetsBlockInputStream.cpp b/dbms/src/DataStreams/CreatingSetsBlockInputStream.cpp
index 5dd1cc222e0..995b043983e 100644
--- a/dbms/src/DataStreams/CreatingSetsBlockInputStream.cpp
+++ b/dbms/src/DataStreams/CreatingSetsBlockInputStream.cpp
@@ -1,8 +1,8 @@
-#include <DB/Interpreters/Set.h>
-#include <DB/Interpreters/Join.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/CreatingSetsBlockInputStream.h>
-#include <DB/Storages/IStorage.h>
+#include <Interpreters/Set.h>
+#include <Interpreters/Join.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/CreatingSetsBlockInputStream.h>
+#include <Storages/IStorage.h>
 #include <iomanip>
 
 
diff --git a/dbms/include/DB/DataStreams/CreatingSetsBlockInputStream.h b/dbms/src/DataStreams/CreatingSetsBlockInputStream.h
similarity index 95%
rename from dbms/include/DB/DataStreams/CreatingSetsBlockInputStream.h
rename to dbms/src/DataStreams/CreatingSetsBlockInputStream.h
index 224f3164371..d9d096f6a92 100644
--- a/dbms/include/DB/DataStreams/CreatingSetsBlockInputStream.h
+++ b/dbms/src/DataStreams/CreatingSetsBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Poco/Logger.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Interpreters/ExpressionAnalyzer.h>
 
 
 namespace Poco { class Logger; }
diff --git a/dbms/src/DataStreams/DistinctBlockInputStream.cpp b/dbms/src/DataStreams/DistinctBlockInputStream.cpp
index 901fff5a733..21fd85c4098 100644
--- a/dbms/src/DataStreams/DistinctBlockInputStream.cpp
+++ b/dbms/src/DataStreams/DistinctBlockInputStream.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataStreams/DistinctBlockInputStream.h>
+#include <DataStreams/DistinctBlockInputStream.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/DistinctBlockInputStream.h b/dbms/src/DataStreams/DistinctBlockInputStream.h
similarity index 90%
rename from dbms/include/DB/DataStreams/DistinctBlockInputStream.h
rename to dbms/src/DataStreams/DistinctBlockInputStream.h
index ea4e48a27e0..41a9e7a2087 100644
--- a/dbms/include/DB/DataStreams/DistinctBlockInputStream.h
+++ b/dbms/src/DataStreams/DistinctBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Interpreters/Limits.h>
-#include <DB/Interpreters/SetVariants.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Interpreters/Limits.h>
+#include <Interpreters/SetVariants.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/EmptyBlockOutputStream.h b/dbms/src/DataStreams/EmptyBlockOutputStream.h
similarity index 89%
rename from dbms/include/DB/DataStreams/EmptyBlockOutputStream.h
rename to dbms/src/DataStreams/EmptyBlockOutputStream.h
index dcc7d601e68..340be887939 100644
--- a/dbms/include/DB/DataStreams/EmptyBlockOutputStream.h
+++ b/dbms/src/DataStreams/EmptyBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/Common/Exception.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <Common/Exception.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/ExpressionBlockInputStream.cpp b/dbms/src/DataStreams/ExpressionBlockInputStream.cpp
index 7d34484a8d0..916de1496b9 100644
--- a/dbms/src/DataStreams/ExpressionBlockInputStream.cpp
+++ b/dbms/src/DataStreams/ExpressionBlockInputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/DataStreams/ExpressionBlockInputStream.h>
+#include <Interpreters/ExpressionActions.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/ExpressionBlockInputStream.h b/dbms/src/DataStreams/ExpressionBlockInputStream.h
similarity index 94%
rename from dbms/include/DB/DataStreams/ExpressionBlockInputStream.h
rename to dbms/src/DataStreams/ExpressionBlockInputStream.h
index 2c5015c5aa7..c19921e1b67 100644
--- a/dbms/include/DB/DataStreams/ExpressionBlockInputStream.h
+++ b/dbms/src/DataStreams/ExpressionBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/FilterBlockInputStream.cpp b/dbms/src/DataStreams/FilterBlockInputStream.cpp
index 5daa10a3c12..7b1b8ebf8ae 100644
--- a/dbms/src/DataStreams/FilterBlockInputStream.cpp
+++ b/dbms/src/DataStreams/FilterBlockInputStream.cpp
@@ -1,9 +1,9 @@
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/Columns/ColumnsCommon.h>
-#include <DB/Interpreters/ExpressionActions.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnsCommon.h>
+#include <Interpreters/ExpressionActions.h>
 
-#include <DB/DataStreams/FilterBlockInputStream.h>
+#include <DataStreams/FilterBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/FilterBlockInputStream.h b/dbms/src/DataStreams/FilterBlockInputStream.h
similarity index 96%
rename from dbms/include/DB/DataStreams/FilterBlockInputStream.h
rename to dbms/src/DataStreams/FilterBlockInputStream.h
index 925078aac53..25767b22dc2 100644
--- a/dbms/include/DB/DataStreams/FilterBlockInputStream.h
+++ b/dbms/src/DataStreams/FilterBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/ForkBlockInputStreams.h b/dbms/src/DataStreams/ForkBlockInputStreams.h
similarity index 98%
rename from dbms/include/DB/DataStreams/ForkBlockInputStreams.h
rename to dbms/src/DataStreams/ForkBlockInputStreams.h
index 2f222bf7118..0fc7cd6a88d 100644
--- a/dbms/include/DB/DataStreams/ForkBlockInputStreams.h
+++ b/dbms/src/DataStreams/ForkBlockInputStreams.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/QueueBlockIOStream.h>
+#include <DataStreams/QueueBlockIOStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/FormatFactory.cpp b/dbms/src/DataStreams/FormatFactory.cpp
index 7a3fa3c61b8..c13a48f4d9f 100644
--- a/dbms/src/DataStreams/FormatFactory.cpp
+++ b/dbms/src/DataStreams/FormatFactory.cpp
@@ -1,34 +1,34 @@
-#include <DB/Interpreters/Context.h>
-#include <DB/DataStreams/NativeBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
-#include <DB/DataStreams/TabSeparatedRowInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/TabSeparatedRawRowOutputStream.h>
-#include <DB/DataStreams/BinaryRowInputStream.h>
-#include <DB/DataStreams/BinaryRowOutputStream.h>
-#include <DB/DataStreams/ValuesRowInputStream.h>
-#include <DB/DataStreams/ValuesRowOutputStream.h>
-#include <DB/DataStreams/TabSeparatedBlockOutputStream.h>
-#include <DB/DataStreams/PrettyBlockOutputStream.h>
-#include <DB/DataStreams/PrettyCompactBlockOutputStream.h>
-#include <DB/DataStreams/PrettySpaceBlockOutputStream.h>
-#include <DB/DataStreams/VerticalRowOutputStream.h>
-#include <DB/DataStreams/NullBlockOutputStream.h>
-#include <DB/DataStreams/BlockInputStreamFromRowInputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/JSONRowOutputStream.h>
-#include <DB/DataStreams/JSONCompactRowOutputStream.h>
-#include <DB/DataStreams/JSONEachRowRowOutputStream.h>
-#include <DB/DataStreams/JSONEachRowRowInputStream.h>
-#include <DB/DataStreams/XMLRowOutputStream.h>
-#include <DB/DataStreams/TSKVRowOutputStream.h>
-#include <DB/DataStreams/TSKVRowInputStream.h>
-#include <DB/DataStreams/PrettyCompactMonoBlockOutputStream.h>
-#include <DB/DataStreams/ODBCDriverBlockOutputStream.h>
-#include <DB/DataStreams/CSVRowInputStream.h>
-#include <DB/DataStreams/CSVRowOutputStream.h>
-#include <DB/DataStreams/MaterializingBlockOutputStream.h>
-#include <DB/DataStreams/FormatFactory.h>
+#include <Interpreters/Context.h>
+#include <DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/NativeBlockOutputStream.h>
+#include <DataStreams/TabSeparatedRowInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/TabSeparatedRawRowOutputStream.h>
+#include <DataStreams/BinaryRowInputStream.h>
+#include <DataStreams/BinaryRowOutputStream.h>
+#include <DataStreams/ValuesRowInputStream.h>
+#include <DataStreams/ValuesRowOutputStream.h>
+#include <DataStreams/TabSeparatedBlockOutputStream.h>
+#include <DataStreams/PrettyBlockOutputStream.h>
+#include <DataStreams/PrettyCompactBlockOutputStream.h>
+#include <DataStreams/PrettySpaceBlockOutputStream.h>
+#include <DataStreams/VerticalRowOutputStream.h>
+#include <DataStreams/NullBlockOutputStream.h>
+#include <DataStreams/BlockInputStreamFromRowInputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/JSONRowOutputStream.h>
+#include <DataStreams/JSONCompactRowOutputStream.h>
+#include <DataStreams/JSONEachRowRowOutputStream.h>
+#include <DataStreams/JSONEachRowRowInputStream.h>
+#include <DataStreams/XMLRowOutputStream.h>
+#include <DataStreams/TSKVRowOutputStream.h>
+#include <DataStreams/TSKVRowInputStream.h>
+#include <DataStreams/PrettyCompactMonoBlockOutputStream.h>
+#include <DataStreams/ODBCDriverBlockOutputStream.h>
+#include <DataStreams/CSVRowInputStream.h>
+#include <DataStreams/CSVRowOutputStream.h>
+#include <DataStreams/MaterializingBlockOutputStream.h>
+#include <DataStreams/FormatFactory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/FormatFactory.h b/dbms/src/DataStreams/FormatFactory.h
similarity index 86%
rename from dbms/include/DB/DataStreams/FormatFactory.h
rename to dbms/src/DataStreams/FormatFactory.h
index ab6304180a2..a58f778df4f 100644
--- a/dbms/include/DB/DataStreams/FormatFactory.h
+++ b/dbms/src/DataStreams/FormatFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.cpp b/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.cpp
index 2c7d4db77df..ac362992e8c 100644
--- a/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataStreams/GraphiteRollupSortedBlockInputStream.h>
+#include <DataStreams/GraphiteRollupSortedBlockInputStream.h>
 #include <type_traits>
 
 
diff --git a/dbms/include/DB/DataStreams/GraphiteRollupSortedBlockInputStream.h b/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.h
similarity index 96%
rename from dbms/include/DB/DataStreams/GraphiteRollupSortedBlockInputStream.h
rename to dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.h
index 675e31952b3..5a7a6a74e70 100644
--- a/dbms/include/DB/DataStreams/GraphiteRollupSortedBlockInputStream.h
+++ b/dbms/src/DataStreams/GraphiteRollupSortedBlockInputStream.h
@@ -2,12 +2,12 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Core/Row.h>
-#include <DB/Core/ColumnNumbers.h>
-#include <DB/DataStreams/MergingSortedBlockInputStream.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
-#include <DB/Common/OptimizedRegularExpression.h>
+#include <Core/Row.h>
+#include <Core/ColumnNumbers.h>
+#include <DataStreams/MergingSortedBlockInputStream.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Common/OptimizedRegularExpression.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/IBlockInputStream.cpp b/dbms/src/DataStreams/IBlockInputStream.cpp
index 2313eec10c2..0d7818c3b29 100644
--- a/dbms/src/DataStreams/IBlockInputStream.cpp
+++ b/dbms/src/DataStreams/IBlockInputStream.cpp
@@ -1,7 +1,7 @@
 #include <math.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/IBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/IBlockInputStream.h b/dbms/src/DataStreams/IBlockInputStream.h
similarity index 99%
rename from dbms/include/DB/DataStreams/IBlockInputStream.h
rename to dbms/src/DataStreams/IBlockInputStream.h
index 633f512dcfc..92c5e3299f6 100644
--- a/dbms/include/DB/DataStreams/IBlockInputStream.h
+++ b/dbms/src/DataStreams/IBlockInputStream.h
@@ -4,7 +4,7 @@
 #include <memory>
 #include <functional>
 #include <boost/noncopyable.hpp>
-#include <DB/Core/Block.h>
+#include <Core/Block.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/IBlockOutputStream.h b/dbms/src/DataStreams/IBlockOutputStream.h
similarity index 100%
rename from dbms/include/DB/DataStreams/IBlockOutputStream.h
rename to dbms/src/DataStreams/IBlockOutputStream.h
diff --git a/dbms/src/DataStreams/IProfilingBlockInputStream.cpp b/dbms/src/DataStreams/IProfilingBlockInputStream.cpp
index ce908a87ad1..9fb80b82962 100644
--- a/dbms/src/DataStreams/IProfilingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/IProfilingBlockInputStream.cpp
@@ -1,10 +1,10 @@
 #include <iomanip>
 #include <random>
 
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Interpreters/Quota.h>
-#include <DB/Interpreters/ProcessList.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <Columns/ColumnConst.h>
+#include <Interpreters/Quota.h>
+#include <Interpreters/ProcessList.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/IProfilingBlockInputStream.h b/dbms/src/DataStreams/IProfilingBlockInputStream.h
similarity index 98%
rename from dbms/include/DB/DataStreams/IProfilingBlockInputStream.h
rename to dbms/src/DataStreams/IProfilingBlockInputStream.h
index 3927215ffff..17806f79785 100644
--- a/dbms/include/DB/DataStreams/IProfilingBlockInputStream.h
+++ b/dbms/src/DataStreams/IProfilingBlockInputStream.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/Core/Progress.h>
+#include <Core/Progress.h>
 
-#include <DB/Interpreters/Limits.h>
+#include <Interpreters/Limits.h>
 
-#include <DB/DataStreams/BlockStreamProfileInfo.h>
-#include <DB/DataStreams/IBlockInputStream.h>
+#include <DataStreams/BlockStreamProfileInfo.h>
+#include <DataStreams/IBlockInputStream.h>
 
 #include <atomic>
 
diff --git a/dbms/src/DataStreams/IRowInputStream.cpp b/dbms/src/DataStreams/IRowInputStream.cpp
index f07bc1bda5e..b6c225f3afd 100644
--- a/dbms/src/DataStreams/IRowInputStream.cpp
+++ b/dbms/src/DataStreams/IRowInputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/DataStreams/IRowInputStream.h>
-#include <DB/Common/Exception.h>
+#include <DataStreams/IRowInputStream.h>
+#include <Common/Exception.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/IRowInputStream.h b/dbms/src/DataStreams/IRowInputStream.h
similarity index 100%
rename from dbms/include/DB/DataStreams/IRowInputStream.h
rename to dbms/src/DataStreams/IRowInputStream.h
diff --git a/dbms/src/DataStreams/IRowOutputStream.cpp b/dbms/src/DataStreams/IRowOutputStream.cpp
index bfd297845e1..489e497d125 100644
--- a/dbms/src/DataStreams/IRowOutputStream.cpp
+++ b/dbms/src/DataStreams/IRowOutputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/IRowOutputStream.h b/dbms/src/DataStreams/IRowOutputStream.h
similarity index 98%
rename from dbms/include/DB/DataStreams/IRowOutputStream.h
rename to dbms/src/DataStreams/IRowOutputStream.h
index 5f7aab08038..dc335c8ce0d 100644
--- a/dbms/include/DB/DataStreams/IRowOutputStream.h
+++ b/dbms/src/DataStreams/IRowOutputStream.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <cstdint>
 #include <boost/noncopyable.hpp>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/InputStreamFromASTInsertQuery.cpp b/dbms/src/DataStreams/InputStreamFromASTInsertQuery.cpp
index 00c00382e5d..8b53cd6bd01 100644
--- a/dbms/src/DataStreams/InputStreamFromASTInsertQuery.cpp
+++ b/dbms/src/DataStreams/InputStreamFromASTInsertQuery.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/ReadBufferFromMemory.h>
-#include <DB/DataStreams/InputStreamFromASTInsertQuery.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <DataStreams/InputStreamFromASTInsertQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/InputStreamFromASTInsertQuery.h b/dbms/src/DataStreams/InputStreamFromASTInsertQuery.h
similarity index 85%
rename from dbms/include/DB/DataStreams/InputStreamFromASTInsertQuery.h
rename to dbms/src/DataStreams/InputStreamFromASTInsertQuery.h
index 8baeab3547f..11992c187cf 100644
--- a/dbms/include/DB/DataStreams/InputStreamFromASTInsertQuery.h
+++ b/dbms/src/DataStreams/InputStreamFromASTInsertQuery.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/IO/ConcatReadBuffer.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/BlockIO.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Interpreters/Context.h>
+#include <IO/ConcatReadBuffer.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/BlockIO.h>
 #include <cstddef>
 
 
diff --git a/dbms/src/DataStreams/JSONCompactRowOutputStream.cpp b/dbms/src/DataStreams/JSONCompactRowOutputStream.cpp
index 43f393a7c92..dbb9499ba64 100644
--- a/dbms/src/DataStreams/JSONCompactRowOutputStream.cpp
+++ b/dbms/src/DataStreams/JSONCompactRowOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/DataStreams/JSONCompactRowOutputStream.h>
+#include <DataStreams/JSONCompactRowOutputStream.h>
 
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/JSONCompactRowOutputStream.h b/dbms/src/DataStreams/JSONCompactRowOutputStream.h
similarity index 81%
rename from dbms/include/DB/DataStreams/JSONCompactRowOutputStream.h
rename to dbms/src/DataStreams/JSONCompactRowOutputStream.h
index 415803e2f83..9423cde034c 100644
--- a/dbms/include/DB/DataStreams/JSONCompactRowOutputStream.h
+++ b/dbms/src/DataStreams/JSONCompactRowOutputStream.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteBufferValidUTF8.h>
-#include <DB/DataStreams/JSONRowOutputStream.h>
+#include <Core/Block.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteBufferValidUTF8.h>
+#include <DataStreams/JSONRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/JSONEachRowRowInputStream.cpp b/dbms/src/DataStreams/JSONEachRowRowInputStream.cpp
index 90394bc5211..2181e0095ca 100644
--- a/dbms/src/DataStreams/JSONEachRowRowInputStream.cpp
+++ b/dbms/src/DataStreams/JSONEachRowRowInputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/DataStreams/JSONEachRowRowInputStream.h>
+#include <IO/ReadHelpers.h>
+#include <DataStreams/JSONEachRowRowInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/JSONEachRowRowInputStream.h b/dbms/src/DataStreams/JSONEachRowRowInputStream.h
similarity index 93%
rename from dbms/include/DB/DataStreams/JSONEachRowRowInputStream.h
rename to dbms/src/DataStreams/JSONEachRowRowInputStream.h
index 129b7fc45ca..7c7471203e7 100644
--- a/dbms/include/DB/DataStreams/JSONEachRowRowInputStream.h
+++ b/dbms/src/DataStreams/JSONEachRowRowInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IRowInputStream.h>
-#include <DB/Common/HashTable/HashMap.h>
+#include <Core/Block.h>
+#include <DataStreams/IRowInputStream.h>
+#include <Common/HashTable/HashMap.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp b/dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp
index 497a38f8fc5..df5a9dee9b6 100644
--- a/dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp
+++ b/dbms/src/DataStreams/JSONEachRowRowOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/WriteBufferValidUTF8.h>
-#include <DB/DataStreams/JSONEachRowRowOutputStream.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferValidUTF8.h>
+#include <DataStreams/JSONEachRowRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/JSONEachRowRowOutputStream.h b/dbms/src/DataStreams/JSONEachRowRowOutputStream.h
similarity index 88%
rename from dbms/include/DB/DataStreams/JSONEachRowRowOutputStream.h
rename to dbms/src/DataStreams/JSONEachRowRowOutputStream.h
index 9349475ce6e..cbf92aa6576 100644
--- a/dbms/include/DB/DataStreams/JSONEachRowRowOutputStream.h
+++ b/dbms/src/DataStreams/JSONEachRowRowOutputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <Core/Block.h>
+#include <IO/WriteBuffer.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/JSONRowOutputStream.cpp b/dbms/src/DataStreams/JSONRowOutputStream.cpp
index 72815d2400d..894c0a5576f 100644
--- a/dbms/src/DataStreams/JSONRowOutputStream.cpp
+++ b/dbms/src/DataStreams/JSONRowOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/WriteBufferValidUTF8.h>
-#include <DB/DataStreams/JSONRowOutputStream.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferValidUTF8.h>
+#include <DataStreams/JSONRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/JSONRowOutputStream.h b/dbms/src/DataStreams/JSONRowOutputStream.h
similarity index 91%
rename from dbms/include/DB/DataStreams/JSONRowOutputStream.h
rename to dbms/src/DataStreams/JSONRowOutputStream.h
index 185b58fdcb4..e85964df0a5 100644
--- a/dbms/include/DB/DataStreams/JSONRowOutputStream.h
+++ b/dbms/src/DataStreams/JSONRowOutputStream.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/Core/Progress.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <Core/Block.h>
+#include <Core/Progress.h>
+#include <IO/WriteBuffer.h>
+#include <Common/Stopwatch.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/LazyBlockInputStream.h b/dbms/src/DataStreams/LazyBlockInputStream.h
similarity index 96%
rename from dbms/include/DB/DataStreams/LazyBlockInputStream.h
rename to dbms/src/DataStreams/LazyBlockInputStream.h
index 3fdffade170..b9a9904ba4a 100644
--- a/dbms/include/DB/DataStreams/LazyBlockInputStream.h
+++ b/dbms/src/DataStreams/LazyBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/LimitBlockInputStream.cpp b/dbms/src/DataStreams/LimitBlockInputStream.cpp
index e9a5ec05b5f..56edf6d1e98 100644
--- a/dbms/src/DataStreams/LimitBlockInputStream.cpp
+++ b/dbms/src/DataStreams/LimitBlockInputStream.cpp
@@ -1,6 +1,6 @@
 #include <algorithm>
 
-#include <DB/DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/LimitBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/LimitBlockInputStream.h b/dbms/src/DataStreams/LimitBlockInputStream.h
similarity index 96%
rename from dbms/include/DB/DataStreams/LimitBlockInputStream.h
rename to dbms/src/DataStreams/LimitBlockInputStream.h
index 3cee366f715..0ca994916e0 100644
--- a/dbms/include/DB/DataStreams/LimitBlockInputStream.h
+++ b/dbms/src/DataStreams/LimitBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/LimitByBlockInputStream.cpp b/dbms/src/DataStreams/LimitByBlockInputStream.cpp
index fea78f3a651..9063a08350c 100644
--- a/dbms/src/DataStreams/LimitByBlockInputStream.cpp
+++ b/dbms/src/DataStreams/LimitByBlockInputStream.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataStreams/LimitByBlockInputStream.h>
+#include <DataStreams/LimitByBlockInputStream.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/LimitByBlockInputStream.h b/dbms/src/DataStreams/LimitByBlockInputStream.h
similarity index 84%
rename from dbms/include/DB/DataStreams/LimitByBlockInputStream.h
rename to dbms/src/DataStreams/LimitByBlockInputStream.h
index cb46e9f07c5..c90c4bbf72e 100644
--- a/dbms/include/DB/DataStreams/LimitByBlockInputStream.h
+++ b/dbms/src/DataStreams/LimitByBlockInputStream.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/UInt128.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/SipHash.h>
+#include <Common/UInt128.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/MarkInCompressedFile.h b/dbms/src/DataStreams/MarkInCompressedFile.h
similarity index 92%
rename from dbms/include/DB/DataStreams/MarkInCompressedFile.h
rename to dbms/src/DataStreams/MarkInCompressedFile.h
index fffd892e04f..ba0578bffa3 100644
--- a/dbms/include/DB/DataStreams/MarkInCompressedFile.h
+++ b/dbms/src/DataStreams/MarkInCompressedFile.h
@@ -2,9 +2,9 @@
 
 #include <tuple>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/PODArray.h>
+#include <Core/Types.h>
+#include <IO/WriteHelpers.h>
+#include <Common/PODArray.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/MaterializingBlockInputStream.cpp b/dbms/src/DataStreams/MaterializingBlockInputStream.cpp
index ac24e685440..d753f04f6e1 100644
--- a/dbms/src/DataStreams/MaterializingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/MaterializingBlockInputStream.cpp
@@ -1,7 +1,7 @@
-#include <DB/DataStreams/MaterializingBlockInputStream.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataStreams/MaterializingBlockInputStream.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/MaterializingBlockInputStream.h b/dbms/src/DataStreams/MaterializingBlockInputStream.h
similarity index 88%
rename from dbms/include/DB/DataStreams/MaterializingBlockInputStream.h
rename to dbms/src/DataStreams/MaterializingBlockInputStream.h
index 88edafa722f..afcc670010e 100644
--- a/dbms/include/DB/DataStreams/MaterializingBlockInputStream.h
+++ b/dbms/src/DataStreams/MaterializingBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 namespace DB
 {
diff --git a/dbms/src/DataStreams/MaterializingBlockOutputStream.cpp b/dbms/src/DataStreams/MaterializingBlockOutputStream.cpp
index a3db01de86f..419f5285a41 100644
--- a/dbms/src/DataStreams/MaterializingBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/MaterializingBlockOutputStream.cpp
@@ -1,7 +1,7 @@
-#include <DB/Columns/ColumnConst.h>
-#include <DB/DataStreams/MaterializingBlockOutputStream.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnConst.h>
+#include <DataStreams/MaterializingBlockOutputStream.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <ext/range.hpp>
 
 
diff --git a/dbms/include/DB/DataStreams/MaterializingBlockOutputStream.h b/dbms/src/DataStreams/MaterializingBlockOutputStream.h
similarity index 94%
rename from dbms/include/DB/DataStreams/MaterializingBlockOutputStream.h
rename to dbms/src/DataStreams/MaterializingBlockOutputStream.h
index 559b86ec6b0..3d57c53cc9e 100644
--- a/dbms/include/DB/DataStreams/MaterializingBlockOutputStream.h
+++ b/dbms/src/DataStreams/MaterializingBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/MergeSortingBlockInputStream.cpp b/dbms/src/DataStreams/MergeSortingBlockInputStream.cpp
index 73bfcbf5974..a2bcc7ac849 100644
--- a/dbms/src/DataStreams/MergeSortingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/MergeSortingBlockInputStream.cpp
@@ -1,9 +1,9 @@
-#include <DB/DataStreams/MergeSortingBlockInputStream.h>
-#include <DB/DataStreams/MergingSortedBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedWriteBuffer.h>
+#include <DataStreams/MergeSortingBlockInputStream.h>
+#include <DataStreams/MergingSortedBlockInputStream.h>
+#include <DataStreams/NativeBlockOutputStream.h>
+#include <DataStreams/copyData.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/DataStreams/MergeSortingBlockInputStream.h b/dbms/src/DataStreams/MergeSortingBlockInputStream.h
similarity index 93%
rename from dbms/include/DB/DataStreams/MergeSortingBlockInputStream.h
rename to dbms/src/DataStreams/MergeSortingBlockInputStream.h
index 803ccccae0f..b1335945c64 100644
--- a/dbms/include/DB/DataStreams/MergeSortingBlockInputStream.h
+++ b/dbms/src/DataStreams/MergeSortingBlockInputStream.h
@@ -5,14 +5,14 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Core/SortDescription.h>
-#include <DB/Core/SortCursor.h>
+#include <Core/SortDescription.h>
+#include <Core/SortCursor.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/NativeBlockInputStream.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/MergingAggregatedBlockInputStream.cpp b/dbms/src/DataStreams/MergingAggregatedBlockInputStream.cpp
index 1efc43b4685..63b42c31980 100644
--- a/dbms/src/DataStreams/MergingAggregatedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/MergingAggregatedBlockInputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnsNumber.h>
 
-#include <DB/DataStreams/MergingAggregatedBlockInputStream.h>
+#include <DataStreams/MergingAggregatedBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/MergingAggregatedBlockInputStream.h b/dbms/src/DataStreams/MergingAggregatedBlockInputStream.h
similarity index 92%
rename from dbms/include/DB/DataStreams/MergingAggregatedBlockInputStream.h
rename to dbms/src/DataStreams/MergingAggregatedBlockInputStream.h
index c7dec62b67f..1b50896f568 100644
--- a/dbms/include/DB/DataStreams/MergingAggregatedBlockInputStream.h
+++ b/dbms/src/DataStreams/MergingAggregatedBlockInputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Aggregator.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <Interpreters/Aggregator.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.cpp b/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.cpp
index b0d6e829b58..8178a4fb256 100644
--- a/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.cpp
+++ b/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.cpp
@@ -1,7 +1,7 @@
 #include <future>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h>
+#include <Common/setThreadName.h>
+#include <Common/CurrentMetrics.h>
+#include <DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h>
 
 
 namespace CurrentMetrics
diff --git a/dbms/include/DB/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h b/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h
similarity index 98%
rename from dbms/include/DB/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h
rename to dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h
index af729512a63..60ca0747f75 100644
--- a/dbms/include/DB/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h
+++ b/dbms/src/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Interpreters/Aggregator.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Common/ConcurrentBoundedQueue.h>
-#include <DB/Common/ThreadPool.h>
+#include <Interpreters/Aggregator.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Common/ConcurrentBoundedQueue.h>
+#include <Common/ThreadPool.h>
 #include <condition_variable>
 
 
diff --git a/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp b/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
index e26b0c00f46..b4404ad2b43 100644
--- a/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/MergingSortedBlockInputStream.cpp
@@ -1,7 +1,7 @@
 #include <queue>
 #include <iomanip>
 
-#include <DB/DataStreams/MergingSortedBlockInputStream.h>
+#include <DataStreams/MergingSortedBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h b/dbms/src/DataStreams/MergingSortedBlockInputStream.h
similarity index 97%
rename from dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h
rename to dbms/src/DataStreams/MergingSortedBlockInputStream.h
index a3c8e4d0f94..97eaadca827 100644
--- a/dbms/include/DB/DataStreams/MergingSortedBlockInputStream.h
+++ b/dbms/src/DataStreams/MergingSortedBlockInputStream.h
@@ -5,12 +5,12 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Core/Row.h>
-#include <DB/Core/SortDescription.h>
-#include <DB/Core/SortCursor.h>
+#include <Core/Row.h>
+#include <Core/SortDescription.h>
+#include <Core/SortCursor.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/ColumnGathererStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/ColumnGathererStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/NativeBlockInputStream.cpp b/dbms/src/DataStreams/NativeBlockInputStream.cpp
index 81dba25061e..0de428325b2 100644
--- a/dbms/src/DataStreams/NativeBlockInputStream.cpp
+++ b/dbms/src/DataStreams/NativeBlockInputStream.cpp
@@ -1,18 +1,18 @@
-#include <DB/Core/Defines.h>
+#include <Core/Defines.h>
 
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/VarInt.h>
-#include <DB/IO/CompressedReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/VarInt.h>
+#include <IO/CompressedReadBufferFromFile.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeFactory.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeFactory.h>
 
-#include <DB/DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/NativeBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/NativeBlockInputStream.h b/dbms/src/DataStreams/NativeBlockInputStream.h
similarity index 97%
rename from dbms/include/DB/DataStreams/NativeBlockInputStream.h
rename to dbms/src/DataStreams/NativeBlockInputStream.h
index b7ee06a9226..879bff9bc62 100644
--- a/dbms/include/DB/DataStreams/NativeBlockInputStream.h
+++ b/dbms/src/DataStreams/NativeBlockInputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/MarkInCompressedFile.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/MarkInCompressedFile.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/NativeBlockOutputStream.cpp b/dbms/src/DataStreams/NativeBlockOutputStream.cpp
index bdc4c31b94b..3d7cb70094e 100644
--- a/dbms/src/DataStreams/NativeBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/NativeBlockOutputStream.cpp
@@ -1,21 +1,21 @@
-#include <DB/Core/Defines.h>
-#include <DB/Core/Block.h>
+#include <Core/Defines.h>
+#include <Core/Block.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/VarInt.h>
-#include <DB/IO/CompressedWriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/VarInt.h>
+#include <IO/CompressedWriteBuffer.h>
 
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnsNumber.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/DataStreams/MarkInCompressedFile.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
+#include <DataStreams/MarkInCompressedFile.h>
+#include <DataStreams/NativeBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/NativeBlockOutputStream.h b/dbms/src/DataStreams/NativeBlockOutputStream.h
similarity index 94%
rename from dbms/include/DB/DataStreams/NativeBlockOutputStream.h
rename to dbms/src/DataStreams/NativeBlockOutputStream.h
index f11316b2c1f..e0af3523284 100644
--- a/dbms/include/DB/DataStreams/NativeBlockOutputStream.h
+++ b/dbms/src/DataStreams/NativeBlockOutputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/Core/Types.h>
-#include <DB/DataTypes/IDataType.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <Core/Types.h>
+#include <DataTypes/IDataType.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/NullAndDoCopyBlockInputStream.h b/dbms/src/DataStreams/NullAndDoCopyBlockInputStream.h
similarity index 94%
rename from dbms/include/DB/DataStreams/NullAndDoCopyBlockInputStream.h
rename to dbms/src/DataStreams/NullAndDoCopyBlockInputStream.h
index 9bd3154b94e..a1f49de2470 100644
--- a/dbms/include/DB/DataStreams/NullAndDoCopyBlockInputStream.h
+++ b/dbms/src/DataStreams/NullAndDoCopyBlockInputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/copyData.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/NullBlockInputStream.cpp b/dbms/src/DataStreams/NullBlockInputStream.cpp
index 0da151e4838..a0042561742 100644
--- a/dbms/src/DataStreams/NullBlockInputStream.cpp
+++ b/dbms/src/DataStreams/NullBlockInputStream.cpp
@@ -1,5 +1,5 @@
 
-#include <DB/DataStreams/NullBlockInputStream.h>
+#include <DataStreams/NullBlockInputStream.h>
 
 #include <sstream>
 
diff --git a/dbms/include/DB/DataStreams/NullBlockInputStream.h b/dbms/src/DataStreams/NullBlockInputStream.h
similarity index 86%
rename from dbms/include/DB/DataStreams/NullBlockInputStream.h
rename to dbms/src/DataStreams/NullBlockInputStream.h
index b4468b2e26d..7c42c97bcd3 100644
--- a/dbms/include/DB/DataStreams/NullBlockInputStream.h
+++ b/dbms/src/DataStreams/NullBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockInputStream.h>
+#include <DataStreams/IBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/NullBlockOutputStream.h b/dbms/src/DataStreams/NullBlockOutputStream.h
similarity index 84%
rename from dbms/include/DB/DataStreams/NullBlockOutputStream.h
rename to dbms/src/DataStreams/NullBlockOutputStream.h
index 5d64945cf3c..2c51a138cff 100644
--- a/dbms/include/DB/DataStreams/NullBlockOutputStream.h
+++ b/dbms/src/DataStreams/NullBlockOutputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/NullableAdapterBlockInputStream.cpp b/dbms/src/DataStreams/NullableAdapterBlockInputStream.cpp
index b914d984b3b..81543c832ea 100644
--- a/dbms/src/DataStreams/NullableAdapterBlockInputStream.cpp
+++ b/dbms/src/DataStreams/NullableAdapterBlockInputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/DataStreams/NullableAdapterBlockInputStream.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/DataTypes/DataTypeNullable.h>
+#include <DataStreams/NullableAdapterBlockInputStream.h>
+#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeNullable.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/NullableAdapterBlockInputStream.h b/dbms/src/DataStreams/NullableAdapterBlockInputStream.h
similarity index 97%
rename from dbms/include/DB/DataStreams/NullableAdapterBlockInputStream.h
rename to dbms/src/DataStreams/NullableAdapterBlockInputStream.h
index f53113df6ae..613a6309f5e 100644
--- a/dbms/include/DB/DataStreams/NullableAdapterBlockInputStream.h
+++ b/dbms/src/DataStreams/NullableAdapterBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 #include <experimental/optional>
 
 namespace DB
diff --git a/dbms/src/DataStreams/ODBCDriverBlockOutputStream.cpp b/dbms/src/DataStreams/ODBCDriverBlockOutputStream.cpp
index c92aef3e148..9b46451831d 100644
--- a/dbms/src/DataStreams/ODBCDriverBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/ODBCDriverBlockOutputStream.cpp
@@ -1,7 +1,7 @@
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/ODBCDriverBlockOutputStream.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <Core/Block.h>
+#include <DataStreams/ODBCDriverBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/ODBCDriverBlockOutputStream.h b/dbms/src/DataStreams/ODBCDriverBlockOutputStream.h
similarity index 96%
rename from dbms/include/DB/DataStreams/ODBCDriverBlockOutputStream.h
rename to dbms/src/DataStreams/ODBCDriverBlockOutputStream.h
index f253343288a..4e482512563 100644
--- a/dbms/include/DB/DataStreams/ODBCDriverBlockOutputStream.h
+++ b/dbms/src/DataStreams/ODBCDriverBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/OneBlockInputStream.h b/dbms/src/DataStreams/OneBlockInputStream.h
similarity index 93%
rename from dbms/include/DB/DataStreams/OneBlockInputStream.h
rename to dbms/src/DataStreams/OneBlockInputStream.h
index f8955f9775f..74f81c3c46a 100644
--- a/dbms/include/DB/DataStreams/OneBlockInputStream.h
+++ b/dbms/src/DataStreams/OneBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp
index cfc2df614c3..75873c4a9c6 100644
--- a/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.cpp
@@ -1,8 +1,8 @@
-#include <DB/DataStreams/BlocksListBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockInputStream.h>
-#include <DB/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h>
-#include <DB/DataStreams/ParallelAggregatingBlockInputStream.h>
-#include <DB/Common/ClickHouseRevision.h>
+#include <DataStreams/BlocksListBlockInputStream.h>
+#include <DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h>
+#include <DataStreams/ParallelAggregatingBlockInputStream.h>
+#include <Common/ClickHouseRevision.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/DataStreams/ParallelAggregatingBlockInputStream.h b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h
similarity index 94%
rename from dbms/include/DB/DataStreams/ParallelAggregatingBlockInputStream.h
rename to dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h
index 83e7653bba8..b10f2c51f35 100644
--- a/dbms/include/DB/DataStreams/ParallelAggregatingBlockInputStream.h
+++ b/dbms/src/DataStreams/ParallelAggregatingBlockInputStream.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Interpreters/Aggregator.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/ParallelInputsProcessor.h>
+#include <Interpreters/Aggregator.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/ParallelInputsProcessor.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/ParallelInputsProcessor.h b/dbms/src/DataStreams/ParallelInputsProcessor.h
similarity index 99%
rename from dbms/include/DB/DataStreams/ParallelInputsProcessor.h
rename to dbms/src/DataStreams/ParallelInputsProcessor.h
index ba1b091cfa8..ebedeea7cd4 100644
--- a/dbms/include/DB/DataStreams/ParallelInputsProcessor.h
+++ b/dbms/src/DataStreams/ParallelInputsProcessor.h
@@ -8,9 +8,9 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Common/setThreadName.h>
+#include <Common/CurrentMetrics.h>
 
 
 /** Allows to process multiple block input streams (sources) in parallel, using specified number of threads.
diff --git a/dbms/src/DataStreams/PartialSortingBlockInputStream.cpp b/dbms/src/DataStreams/PartialSortingBlockInputStream.cpp
index 8ba2e01f481..3307f0352d7 100644
--- a/dbms/src/DataStreams/PartialSortingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/PartialSortingBlockInputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/Interpreters/sortBlock.h>
+#include <Interpreters/sortBlock.h>
 
-#include <DB/DataStreams/PartialSortingBlockInputStream.h>
+#include <DataStreams/PartialSortingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/PartialSortingBlockInputStream.h b/dbms/src/DataStreams/PartialSortingBlockInputStream.h
similarity index 93%
rename from dbms/include/DB/DataStreams/PartialSortingBlockInputStream.h
rename to dbms/src/DataStreams/PartialSortingBlockInputStream.h
index 92fa6f4e3b9..488e15eca9a 100644
--- a/dbms/include/DB/DataStreams/PartialSortingBlockInputStream.h
+++ b/dbms/src/DataStreams/PartialSortingBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/SortDescription.h>
+#include <Core/SortDescription.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/PrettyBlockOutputStream.cpp b/dbms/src/DataStreams/PrettyBlockOutputStream.cpp
index 41e46393006..3c1ac93d4fa 100644
--- a/dbms/src/DataStreams/PrettyBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/PrettyBlockOutputStream.cpp
@@ -1,15 +1,15 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataStreams/PrettyBlockOutputStream.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataStreams/PrettyBlockOutputStream.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnsNumber.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/PrettyBlockOutputStream.h b/dbms/src/DataStreams/PrettyBlockOutputStream.h
similarity index 94%
rename from dbms/include/DB/DataStreams/PrettyBlockOutputStream.h
rename to dbms/src/DataStreams/PrettyBlockOutputStream.h
index cc22d0fe772..22222c539b3 100644
--- a/dbms/include/DB/DataStreams/PrettyBlockOutputStream.h
+++ b/dbms/src/DataStreams/PrettyBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/PrettyCompactBlockOutputStream.cpp b/dbms/src/DataStreams/PrettyCompactBlockOutputStream.cpp
index 4b40dcde4c1..b0fb5be6088 100644
--- a/dbms/src/DataStreams/PrettyCompactBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/PrettyCompactBlockOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/PrettyCompactBlockOutputStream.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/PrettyCompactBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/PrettyCompactBlockOutputStream.h b/dbms/src/DataStreams/PrettyCompactBlockOutputStream.h
similarity index 93%
rename from dbms/include/DB/DataStreams/PrettyCompactBlockOutputStream.h
rename to dbms/src/DataStreams/PrettyCompactBlockOutputStream.h
index 1ad867643d3..ddde71b1316 100644
--- a/dbms/include/DB/DataStreams/PrettyCompactBlockOutputStream.h
+++ b/dbms/src/DataStreams/PrettyCompactBlockOutputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/PrettyBlockOutputStream.h>
+#include <DataStreams/PrettyBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.cpp b/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.cpp
index 5b5c2879fb9..e4f28c8e910 100644
--- a/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/PrettyCompactMonoBlockOutputStream.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/PrettyCompactMonoBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/PrettyCompactMonoBlockOutputStream.h b/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.h
similarity index 92%
rename from dbms/include/DB/DataStreams/PrettyCompactMonoBlockOutputStream.h
rename to dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.h
index 20c0ab84025..26e727d5d8c 100644
--- a/dbms/include/DB/DataStreams/PrettyCompactMonoBlockOutputStream.h
+++ b/dbms/src/DataStreams/PrettyCompactMonoBlockOutputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/PrettyCompactBlockOutputStream.h>
+#include <DataStreams/PrettyCompactBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/PrettySpaceBlockOutputStream.cpp b/dbms/src/DataStreams/PrettySpaceBlockOutputStream.cpp
index 705c2abd5b0..bbe6137f2d8 100644
--- a/dbms/src/DataStreams/PrettySpaceBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/PrettySpaceBlockOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/PrettySpaceBlockOutputStream.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/PrettySpaceBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/PrettySpaceBlockOutputStream.h b/dbms/src/DataStreams/PrettySpaceBlockOutputStream.h
similarity index 90%
rename from dbms/include/DB/DataStreams/PrettySpaceBlockOutputStream.h
rename to dbms/src/DataStreams/PrettySpaceBlockOutputStream.h
index 8dd9220179f..e8d968e27e5 100644
--- a/dbms/include/DB/DataStreams/PrettySpaceBlockOutputStream.h
+++ b/dbms/src/DataStreams/PrettySpaceBlockOutputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/PrettyBlockOutputStream.h>
+#include <DataStreams/PrettyBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/ProhibitColumnsBlockOutputStream.cpp b/dbms/src/DataStreams/ProhibitColumnsBlockOutputStream.cpp
index a0b14017afe..b25df6b2050 100644
--- a/dbms/src/DataStreams/ProhibitColumnsBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/ProhibitColumnsBlockOutputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/ProhibitColumnsBlockOutputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/ProhibitColumnsBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/ProhibitColumnsBlockOutputStream.h b/dbms/src/DataStreams/ProhibitColumnsBlockOutputStream.h
similarity index 89%
rename from dbms/include/DB/DataStreams/ProhibitColumnsBlockOutputStream.h
rename to dbms/src/DataStreams/ProhibitColumnsBlockOutputStream.h
index 771394b63ac..81c3ca1876f 100644
--- a/dbms/include/DB/DataStreams/ProhibitColumnsBlockOutputStream.h
+++ b/dbms/src/DataStreams/ProhibitColumnsBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/Core/NamesAndTypes.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <Core/NamesAndTypes.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/PushingToViewsBlockOutputStream.h b/dbms/src/DataStreams/PushingToViewsBlockOutputStream.h
similarity index 90%
rename from dbms/include/DB/DataStreams/PushingToViewsBlockOutputStream.h
rename to dbms/src/DataStreams/PushingToViewsBlockOutputStream.h
index 22fa53b6c54..8e53a316776 100644
--- a/dbms/include/DB/DataStreams/PushingToViewsBlockOutputStream.h
+++ b/dbms/src/DataStreams/PushingToViewsBlockOutputStream.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/DataStreams/copyData.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/DataStreams/MaterializingBlockInputStream.h>
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/Storages/StorageView.h>
+#include <DataStreams/copyData.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/MaterializingBlockInputStream.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Storages/StorageView.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/QueueBlockIOStream.h b/dbms/src/DataStreams/QueueBlockIOStream.h
similarity index 93%
rename from dbms/include/DB/DataStreams/QueueBlockIOStream.h
rename to dbms/src/DataStreams/QueueBlockIOStream.h
index b14ed7bddb2..aa9274426fb 100644
--- a/dbms/include/DB/DataStreams/QueueBlockIOStream.h
+++ b/dbms/src/DataStreams/QueueBlockIOStream.h
@@ -2,10 +2,10 @@
 
 #include <limits>
 
-#include <DB/Common/ConcurrentBoundedQueue.h>
+#include <Common/ConcurrentBoundedQueue.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/RemoteBlockInputStream.cpp b/dbms/src/DataStreams/RemoteBlockInputStream.cpp
index 44826f9b0ab..821f7b5d834 100644
--- a/dbms/src/DataStreams/RemoteBlockInputStream.cpp
+++ b/dbms/src/DataStreams/RemoteBlockInputStream.cpp
@@ -1,9 +1,9 @@
-#include <DB/DataStreams/RemoteBlockInputStream.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Common/VirtualColumnUtils.h>
-#include <DB/Common/NetException.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/IStorage.h>
+#include <DataStreams/RemoteBlockInputStream.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Common/VirtualColumnUtils.h>
+#include <Common/NetException.h>
+#include <Interpreters/Context.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h b/dbms/src/DataStreams/RemoteBlockInputStream.h
similarity index 95%
rename from dbms/include/DB/DataStreams/RemoteBlockInputStream.h
rename to dbms/src/DataStreams/RemoteBlockInputStream.h
index f3fb2b111d1..fa0024e0346 100644
--- a/dbms/include/DB/DataStreams/RemoteBlockInputStream.h
+++ b/dbms/src/DataStreams/RemoteBlockInputStream.h
@@ -2,12 +2,12 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Common/Throttler.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Client/ConnectionPool.h>
-#include <DB/Client/MultiplexedConnections.h>
-#include <DB/Interpreters/Cluster.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Common/Throttler.h>
+#include <Interpreters/Context.h>
+#include <Client/ConnectionPool.h>
+#include <Client/MultiplexedConnections.h>
+#include <Interpreters/Cluster.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/RemoteBlockOutputStream.cpp b/dbms/src/DataStreams/RemoteBlockOutputStream.cpp
index 54f1596f756..659f30c465b 100644
--- a/dbms/src/DataStreams/RemoteBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/RemoteBlockOutputStream.cpp
@@ -1,9 +1,9 @@
-#include <DB/DataStreams/RemoteBlockOutputStream.h>
+#include <DataStreams/RemoteBlockOutputStream.h>
 
-#include <DB/Client/Connection.h>
+#include <Client/Connection.h>
 #include <common/logger_useful.h>
 
-#include <DB/Common/NetException.h>
+#include <Common/NetException.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/RemoteBlockOutputStream.h b/dbms/src/DataStreams/RemoteBlockOutputStream.h
similarity index 92%
rename from dbms/include/DB/DataStreams/RemoteBlockOutputStream.h
rename to dbms/src/DataStreams/RemoteBlockOutputStream.h
index 47a42464757..33b3af86754 100644
--- a/dbms/include/DB/DataStreams/RemoteBlockOutputStream.h
+++ b/dbms/src/DataStreams/RemoteBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/RemoveColumnsBlockInputStream.h b/dbms/src/DataStreams/RemoveColumnsBlockInputStream.h
similarity index 92%
rename from dbms/include/DB/DataStreams/RemoveColumnsBlockInputStream.h
rename to dbms/src/DataStreams/RemoveColumnsBlockInputStream.h
index 214aaa3181f..922e442b67c 100644
--- a/dbms/include/DB/DataStreams/RemoveColumnsBlockInputStream.h
+++ b/dbms/src/DataStreams/RemoveColumnsBlockInputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Columns/ColumnConst.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Columns/ColumnConst.h>
 
 
 
diff --git a/dbms/src/DataStreams/ReplacingSortedBlockInputStream.cpp b/dbms/src/DataStreams/ReplacingSortedBlockInputStream.cpp
index 2bd8d7c3340..fb2d314de2b 100644
--- a/dbms/src/DataStreams/ReplacingSortedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/ReplacingSortedBlockInputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/DataStreams/ReplacingSortedBlockInputStream.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <DataStreams/ReplacingSortedBlockInputStream.h>
+#include <Columns/ColumnsNumber.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/ReplacingSortedBlockInputStream.h b/dbms/src/DataStreams/ReplacingSortedBlockInputStream.h
similarity index 97%
rename from dbms/include/DB/DataStreams/ReplacingSortedBlockInputStream.h
rename to dbms/src/DataStreams/ReplacingSortedBlockInputStream.h
index 389d4403a2e..c7c1625f5e5 100644
--- a/dbms/include/DB/DataStreams/ReplacingSortedBlockInputStream.h
+++ b/dbms/src/DataStreams/ReplacingSortedBlockInputStream.h
@@ -2,7 +2,7 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/DataStreams/MergingSortedBlockInputStream.h>
+#include <DataStreams/MergingSortedBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/SquashingBlockInputStream.cpp b/dbms/src/DataStreams/SquashingBlockInputStream.cpp
index bc17a3f2493..3759ba1d1a3 100644
--- a/dbms/src/DataStreams/SquashingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/SquashingBlockInputStream.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataStreams/SquashingBlockInputStream.h>
+#include <DataStreams/SquashingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/SquashingBlockInputStream.h b/dbms/src/DataStreams/SquashingBlockInputStream.h
similarity index 86%
rename from dbms/include/DB/DataStreams/SquashingBlockInputStream.h
rename to dbms/src/DataStreams/SquashingBlockInputStream.h
index 4dca70e5255..7d2583d35ba 100644
--- a/dbms/include/DB/DataStreams/SquashingBlockInputStream.h
+++ b/dbms/src/DataStreams/SquashingBlockInputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/SquashingTransform.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/SquashingTransform.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/SquashingBlockOutputStream.cpp b/dbms/src/DataStreams/SquashingBlockOutputStream.cpp
index dcec839b070..2826f1efb56 100644
--- a/dbms/src/DataStreams/SquashingBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/SquashingBlockOutputStream.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataStreams/SquashingBlockOutputStream.h>
+#include <DataStreams/SquashingBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/SquashingBlockOutputStream.h b/dbms/src/DataStreams/SquashingBlockOutputStream.h
similarity index 85%
rename from dbms/include/DB/DataStreams/SquashingBlockOutputStream.h
rename to dbms/src/DataStreams/SquashingBlockOutputStream.h
index 157290387ba..895356638fa 100644
--- a/dbms/include/DB/DataStreams/SquashingBlockOutputStream.h
+++ b/dbms/src/DataStreams/SquashingBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/SquashingTransform.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/SquashingTransform.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/SquashingTransform.cpp b/dbms/src/DataStreams/SquashingTransform.cpp
index 4ac6d84faf4..66ebcbf3767 100644
--- a/dbms/src/DataStreams/SquashingTransform.cpp
+++ b/dbms/src/DataStreams/SquashingTransform.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataStreams/SquashingTransform.h>
+#include <DataStreams/SquashingTransform.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/SquashingTransform.h b/dbms/src/DataStreams/SquashingTransform.h
similarity index 98%
rename from dbms/include/DB/DataStreams/SquashingTransform.h
rename to dbms/src/DataStreams/SquashingTransform.h
index b4078ed2c33..213fccc9df8 100644
--- a/dbms/include/DB/DataStreams/SquashingTransform.h
+++ b/dbms/src/DataStreams/SquashingTransform.h
@@ -1,4 +1,4 @@
-#include <DB/Core/Block.h>
+#include <Core/Block.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp b/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp
index 7bba509dcf3..6ca6434611b 100644
--- a/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp
+++ b/dbms/src/DataStreams/SummingSortedBlockInputStream.cpp
@@ -1,8 +1,8 @@
-#include <DB/DataStreams/SummingSortedBlockInputStream.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Core/FieldVisitors.h>
+#include <DataStreams/SummingSortedBlockInputStream.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Common/StringUtils.h>
+#include <Core/FieldVisitors.h>
 #include <common/logger_useful.h>
 
 
diff --git a/dbms/include/DB/DataStreams/SummingSortedBlockInputStream.h b/dbms/src/DataStreams/SummingSortedBlockInputStream.h
similarity index 98%
rename from dbms/include/DB/DataStreams/SummingSortedBlockInputStream.h
rename to dbms/src/DataStreams/SummingSortedBlockInputStream.h
index cb52e87ced0..387506d9869 100644
--- a/dbms/include/DB/DataStreams/SummingSortedBlockInputStream.h
+++ b/dbms/src/DataStreams/SummingSortedBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Row.h>
-#include <DB/Core/ColumnNumbers.h>
-#include <DB/DataStreams/MergingSortedBlockInputStream.h>
+#include <Core/Row.h>
+#include <Core/ColumnNumbers.h>
+#include <DataStreams/MergingSortedBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/TSKVRowInputStream.cpp b/dbms/src/DataStreams/TSKVRowInputStream.cpp
index abcead1f675..cf0d639df00 100644
--- a/dbms/src/DataStreams/TSKVRowInputStream.cpp
+++ b/dbms/src/DataStreams/TSKVRowInputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/DataStreams/TSKVRowInputStream.h>
+#include <IO/ReadHelpers.h>
+#include <DataStreams/TSKVRowInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/TSKVRowInputStream.h b/dbms/src/DataStreams/TSKVRowInputStream.h
similarity index 94%
rename from dbms/include/DB/DataStreams/TSKVRowInputStream.h
rename to dbms/src/DataStreams/TSKVRowInputStream.h
index 2ecea531c27..438705833e5 100644
--- a/dbms/include/DB/DataStreams/TSKVRowInputStream.h
+++ b/dbms/src/DataStreams/TSKVRowInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IRowInputStream.h>
-#include <DB/Common/HashTable/HashMap.h>
+#include <Core/Block.h>
+#include <DataStreams/IRowInputStream.h>
+#include <Common/HashTable/HashMap.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/TSKVRowOutputStream.cpp b/dbms/src/DataStreams/TSKVRowOutputStream.cpp
index 21ecdbdf182..43a27d4dddc 100644
--- a/dbms/src/DataStreams/TSKVRowOutputStream.cpp
+++ b/dbms/src/DataStreams/TSKVRowOutputStream.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/TSKVRowOutputStream.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/TSKVRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/TSKVRowOutputStream.h b/dbms/src/DataStreams/TSKVRowOutputStream.h
similarity index 92%
rename from dbms/include/DB/DataStreams/TSKVRowOutputStream.h
rename to dbms/src/DataStreams/TSKVRowOutputStream.h
index d1e12f74eed..8d1c7d05a62 100644
--- a/dbms/include/DB/DataStreams/TSKVRowOutputStream.h
+++ b/dbms/src/DataStreams/TSKVRowOutputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/TabSeparatedBlockOutputStream.cpp b/dbms/src/DataStreams/TabSeparatedBlockOutputStream.cpp
index 8df7b2773d9..63992a2a860 100644
--- a/dbms/src/DataStreams/TabSeparatedBlockOutputStream.cpp
+++ b/dbms/src/DataStreams/TabSeparatedBlockOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/WriteBuffer.h>
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/TabSeparatedBlockOutputStream.h>
+#include <IO/WriteBuffer.h>
+#include <Core/Block.h>
+#include <DataStreams/TabSeparatedBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/TabSeparatedBlockOutputStream.h b/dbms/src/DataStreams/TabSeparatedBlockOutputStream.h
similarity index 92%
rename from dbms/include/DB/DataStreams/TabSeparatedBlockOutputStream.h
rename to dbms/src/DataStreams/TabSeparatedBlockOutputStream.h
index 8afbc3f206a..af991fb507b 100644
--- a/dbms/include/DB/DataStreams/TabSeparatedBlockOutputStream.h
+++ b/dbms/src/DataStreams/TabSeparatedBlockOutputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/TabSeparatedRawRowOutputStream.h b/dbms/src/DataStreams/TabSeparatedRawRowOutputStream.h
similarity index 92%
rename from dbms/include/DB/DataStreams/TabSeparatedRawRowOutputStream.h
rename to dbms/src/DataStreams/TabSeparatedRawRowOutputStream.h
index 9cdabc49850..3f6b152e275 100644
--- a/dbms/include/DB/DataStreams/TabSeparatedRawRowOutputStream.h
+++ b/dbms/src/DataStreams/TabSeparatedRawRowOutputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/TabSeparatedRowInputStream.cpp b/dbms/src/DataStreams/TabSeparatedRowInputStream.cpp
index a5b451de632..3060bb77188 100644
--- a/dbms/src/DataStreams/TabSeparatedRowInputStream.cpp
+++ b/dbms/src/DataStreams/TabSeparatedRowInputStream.cpp
@@ -1,9 +1,9 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/Operators.h>
+#include <IO/ReadHelpers.h>
+#include <IO/Operators.h>
 
-#include <DB/DataStreams/TabSeparatedRowInputStream.h>
-#include <DB/DataStreams/verbosePrintString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataStreams/TabSeparatedRowInputStream.h>
+#include <DataStreams/verbosePrintString.h>
+#include <DataTypes/DataTypesNumber.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/TabSeparatedRowInputStream.h b/dbms/src/DataStreams/TabSeparatedRowInputStream.h
similarity index 95%
rename from dbms/include/DB/DataStreams/TabSeparatedRowInputStream.h
rename to dbms/src/DataStreams/TabSeparatedRowInputStream.h
index c32d1d7e600..bd186be734e 100644
--- a/dbms/include/DB/DataStreams/TabSeparatedRowInputStream.h
+++ b/dbms/src/DataStreams/TabSeparatedRowInputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IRowInputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/IRowInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/TabSeparatedRowOutputStream.cpp b/dbms/src/DataStreams/TabSeparatedRowOutputStream.cpp
index b8c5cf7153d..b0109fb1a88 100644
--- a/dbms/src/DataStreams/TabSeparatedRowOutputStream.cpp
+++ b/dbms/src/DataStreams/TabSeparatedRowOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
 
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/TabSeparatedRowOutputStream.h b/dbms/src/DataStreams/TabSeparatedRowOutputStream.h
similarity index 95%
rename from dbms/include/DB/DataStreams/TabSeparatedRowOutputStream.h
rename to dbms/src/DataStreams/TabSeparatedRowOutputStream.h
index 69e8af6f225..b8750a1e382 100644
--- a/dbms/include/DB/DataStreams/TabSeparatedRowOutputStream.h
+++ b/dbms/src/DataStreams/TabSeparatedRowOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <Core/Block.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp b/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp
index fc65866f31c..666f71d4940 100644
--- a/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp
+++ b/dbms/src/DataStreams/TotalsHavingBlockInputStream.cpp
@@ -1,8 +1,8 @@
-#include <DB/DataStreams/TotalsHavingBlockInputStream.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/AggregateDescription.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <DataStreams/TotalsHavingBlockInputStream.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/AggregateDescription.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnsNumber.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h b/dbms/src/DataStreams/TotalsHavingBlockInputStream.h
similarity index 97%
rename from dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h
rename to dbms/src/DataStreams/TotalsHavingBlockInputStream.h
index 238a5b8d74f..124dcedd006 100644
--- a/dbms/include/DB/DataStreams/TotalsHavingBlockInputStream.h
+++ b/dbms/src/DataStreams/TotalsHavingBlockInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/UnionBlockInputStream.h b/dbms/src/DataStreams/UnionBlockInputStream.h
similarity index 98%
rename from dbms/include/DB/DataStreams/UnionBlockInputStream.h
rename to dbms/src/DataStreams/UnionBlockInputStream.h
index caea11de67b..f988ef59bc4 100644
--- a/dbms/include/DB/DataStreams/UnionBlockInputStream.h
+++ b/dbms/src/DataStreams/UnionBlockInputStream.h
@@ -2,9 +2,9 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Common/ConcurrentBoundedQueue.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/ParallelInputsProcessor.h>
+#include <Common/ConcurrentBoundedQueue.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/ParallelInputsProcessor.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/ValuesRowInputStream.cpp b/dbms/src/DataStreams/ValuesRowInputStream.cpp
index 82496d50595..b39b9abf533 100644
--- a/dbms/src/DataStreams/ValuesRowInputStream.cpp
+++ b/dbms/src/DataStreams/ValuesRowInputStream.cpp
@@ -1,11 +1,11 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Interpreters/evaluateConstantExpression.h>
-#include <DB/Interpreters/convertFieldToType.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/DataStreams/ValuesRowInputStream.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Core/Block.h>
+#include <IO/ReadHelpers.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <DataStreams/ValuesRowInputStream.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Core/FieldVisitors.h>
+#include <Core/Block.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/ValuesRowInputStream.h b/dbms/src/DataStreams/ValuesRowInputStream.h
similarity index 94%
rename from dbms/include/DB/DataStreams/ValuesRowInputStream.h
rename to dbms/src/DataStreams/ValuesRowInputStream.h
index b159614f9f6..a48c825dae6 100644
--- a/dbms/include/DB/DataStreams/ValuesRowInputStream.h
+++ b/dbms/src/DataStreams/ValuesRowInputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IRowInputStream.h>
+#include <DataStreams/IRowInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/ValuesRowOutputStream.cpp b/dbms/src/DataStreams/ValuesRowOutputStream.cpp
index ecb4af0f48e..6ca1c9084b7 100644
--- a/dbms/src/DataStreams/ValuesRowOutputStream.cpp
+++ b/dbms/src/DataStreams/ValuesRowOutputStream.cpp
@@ -1,8 +1,8 @@
-#include <DB/DataStreams/ValuesRowOutputStream.h>
+#include <DataStreams/ValuesRowOutputStream.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Columns/IColumn.h>
-#include <DB/DataTypes/IDataType.h>
+#include <IO/WriteHelpers.h>
+#include <Columns/IColumn.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/ValuesRowOutputStream.h b/dbms/src/DataStreams/ValuesRowOutputStream.h
similarity index 93%
rename from dbms/include/DB/DataStreams/ValuesRowOutputStream.h
rename to dbms/src/DataStreams/ValuesRowOutputStream.h
index 499bcbae58c..2e0a9f63957 100644
--- a/dbms/include/DB/DataStreams/ValuesRowOutputStream.h
+++ b/dbms/src/DataStreams/ValuesRowOutputStream.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/VerticalRowOutputStream.cpp b/dbms/src/DataStreams/VerticalRowOutputStream.cpp
index 1922c1b5ef8..9e2bec95336 100644
--- a/dbms/src/DataStreams/VerticalRowOutputStream.cpp
+++ b/dbms/src/DataStreams/VerticalRowOutputStream.cpp
@@ -1,10 +1,10 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/VerticalRowOutputStream.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/VerticalRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/VerticalRowOutputStream.h b/dbms/src/DataStreams/VerticalRowOutputStream.h
similarity index 92%
rename from dbms/include/DB/DataStreams/VerticalRowOutputStream.h
rename to dbms/src/DataStreams/VerticalRowOutputStream.h
index 702f0459384..98e440a6b15 100644
--- a/dbms/include/DB/DataStreams/VerticalRowOutputStream.h
+++ b/dbms/src/DataStreams/VerticalRowOutputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/Core/Names.h>
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <Core/Block.h>
+#include <Core/Names.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/XMLRowOutputStream.cpp b/dbms/src/DataStreams/XMLRowOutputStream.cpp
index 0d624d0162a..573920ff812 100644
--- a/dbms/src/DataStreams/XMLRowOutputStream.cpp
+++ b/dbms/src/DataStreams/XMLRowOutputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/WriteBufferValidUTF8.h>
-#include <DB/DataStreams/XMLRowOutputStream.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferValidUTF8.h>
+#include <DataStreams/XMLRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/XMLRowOutputStream.h b/dbms/src/DataStreams/XMLRowOutputStream.h
similarity index 91%
rename from dbms/include/DB/DataStreams/XMLRowOutputStream.h
rename to dbms/src/DataStreams/XMLRowOutputStream.h
index 36d69fc5d33..a412461b616 100644
--- a/dbms/include/DB/DataStreams/XMLRowOutputStream.h
+++ b/dbms/src/DataStreams/XMLRowOutputStream.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/Core/Progress.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/DataStreams/IRowOutputStream.h>
+#include <Core/Block.h>
+#include <Core/Progress.h>
+#include <IO/WriteBuffer.h>
+#include <Common/Stopwatch.h>
+#include <DataStreams/IRowOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/copyData.cpp b/dbms/src/DataStreams/copyData.cpp
index a64fbb827e7..dcf908b1f9a 100644
--- a/dbms/src/DataStreams/copyData.cpp
+++ b/dbms/src/DataStreams/copyData.cpp
@@ -1,6 +1,6 @@
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/copyData.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/copyData.h b/dbms/src/DataStreams/copyData.h
similarity index 100%
rename from dbms/include/DB/DataStreams/copyData.h
rename to dbms/src/DataStreams/copyData.h
diff --git a/dbms/src/DataStreams/glueBlockInputStreams.cpp b/dbms/src/DataStreams/glueBlockInputStreams.cpp
index 9e9d096907a..e07d898d57c 100644
--- a/dbms/src/DataStreams/glueBlockInputStreams.cpp
+++ b/dbms/src/DataStreams/glueBlockInputStreams.cpp
@@ -1,6 +1,6 @@
 #include <set>
 
-#include <DB/DataStreams/glueBlockInputStreams.h>
+#include <DataStreams/glueBlockInputStreams.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/glueBlockInputStreams.h b/dbms/src/DataStreams/glueBlockInputStreams.h
similarity index 93%
rename from dbms/include/DB/DataStreams/glueBlockInputStreams.h
rename to dbms/src/DataStreams/glueBlockInputStreams.h
index 60253e8bb3e..f3a084f724c 100644
--- a/dbms/include/DB/DataStreams/glueBlockInputStreams.h
+++ b/dbms/src/DataStreams/glueBlockInputStreams.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/ForkBlockInputStreams.h>
+#include <DataStreams/ForkBlockInputStreams.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/narrowBlockInputStreams.cpp b/dbms/src/DataStreams/narrowBlockInputStreams.cpp
index 7ed762e6412..567ef97c20a 100644
--- a/dbms/src/DataStreams/narrowBlockInputStreams.cpp
+++ b/dbms/src/DataStreams/narrowBlockInputStreams.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataStreams/ConcatBlockInputStream.h>
+#include <DataStreams/ConcatBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/narrowBlockInputStreams.h b/dbms/src/DataStreams/narrowBlockInputStreams.h
similarity index 94%
rename from dbms/include/DB/DataStreams/narrowBlockInputStreams.h
rename to dbms/src/DataStreams/narrowBlockInputStreams.h
index 8425142c612..b8fbd77cc75 100644
--- a/dbms/include/DB/DataStreams/narrowBlockInputStreams.h
+++ b/dbms/src/DataStreams/narrowBlockInputStreams.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockInputStream.h>
+#include <DataStreams/IBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/DataStreams/tests/aggregating_stream.cpp b/dbms/src/DataStreams/tests/aggregating_stream.cpp
index 9d7881ebc9f..4a2d12c90e6 100644
--- a/dbms/src/DataStreams/tests/aggregating_stream.cpp
+++ b/dbms/src/DataStreams/tests/aggregating_stream.cpp
@@ -1,22 +1,22 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
 
-#include <DB/DataStreams/IBlockInputStream.h>
-#include <DB/DataStreams/AggregatingBlockInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/IBlockInputStream.h>
+#include <DataStreams/AggregatingBlockInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/DataStreams/tests/block_row_transforms.cpp b/dbms/src/DataStreams/tests/block_row_transforms.cpp
index ce3401c1d39..ad3d4606a04 100644
--- a/dbms/src/DataStreams/tests/block_row_transforms.cpp
+++ b/dbms/src/DataStreams/tests/block_row_transforms.cpp
@@ -3,20 +3,20 @@
 #include <iostream>
 #include <fstream>
 
-#include <DB/Core/Block.h>
-#include <DB/Core/ColumnWithTypeAndName.h>
+#include <Core/Block.h>
+#include <Core/ColumnWithTypeAndName.h>
 
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/DataStreams/TabSeparatedRowInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/BlockInputStreamFromRowInputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/TabSeparatedRowInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/BlockInputStreamFromRowInputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/DataStreams/tests/block_tab_separated_streams.cpp b/dbms/src/DataStreams/tests/block_tab_separated_streams.cpp
index f66ecfc8a2c..b7be184df47 100644
--- a/dbms/src/DataStreams/tests/block_tab_separated_streams.cpp
+++ b/dbms/src/DataStreams/tests/block_tab_separated_streams.cpp
@@ -2,20 +2,20 @@
 #include <list>
 #include <iostream>
 
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeDateTime.h>
 
-#include <DB/DataStreams/TabSeparatedRowInputStream.h>
-#include <DB/DataStreams/TabSeparatedBlockOutputStream.h>
-#include <DB/DataStreams/BlockInputStreamFromRowInputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/TabSeparatedRowInputStream.h>
+#include <DataStreams/TabSeparatedBlockOutputStream.h>
+#include <DataStreams/BlockInputStreamFromRowInputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/Storages/StorageLog.h>
+#include <Storages/StorageLog.h>
 
 
 using namespace DB;
diff --git a/dbms/src/DataStreams/tests/collapsing_sorted_stream.cpp b/dbms/src/DataStreams/tests/collapsing_sorted_stream.cpp
index 1f1b986cfae..958744b145e 100644
--- a/dbms/src/DataStreams/tests/collapsing_sorted_stream.cpp
+++ b/dbms/src/DataStreams/tests/collapsing_sorted_stream.cpp
@@ -3,16 +3,16 @@
 
 #include <Poco/ConsoleChannel.h>
 
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
 
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/CollapsingSortedBlockInputStream.h>
-#include <DB/DataStreams/CollapsingFinalBlockInputStream.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/Interpreters/Context.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/CollapsingSortedBlockInputStream.h>
+#include <DataStreams/CollapsingFinalBlockInputStream.h>
+#include <DataStreams/copyData.h>
+#include <Interpreters/Context.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesNumber.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/DataStreams/tests/expression_stream.cpp b/dbms/src/DataStreams/tests/expression_stream.cpp
index c36eaf967b4..30c2dfd9355 100644
--- a/dbms/src/DataStreams/tests/expression_stream.cpp
+++ b/dbms/src/DataStreams/tests/expression_stream.cpp
@@ -1,24 +1,24 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/Storages/System/StorageSystemNumbers.h>
+#include <Storages/System/StorageSystemNumbers.h>
 
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/ExpressionBlockInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/parseQuery.h>
 
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/Context.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/DataStreams/tests/filter_stream.cpp b/dbms/src/DataStreams/tests/filter_stream.cpp
index d5d86c950d2..a0480814c6d 100644
--- a/dbms/src/DataStreams/tests/filter_stream.cpp
+++ b/dbms/src/DataStreams/tests/filter_stream.cpp
@@ -1,26 +1,26 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/Storages/System/StorageSystemNumbers.h>
+#include <Storages/System/StorageSystemNumbers.h>
 
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/ExpressionBlockInputStream.h>
-#include <DB/DataStreams/FilterBlockInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/FilterBlockInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
 
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/Context.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp b/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp
index ad641409feb..04f5936addd 100644
--- a/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp
+++ b/dbms/src/DataStreams/tests/filter_stream_hitlog.cpp
@@ -1,30 +1,30 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/Storages/StorageLog.h>
+#include <Storages/StorageLog.h>
 
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/ExpressionBlockInputStream.h>
-#include <DB/DataStreams/FilterBlockInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/FilterBlockInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
 
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
 
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/Context.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/DataStreams/tests/fork_streams.cpp b/dbms/src/DataStreams/tests/fork_streams.cpp
index 95f30370207..474b993bf0f 100644
--- a/dbms/src/DataStreams/tests/fork_streams.cpp
+++ b/dbms/src/DataStreams/tests/fork_streams.cpp
@@ -2,26 +2,26 @@
 #include <iomanip>
 #include <thread>
 
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/Storages/System/StorageSystemNumbers.h>
+#include <Storages/System/StorageSystemNumbers.h>
 
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/ExpressionBlockInputStream.h>
-#include <DB/DataStreams/FilterBlockInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/ForkBlockInputStreams.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/FilterBlockInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/ForkBlockInputStreams.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/formatAST.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/formatAST.h>
 
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/Context.h>
 
 
 void thread1(DB::BlockInputStreamPtr in, DB::BlockOutputStreamPtr out, DB::WriteBuffer & out_buf)
diff --git a/dbms/src/DataStreams/tests/glue_streams.cpp b/dbms/src/DataStreams/tests/glue_streams.cpp
index 0f6e2668d11..cda399d828d 100644
--- a/dbms/src/DataStreams/tests/glue_streams.cpp
+++ b/dbms/src/DataStreams/tests/glue_streams.cpp
@@ -1,14 +1,14 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/Common/ThreadPool.h>
+#include <Common/ThreadPool.h>
 
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
 
-#include <DB/Interpreters/loadMetadata.h>
-#include <DB/Interpreters/executeQuery.h>
+#include <Interpreters/loadMetadata.h>
+#include <Interpreters/executeQuery.h>
 
-#include <DB/DataStreams/glueBlockInputStreams.h>
+#include <DataStreams/glueBlockInputStreams.h>
 
 
 using namespace DB;
diff --git a/dbms/src/DataStreams/tests/json_streams.cpp b/dbms/src/DataStreams/tests/json_streams.cpp
index 012e77b5360..dfd1978320e 100644
--- a/dbms/src/DataStreams/tests/json_streams.cpp
+++ b/dbms/src/DataStreams/tests/json_streams.cpp
@@ -3,23 +3,23 @@
 #include <iostream>
 #include <fstream>
 
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeDateTime.h>
 
-#include <DB/DataStreams/TabSeparatedRowInputStream.h>
-#include <DB/DataStreams/TabSeparatedBlockOutputStream.h>
-#include <DB/DataStreams/JSONRowOutputStream.h>
-#include <DB/DataStreams/JSONCompactRowOutputStream.h>
-#include <DB/DataStreams/BlockInputStreamFromRowInputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/TabSeparatedRowInputStream.h>
+#include <DataStreams/TabSeparatedBlockOutputStream.h>
+#include <DataStreams/JSONRowOutputStream.h>
+#include <DataStreams/JSONCompactRowOutputStream.h>
+#include <DataStreams/BlockInputStreamFromRowInputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/Storages/StorageLog.h>
+#include <Storages/StorageLog.h>
 
 
 using namespace DB;
diff --git a/dbms/src/DataStreams/tests/native_streams.cpp b/dbms/src/DataStreams/tests/native_streams.cpp
index 875d5d56705..58e5d85305d 100644
--- a/dbms/src/DataStreams/tests/native_streams.cpp
+++ b/dbms/src/DataStreams/tests/native_streams.cpp
@@ -3,24 +3,24 @@
 #include <iostream>
 #include <fstream>
 
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/CompressedWriteBuffer.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeDateTime.h>
 
-#include <DB/DataStreams/NativeBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/NativeBlockOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/Storages/StorageLog.h>
+#include <Storages/StorageLog.h>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Common/ClickHouseRevision.h>
+#include <Interpreters/Context.h>
+#include <Common/ClickHouseRevision.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/DataStreams/tests/sorting_stream.cpp b/dbms/src/DataStreams/tests/sorting_stream.cpp
index b39cefbc8b7..13b9fe6ff69 100644
--- a/dbms/src/DataStreams/tests/sorting_stream.cpp
+++ b/dbms/src/DataStreams/tests/sorting_stream.cpp
@@ -1,29 +1,29 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/Storages/StorageLog.h>
+#include <Storages/StorageLog.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeDateTime.h>
 
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/PartialSortingBlockInputStream.h>
-#include <DB/DataStreams/MergeSortingBlockInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/PartialSortingBlockInputStream.h>
+#include <DataStreams/MergeSortingBlockInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/formatAST.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/formatAST.h>
 
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/Context.h>
 
 
 using namespace DB;
diff --git a/dbms/src/DataStreams/tests/tab_separated_streams.cpp b/dbms/src/DataStreams/tests/tab_separated_streams.cpp
index 66778295d8d..233b2b4a7d4 100644
--- a/dbms/src/DataStreams/tests/tab_separated_streams.cpp
+++ b/dbms/src/DataStreams/tests/tab_separated_streams.cpp
@@ -3,15 +3,15 @@
 #include <iostream>
 #include <fstream>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataStreams/TabSeparatedRowInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/DataStreams/BlockInputStreamFromRowInputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataStreams/TabSeparatedRowInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/copyData.h>
+#include <DataStreams/BlockInputStreamFromRowInputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
 
 
 using namespace DB;
diff --git a/dbms/src/DataStreams/tests/union_stream.cpp b/dbms/src/DataStreams/tests/union_stream.cpp
index e2de59a5467..b0f0fa1ee53 100644
--- a/dbms/src/DataStreams/tests/union_stream.cpp
+++ b/dbms/src/DataStreams/tests/union_stream.cpp
@@ -1,23 +1,23 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
 
-#include <DB/Storages/System/StorageSystemNumbers.h>
+#include <Storages/System/StorageSystemNumbers.h>
 
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/UnionBlockInputStream.h>
-#include <DB/DataStreams/BlockExtraInfoInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/UnionBlockInputStream.h>
+#include <DataStreams/BlockExtraInfoInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
 
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/Context.h>
 
 
 using namespace DB;
diff --git a/dbms/src/DataStreams/tests/union_stream2.cpp b/dbms/src/DataStreams/tests/union_stream2.cpp
index db58f3e65ce..ac1598f1892 100644
--- a/dbms/src/DataStreams/tests/union_stream2.cpp
+++ b/dbms/src/DataStreams/tests/union_stream2.cpp
@@ -1,20 +1,20 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
 
-#include <DB/Storages/System/StorageSystemNumbers.h>
+#include <Storages/System/StorageSystemNumbers.h>
 
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/UnionBlockInputStream.h>
-#include <DB/DataStreams/AsynchronousBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/UnionBlockInputStream.h>
+#include <DataStreams/AsynchronousBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/loadMetadata.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/loadMetadata.h>
 
 
 using namespace DB;
diff --git a/dbms/src/DataStreams/verbosePrintString.cpp b/dbms/src/DataStreams/verbosePrintString.cpp
index 64aff17aa4b..67e3c7c264e 100644
--- a/dbms/src/DataStreams/verbosePrintString.cpp
+++ b/dbms/src/DataStreams/verbosePrintString.cpp
@@ -1,5 +1,5 @@
-#include <DB/DataStreams/verbosePrintString.h>
-#include <DB/IO/Operators.h>
+#include <DataStreams/verbosePrintString.h>
+#include <IO/Operators.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataStreams/verbosePrintString.h b/dbms/src/DataStreams/verbosePrintString.h
similarity index 89%
rename from dbms/include/DB/DataStreams/verbosePrintString.h
rename to dbms/src/DataStreams/verbosePrintString.h
index e006d8f022d..0da501a4bf1 100644
--- a/dbms/include/DB/DataStreams/verbosePrintString.h
+++ b/dbms/src/DataStreams/verbosePrintString.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/IO/WriteBuffer.h>
+#include <IO/WriteBuffer.h>
 
 namespace DB
 {
diff --git a/dbms/src/DataTypes/DataTypeAggregateFunction.cpp b/dbms/src/DataTypes/DataTypeAggregateFunction.cpp
index 0378105b95e..d5ae501f8f0 100644
--- a/dbms/src/DataTypes/DataTypeAggregateFunction.cpp
+++ b/dbms/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -1,12 +1,12 @@
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/Columns/ColumnAggregateFunction.h>
-#include <DB/Columns/ColumnConstAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnConstAggregateFunction.h>
 
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeAggregateFunction.h b/dbms/src/DataTypes/DataTypeAggregateFunction.h
similarity index 97%
rename from dbms/include/DB/DataTypes/DataTypeAggregateFunction.h
rename to dbms/src/DataTypes/DataTypeAggregateFunction.h
index 73256ce6bc9..f7eb89aba20 100644
--- a/dbms/include/DB/DataTypes/DataTypeAggregateFunction.h
+++ b/dbms/src/DataTypes/DataTypeAggregateFunction.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeArray.cpp b/dbms/src/DataTypes/DataTypeArray.cpp
index 34ba4ee90ad..354851e767d 100644
--- a/dbms/src/DataTypes/DataTypeArray.cpp
+++ b/dbms/src/DataTypes/DataTypeArray.cpp
@@ -1,13 +1,13 @@
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
 
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromString.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeArray.h b/dbms/src/DataTypes/DataTypeArray.h
similarity index 98%
rename from dbms/include/DB/DataTypes/DataTypeArray.h
rename to dbms/src/DataTypes/DataTypeArray.h
index c49df603dd5..1057dfba9ee 100644
--- a/dbms/include/DB/DataTypes/DataTypeArray.h
+++ b/dbms/src/DataTypes/DataTypeArray.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
-#include <DB/DataTypes/EnrichedDataTypePtr.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/EnrichedDataTypePtr.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeDate.cpp b/dbms/src/DataTypes/DataTypeDate.cpp
index 8ff5cad7869..7ca9ca72cd6 100644
--- a/dbms/src/DataTypes/DataTypeDate.cpp
+++ b/dbms/src/DataTypes/DataTypeDate.cpp
@@ -1,8 +1,8 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeDate.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeDate.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeDate.h b/dbms/src/DataTypes/DataTypeDate.h
similarity index 96%
rename from dbms/include/DB/DataTypes/DataTypeDate.h
rename to dbms/src/DataTypes/DataTypeDate.h
index c770c3e24d1..582cffb9c44 100644
--- a/dbms/include/DB/DataTypes/DataTypeDate.h
+++ b/dbms/src/DataTypes/DataTypeDate.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeNumberBase.h>
+#include <DataTypes/DataTypeNumberBase.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeDateTime.cpp b/dbms/src/DataTypes/DataTypeDateTime.cpp
index 03afb71633c..94624c9e789 100644
--- a/dbms/src/DataTypes/DataTypeDateTime.cpp
+++ b/dbms/src/DataTypes/DataTypeDateTime.cpp
@@ -1,8 +1,8 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeDateTime.h b/dbms/src/DataTypes/DataTypeDateTime.h
similarity index 96%
rename from dbms/include/DB/DataTypes/DataTypeDateTime.h
rename to dbms/src/DataTypes/DataTypeDateTime.h
index 10ba81ce754..81de9750dc0 100644
--- a/dbms/include/DB/DataTypes/DataTypeDateTime.h
+++ b/dbms/src/DataTypes/DataTypeDateTime.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeNumberBase.h>
+#include <DataTypes/DataTypeNumberBase.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeEnum.cpp b/dbms/src/DataTypes/DataTypeEnum.cpp
index b9770cc268b..c963ef53ed6 100644
--- a/dbms/src/DataTypes/DataTypeEnum.cpp
+++ b/dbms/src/DataTypes/DataTypeEnum.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/DataTypes/DataTypeEnum.h>
+#include <IO/WriteBufferFromString.h>
+#include <DataTypes/DataTypeEnum.h>
 
 #include <limits>
 
diff --git a/dbms/include/DB/DataTypes/DataTypeEnum.h b/dbms/src/DataTypes/DataTypeEnum.h
similarity index 96%
rename from dbms/include/DB/DataTypes/DataTypeEnum.h
rename to dbms/src/DataTypes/DataTypeEnum.h
index 98a3fbff16f..24d0469185c 100644
--- a/dbms/include/DB/DataTypes/DataTypeEnum.h
+++ b/dbms/src/DataTypes/DataTypeEnum.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Common/HashTable/HashMap.h>
+#include <DataTypes/IDataType.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
+#include <Common/HashTable/HashMap.h>
 #include <vector>
 #include <unordered_map>
 
diff --git a/dbms/src/DataTypes/DataTypeExpression.cpp b/dbms/src/DataTypes/DataTypeExpression.cpp
index f3251284eb2..32ab923c5fa 100644
--- a/dbms/src/DataTypes/DataTypeExpression.cpp
+++ b/dbms/src/DataTypes/DataTypeExpression.cpp
@@ -1,4 +1,4 @@
-#include <DB/DataTypes/DataTypeExpression.h>
+#include <DataTypes/DataTypeExpression.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeExpression.h b/dbms/src/DataTypes/DataTypeExpression.h
similarity index 95%
rename from dbms/include/DB/DataTypes/DataTypeExpression.h
rename to dbms/src/DataTypes/DataTypeExpression.h
index 49c7b285b29..57fcbcd231a 100644
--- a/dbms/include/DB/DataTypes/DataTypeExpression.h
+++ b/dbms/src/DataTypes/DataTypeExpression.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataTypeDummy.h>
+#include <DataTypes/IDataTypeDummy.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeFactory.cpp b/dbms/src/DataTypes/DataTypeFactory.cpp
index 43bacde15ac..3fb29ca5089 100644
--- a/dbms/src/DataTypes/DataTypeFactory.cpp
+++ b/dbms/src/DataTypes/DataTypeFactory.cpp
@@ -1,30 +1,30 @@
-#include <DB/IO/ReadHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeNull.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeNull.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeFactory.h>
 
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
 
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTNameTypePair.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTEnumElement.h>
-#include <DB/Parsers/ParserEnumElement.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/DataTypes/DataTypeEnum.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTNameTypePair.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTEnumElement.h>
+#include <Parsers/ParserEnumElement.h>
+#include <Parsers/parseQuery.h>
+#include <DataTypes/DataTypeEnum.h>
 
 #include <ext/map.hpp>
 
diff --git a/dbms/include/DB/DataTypes/DataTypeFactory.h b/dbms/src/DataTypes/DataTypeFactory.h
similarity index 95%
rename from dbms/include/DB/DataTypes/DataTypeFactory.h
rename to dbms/src/DataTypes/DataTypeFactory.h
index f406fbd06c0..8962346f5cc 100644
--- a/dbms/include/DB/DataTypes/DataTypeFactory.h
+++ b/dbms/src/DataTypes/DataTypeFactory.h
@@ -3,7 +3,7 @@
 #include <map>
 #include <common/singleton.h>
 #include <Poco/RegularExpression.h>
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeFixedString.cpp b/dbms/src/DataTypes/DataTypeFixedString.cpp
index 77fb4c06bf1..ebb6e9c8836 100644
--- a/dbms/src/DataTypes/DataTypeFixedString.cpp
+++ b/dbms/src/DataTypes/DataTypeFixedString.cpp
@@ -1,15 +1,15 @@
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
 
-#include <DB/DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeFixedString.h>
 
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/VarInt.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/VarInt.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeFixedString.h b/dbms/src/DataTypes/DataTypeFixedString.h
similarity index 98%
rename from dbms/include/DB/DataTypes/DataTypeFixedString.h
rename to dbms/src/DataTypes/DataTypeFixedString.h
index 4936a6c1573..bb873d96e3e 100644
--- a/dbms/include/DB/DataTypes/DataTypeFixedString.h
+++ b/dbms/src/DataTypes/DataTypeFixedString.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeNested.cpp b/dbms/src/DataTypes/DataTypeNested.cpp
index 4ba16a0ae4f..1603bb4b313 100644
--- a/dbms/src/DataTypes/DataTypeNested.cpp
+++ b/dbms/src/DataTypes/DataTypeNested.cpp
@@ -1,9 +1,9 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/WriteBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferFromString.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNested.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeNested.h b/dbms/src/DataTypes/DataTypeNested.h
similarity index 95%
rename from dbms/include/DB/DataTypes/DataTypeNested.h
rename to dbms/src/DataTypes/DataTypeNested.h
index 641f343a660..9fe2488397a 100644
--- a/dbms/include/DB/DataTypes/DataTypeNested.h
+++ b/dbms/src/DataTypes/DataTypeNested.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataTypes/IDataTypeDummy.h>
-#include <DB/Core/NamesAndTypes.h>
+#include <DataTypes/IDataTypeDummy.h>
+#include <Core/NamesAndTypes.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeNull.cpp b/dbms/src/DataTypes/DataTypeNull.cpp
index e2078ea11f9..019aa7d44de 100644
--- a/dbms/src/DataTypes/DataTypeNull.cpp
+++ b/dbms/src/DataTypes/DataTypeNull.cpp
@@ -1,11 +1,11 @@
-#include <DB/Columns/ColumnConst.h>
+#include <Columns/ColumnConst.h>
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/DataTypes/DataTypeNull.h>
+#include <DataTypes/DataTypeNull.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeNull.h b/dbms/src/DataTypes/DataTypeNull.h
similarity index 98%
rename from dbms/include/DB/DataTypes/DataTypeNull.h
rename to dbms/src/DataTypes/DataTypeNull.h
index c15831b2097..94c086bfb02 100644
--- a/dbms/include/DB/DataTypes/DataTypeNull.h
+++ b/dbms/src/DataTypes/DataTypeNull.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeNullable.cpp b/dbms/src/DataTypes/DataTypeNullable.cpp
index 4b6025888f8..e8993eabaa4 100644
--- a/dbms/src/DataTypes/DataTypeNullable.cpp
+++ b/dbms/src/DataTypes/DataTypeNullable.cpp
@@ -1,11 +1,11 @@
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadBufferFromMemory.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ConcatReadBuffer.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Columns/ColumnNullable.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ConcatReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeNullable.h b/dbms/src/DataTypes/DataTypeNullable.h
similarity index 98%
rename from dbms/include/DB/DataTypes/DataTypeNullable.h
rename to dbms/src/DataTypes/DataTypeNullable.h
index 365fb7f6b3d..261c4341ec0 100644
--- a/dbms/include/DB/DataTypes/DataTypeNullable.h
+++ b/dbms/src/DataTypes/DataTypeNullable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 namespace DB
 {
diff --git a/dbms/src/DataTypes/DataTypeNumberBase.cpp b/dbms/src/DataTypes/DataTypeNumberBase.cpp
index 91394d18327..d7b354dade5 100644
--- a/dbms/src/DataTypes/DataTypeNumberBase.cpp
+++ b/dbms/src/DataTypes/DataTypeNumberBase.cpp
@@ -1,9 +1,9 @@
-#include <DB/DataTypes/DataTypeNumberBase.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/NaNUtils.h>
+#include <DataTypes/DataTypeNumberBase.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/NaNUtils.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeNumberBase.h b/dbms/src/DataTypes/DataTypeNumberBase.h
similarity index 98%
rename from dbms/include/DB/DataTypes/DataTypeNumberBase.h
rename to dbms/src/DataTypes/DataTypeNumberBase.h
index 403e53d3bdc..82edd483345 100644
--- a/dbms/include/DB/DataTypes/DataTypeNumberBase.h
+++ b/dbms/src/DataTypes/DataTypeNumberBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypeSet.h b/dbms/src/DataTypes/DataTypeSet.h
similarity index 92%
rename from dbms/include/DB/DataTypes/DataTypeSet.h
rename to dbms/src/DataTypes/DataTypeSet.h
index ef3f2817391..01da80bad7e 100644
--- a/dbms/include/DB/DataTypes/DataTypeSet.h
+++ b/dbms/src/DataTypes/DataTypeSet.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataTypeDummy.h>
+#include <DataTypes/IDataTypeDummy.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeString.cpp b/dbms/src/DataTypes/DataTypeString.cpp
index 8956447a576..b36366f8737 100644
--- a/dbms/src/DataTypes/DataTypeString.cpp
+++ b/dbms/src/DataTypes/DataTypeString.cpp
@@ -1,14 +1,14 @@
-#include <DB/Core/Defines.h>
+#include <Core/Defines.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
 
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/VarInt.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/VarInt.h>
 
 #if __SSE2__
     #include <emmintrin.h>
diff --git a/dbms/include/DB/DataTypes/DataTypeString.h b/dbms/src/DataTypes/DataTypeString.h
similarity index 98%
rename from dbms/include/DB/DataTypes/DataTypeString.h
rename to dbms/src/DataTypes/DataTypeString.h
index 2c28328d72c..37004dcfcd1 100644
--- a/dbms/include/DB/DataTypes/DataTypeString.h
+++ b/dbms/src/DataTypes/DataTypeString.h
@@ -2,7 +2,7 @@
 
 #include <ostream>
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/DataTypeTuple.cpp b/dbms/src/DataTypes/DataTypeTuple.cpp
index 33197c707d7..62610ee6107 100644
--- a/dbms/src/DataTypes/DataTypeTuple.cpp
+++ b/dbms/src/DataTypes/DataTypeTuple.cpp
@@ -1,8 +1,8 @@
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/DataStreams/NativeBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
-#include <DB/DataTypes/DataTypeTuple.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnConst.h>
+#include <DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/NativeBlockOutputStream.h>
+#include <DataTypes/DataTypeTuple.h>
 
 #include <ext/map.hpp>
 #include <ext/enumerate.hpp>
diff --git a/dbms/include/DB/DataTypes/DataTypeTuple.h b/dbms/src/DataTypes/DataTypeTuple.h
similarity index 98%
rename from dbms/include/DB/DataTypes/DataTypeTuple.h
rename to dbms/src/DataTypes/DataTypeTuple.h
index 0d5da142ac7..fc0cf6609f5 100644
--- a/dbms/include/DB/DataTypes/DataTypeTuple.h
+++ b/dbms/src/DataTypes/DataTypeTuple.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/DataTypesNumber.h b/dbms/src/DataTypes/DataTypesNumber.h
similarity index 93%
rename from dbms/include/DB/DataTypes/DataTypesNumber.h
rename to dbms/src/DataTypes/DataTypesNumber.h
index 3d51532f861..d6a9d289043 100644
--- a/dbms/include/DB/DataTypes/DataTypesNumber.h
+++ b/dbms/src/DataTypes/DataTypesNumber.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeNumberBase.h>
-#include <DB/DataTypes/IDataTypeDummy.h>
+#include <DataTypes/DataTypeNumberBase.h>
+#include <DataTypes/IDataTypeDummy.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/EnrichedDataTypePtr.h b/dbms/src/DataTypes/EnrichedDataTypePtr.h
similarity index 86%
rename from dbms/include/DB/DataTypes/EnrichedDataTypePtr.h
rename to dbms/src/DataTypes/EnrichedDataTypePtr.h
index 3e3160348a2..e56a78638b9 100644
--- a/dbms/include/DB/DataTypes/EnrichedDataTypePtr.h
+++ b/dbms/src/DataTypes/EnrichedDataTypePtr.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 #include <utility>
 
 namespace DB
diff --git a/dbms/src/DataTypes/FieldToDataType.cpp b/dbms/src/DataTypes/FieldToDataType.cpp
index 2f6fa0532ce..2dcbb13114b 100644
--- a/dbms/src/DataTypes/FieldToDataType.cpp
+++ b/dbms/src/DataTypes/FieldToDataType.cpp
@@ -1,13 +1,13 @@
-#include <DB/Core/FieldVisitors.h>
-#include <DB/DataTypes/FieldToDataType.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/DataTypes/DataTypeNull.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNull.h>
-#include <DB/Common/Exception.h>
+#include <Core/FieldVisitors.h>
+#include <DataTypes/FieldToDataType.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeNull.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNull.h>
+#include <Common/Exception.h>
 #include <ext/size.hpp>
 
 
diff --git a/dbms/include/DB/DataTypes/FieldToDataType.h b/dbms/src/DataTypes/FieldToDataType.h
similarity index 95%
rename from dbms/include/DB/DataTypes/FieldToDataType.h
rename to dbms/src/DataTypes/FieldToDataType.h
index c9976bb1005..9b032d26d1d 100644
--- a/dbms/include/DB/DataTypes/FieldToDataType.h
+++ b/dbms/src/DataTypes/FieldToDataType.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/IDataType.h b/dbms/src/DataTypes/IDataType.h
similarity index 99%
rename from dbms/include/DB/DataTypes/IDataType.h
rename to dbms/src/DataTypes/IDataType.h
index 3fa1dd8600a..7af7e214a6b 100644
--- a/dbms/include/DB/DataTypes/IDataType.h
+++ b/dbms/src/DataTypes/IDataType.h
@@ -2,8 +2,8 @@
 
 #include <memory>
 
-#include <DB/Core/Field.h>
-#include <DB/Columns/IColumn.h>
+#include <Core/Field.h>
+#include <Columns/IColumn.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/DataTypes/IDataTypeDummy.h b/dbms/src/DataTypes/IDataTypeDummy.h
similarity index 98%
rename from dbms/include/DB/DataTypes/IDataTypeDummy.h
rename to dbms/src/DataTypes/IDataTypeDummy.h
index 85fa2169153..0fcde48ed94 100644
--- a/dbms/include/DB/DataTypes/IDataTypeDummy.h
+++ b/dbms/src/DataTypes/IDataTypeDummy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/src/DataTypes/tests/data_type_string.cpp b/dbms/src/DataTypes/tests/data_type_string.cpp
index dcdd5c875eb..8f137414e14 100644
--- a/dbms/src/DataTypes/tests/data_type_string.cpp
+++ b/dbms/src/DataTypes/tests/data_type_string.cpp
@@ -3,12 +3,12 @@
 #include <iostream>
 #include <fstream>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/WriteBufferFromOStream.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/DataTypes/tests/data_types_number_fixed.cpp b/dbms/src/DataTypes/tests/data_types_number_fixed.cpp
index 8f8410da8e5..820405af630 100644
--- a/dbms/src/DataTypes/tests/data_types_number_fixed.cpp
+++ b/dbms/src/DataTypes/tests/data_types_number_fixed.cpp
@@ -1,11 +1,11 @@
 #include <iostream>
 #include <fstream>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
-#include <DB/IO/WriteBufferFromOStream.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Databases/DatabaseCloud.cpp b/dbms/src/Databases/DatabaseCloud.cpp
index f1726117294..32609eeef2c 100644
--- a/dbms/src/Databases/DatabaseCloud.cpp
+++ b/dbms/src/Databases/DatabaseCloud.cpp
@@ -1,18 +1,18 @@
 #include <zkutil/ZooKeeper.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/UInt128.h>
-#include <DB/Databases/DatabaseCloud.h>
-#include <DB/Databases/DatabasesCommon.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/HexWriteBuffer.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserCreateQuery.h>
+#include <Interpreters/Context.h>
+#include <Common/escapeForFileName.h>
+#include <Common/SipHash.h>
+#include <Common/UInt128.h>
+#include <Databases/DatabaseCloud.h>
+#include <Databases/DatabasesCommon.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/HexWriteBuffer.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserCreateQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Databases/DatabaseCloud.h b/dbms/src/Databases/DatabaseCloud.h
similarity index 98%
rename from dbms/include/DB/Databases/DatabaseCloud.h
rename to dbms/src/Databases/DatabaseCloud.h
index 4a81492e404..6799e44448f 100644
--- a/dbms/include/DB/Databases/DatabaseCloud.h
+++ b/dbms/src/Databases/DatabaseCloud.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Databases/IDatabase.h>
-#include <DB/Common/UInt128.h>
-#include <DB/Storages/IStorage.h>
+#include <Databases/IDatabase.h>
+#include <Common/UInt128.h>
+#include <Storages/IStorage.h>
 
 
 namespace Poco { class Logger; }
diff --git a/dbms/src/Databases/DatabaseFactory.cpp b/dbms/src/Databases/DatabaseFactory.cpp
index 7e3803b5b12..db25c950055 100644
--- a/dbms/src/Databases/DatabaseFactory.cpp
+++ b/dbms/src/Databases/DatabaseFactory.cpp
@@ -1,6 +1,6 @@
-#include <DB/Databases/DatabaseFactory.h>
-#include <DB/Databases/DatabaseOrdinary.h>
-#include <DB/Databases/DatabaseMemory.h>
+#include <Databases/DatabaseFactory.h>
+#include <Databases/DatabaseOrdinary.h>
+#include <Databases/DatabaseMemory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Databases/DatabaseFactory.h b/dbms/src/Databases/DatabaseFactory.h
similarity index 76%
rename from dbms/include/DB/Databases/DatabaseFactory.h
rename to dbms/src/Databases/DatabaseFactory.h
index 3176b2b7a24..9d298b1e97a 100644
--- a/dbms/include/DB/Databases/DatabaseFactory.h
+++ b/dbms/src/Databases/DatabaseFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Common/ThreadPool.h>
-#include <DB/Databases/IDatabase.h>
+#include <Common/ThreadPool.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/src/Databases/DatabaseMemory.cpp b/dbms/src/Databases/DatabaseMemory.cpp
index bef69e622eb..ad5acfdee88 100644
--- a/dbms/src/Databases/DatabaseMemory.cpp
+++ b/dbms/src/Databases/DatabaseMemory.cpp
@@ -1,6 +1,6 @@
 #include <common/logger_useful.h>
-#include <DB/Databases/DatabaseMemory.h>
-#include <DB/Databases/DatabasesCommon.h>
+#include <Databases/DatabaseMemory.h>
+#include <Databases/DatabasesCommon.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Databases/DatabaseMemory.h b/dbms/src/Databases/DatabaseMemory.h
similarity index 96%
rename from dbms/include/DB/Databases/DatabaseMemory.h
rename to dbms/src/Databases/DatabaseMemory.h
index 970b5edf484..4dc75c7dfff 100644
--- a/dbms/include/DB/Databases/DatabaseMemory.h
+++ b/dbms/src/Databases/DatabaseMemory.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <mutex>
-#include <DB/Databases/IDatabase.h>
-#include <DB/Storages/IStorage.h>
+#include <Databases/IDatabase.h>
+#include <Storages/IStorage.h>
 
 
 namespace Poco { class Logger; }
diff --git a/dbms/src/Databases/DatabaseOrdinary.cpp b/dbms/src/Databases/DatabaseOrdinary.cpp
index b99146229c6..be4ce9881e3 100644
--- a/dbms/src/Databases/DatabaseOrdinary.cpp
+++ b/dbms/src/Databases/DatabaseOrdinary.cpp
@@ -1,20 +1,20 @@
 #include <Poco/DirectoryIterator.h>
 #include <common/logger_useful.h>
 
-#include <DB/Databases/DatabaseOrdinary.h>
-#include <DB/Databases/DatabaseMemory.h>
-#include <DB/Databases/DatabasesCommon.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Interpreters/InterpreterCreateQuery.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/ReadBufferFromFile.h>
+#include <Databases/DatabaseOrdinary.h>
+#include <Databases/DatabaseMemory.h>
+#include <Databases/DatabasesCommon.h>
+#include <Common/escapeForFileName.h>
+#include <Common/StringUtils.h>
+#include <Common/Stopwatch.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/Settings.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadBufferFromFile.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Databases/DatabaseOrdinary.h b/dbms/src/Databases/DatabaseOrdinary.h
similarity index 97%
rename from dbms/include/DB/Databases/DatabaseOrdinary.h
rename to dbms/src/Databases/DatabaseOrdinary.h
index acd30ff262a..2e0080769d1 100644
--- a/dbms/include/DB/Databases/DatabaseOrdinary.h
+++ b/dbms/src/Databases/DatabaseOrdinary.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Databases/DatabaseMemory.h>
+#include <Databases/DatabaseMemory.h>
 
 
 namespace DB
diff --git a/dbms/src/Databases/DatabasesCommon.cpp b/dbms/src/Databases/DatabasesCommon.cpp
index 7a990f32951..ab8993b7c7d 100644
--- a/dbms/src/Databases/DatabasesCommon.cpp
+++ b/dbms/src/Databases/DatabasesCommon.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Interpreters/InterpreterCreateQuery.h>
-#include <DB/Storages/StorageFactory.h>
-#include <DB/Databases/DatabasesCommon.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/formatAST.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Storages/StorageFactory.h>
+#include <Databases/DatabasesCommon.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Databases/DatabasesCommon.h b/dbms/src/Databases/DatabasesCommon.h
similarity index 93%
rename from dbms/include/DB/Databases/DatabasesCommon.h
rename to dbms/src/Databases/DatabasesCommon.h
index 1ee776ecf14..458e91f7cf0 100644
--- a/dbms/include/DB/Databases/DatabasesCommon.h
+++ b/dbms/src/Databases/DatabasesCommon.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Core/Types.h>
-#include <DB/Parsers/IAST.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/Databases/IDatabase.h>
+#include <Core/Types.h>
+#include <Parsers/IAST.h>
+#include <Storages/IStorage.h>
+#include <Databases/IDatabase.h>
 
 /// Общая функциональность для нескольких разных движков баз данных.
 
diff --git a/dbms/include/DB/Databases/IDatabase.h b/dbms/src/Databases/IDatabase.h
similarity index 98%
rename from dbms/include/DB/Databases/IDatabase.h
rename to dbms/src/Databases/IDatabase.h
index 237bf189bca..6a54cfcc17a 100644
--- a/dbms/include/DB/Databases/IDatabase.h
+++ b/dbms/src/Databases/IDatabase.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Types.h>
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Storages/ColumnDefault.h>
+#include <Core/Types.h>
+#include <Core/NamesAndTypes.h>
+#include <Storages/ColumnDefault.h>
 #include <ctime>
 #include <memory>
 #include <functional>
diff --git a/dbms/src/Dictionaries/CacheDictionary.cpp b/dbms/src/Dictionaries/CacheDictionary.cpp
index 7d2e142448d..651eed12eaa 100644
--- a/dbms/src/Dictionaries/CacheDictionary.cpp
+++ b/dbms/src/Dictionaries/CacheDictionary.cpp
@@ -1,11 +1,11 @@
 #include <functional>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Dictionaries/CacheDictionary.h>
-#include <DB/Common/BitHelpers.h>
-#include <DB/Common/randomSeed.h>
-#include <DB/Common/HashTable/Hash.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/ProfilingScopedRWLock.h>
+#include <Columns/ColumnsNumber.h>
+#include <Dictionaries/CacheDictionary.h>
+#include <Common/BitHelpers.h>
+#include <Common/randomSeed.h>
+#include <Common/HashTable/Hash.h>
+#include <Common/Stopwatch.h>
+#include <Common/ProfilingScopedRWLock.h>
 #include <ext/size.hpp>
 #include <ext/range.hpp>
 #include <ext/map.hpp>
diff --git a/dbms/include/DB/Dictionaries/CacheDictionary.h b/dbms/src/Dictionaries/CacheDictionary.h
similarity index 97%
rename from dbms/include/DB/Dictionaries/CacheDictionary.h
rename to dbms/src/Dictionaries/CacheDictionary.h
index ce7183c45bc..43460e26b0a 100644
--- a/dbms/include/DB/Dictionaries/CacheDictionary.h
+++ b/dbms/src/Dictionaries/CacheDictionary.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionary.h>
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Common/ArenaWithFreeLists.h>
-#include <DB/Columns/ColumnString.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Common/ArenaWithFreeLists.h>
+#include <Columns/ColumnString.h>
 #include <ext/bit_cast.hpp>
 #include <Poco/RWLock.h>
 #include <cmath>
diff --git a/dbms/src/Dictionaries/ClickHouseDictionarySource.cpp b/dbms/src/Dictionaries/ClickHouseDictionarySource.cpp
index 4c10308a0fd..d00ea7aa7b2 100644
--- a/dbms/src/Dictionaries/ClickHouseDictionarySource.cpp
+++ b/dbms/src/Dictionaries/ClickHouseDictionarySource.cpp
@@ -1,10 +1,10 @@
-#include <DB/Dictionaries/ClickHouseDictionarySource.h>
-#include <DB/Dictionaries/ExternalQueryBuilder.h>
-#include <DB/Dictionaries/writeParenthesisedString.h>
-#include <DB/Client/ConnectionPool.h>
-#include <DB/DataStreams/RemoteBlockInputStream.h>
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/Common/isLocalAddress.h>
+#include <Dictionaries/ClickHouseDictionarySource.h>
+#include <Dictionaries/ExternalQueryBuilder.h>
+#include <Dictionaries/writeParenthesisedString.h>
+#include <Client/ConnectionPool.h>
+#include <DataStreams/RemoteBlockInputStream.h>
+#include <Interpreters/executeQuery.h>
+#include <Common/isLocalAddress.h>
 #include <memory>
 #include <ext/range.hpp>
 
diff --git a/dbms/include/DB/Dictionaries/ClickHouseDictionarySource.h b/dbms/src/Dictionaries/ClickHouseDictionarySource.h
similarity index 90%
rename from dbms/include/DB/Dictionaries/ClickHouseDictionarySource.h
rename to dbms/src/Dictionaries/ClickHouseDictionarySource.h
index fe9b90567ad..2c07b05316a 100644
--- a/dbms/include/DB/Dictionaries/ClickHouseDictionarySource.h
+++ b/dbms/src/Dictionaries/ClickHouseDictionarySource.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Dictionaries/ExternalQueryBuilder.h>
-#include <DB/Client/ConnectionPool.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/ExternalQueryBuilder.h>
+#include <Client/ConnectionPool.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <memory>
 
diff --git a/dbms/src/Dictionaries/ComplexKeyCacheDictionary.cpp b/dbms/src/Dictionaries/ComplexKeyCacheDictionary.cpp
index d1a9e04ee65..ed6706e4e09 100644
--- a/dbms/src/Dictionaries/ComplexKeyCacheDictionary.cpp
+++ b/dbms/src/Dictionaries/ComplexKeyCacheDictionary.cpp
@@ -1,8 +1,8 @@
-#include <DB/Dictionaries/ComplexKeyCacheDictionary.h>
-#include <DB/Common/BitHelpers.h>
-#include <DB/Common/randomSeed.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/ProfilingScopedRWLock.h>
+#include <Dictionaries/ComplexKeyCacheDictionary.h>
+#include <Common/BitHelpers.h>
+#include <Common/randomSeed.h>
+#include <Common/Stopwatch.h>
+#include <Common/ProfilingScopedRWLock.h>
 #include <ext/range.hpp>
 
 namespace DB
diff --git a/dbms/include/DB/Dictionaries/ComplexKeyCacheDictionary.h b/dbms/src/Dictionaries/ComplexKeyCacheDictionary.h
similarity index 96%
rename from dbms/include/DB/Dictionaries/ComplexKeyCacheDictionary.h
rename to dbms/src/Dictionaries/ComplexKeyCacheDictionary.h
index a4bfcba6773..5931514ee2b 100644
--- a/dbms/include/DB/Dictionaries/ComplexKeyCacheDictionary.h
+++ b/dbms/src/Dictionaries/ComplexKeyCacheDictionary.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionary.h>
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Common/Arena.h>
-#include <DB/Common/ArenaWithFreeLists.h>
-#include <DB/Common/SmallObjectPool.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Core/StringRef.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Common/Arena.h>
+#include <Common/ArenaWithFreeLists.h>
+#include <Common/SmallObjectPool.h>
+#include <Common/HashTable/HashMap.h>
+#include <Columns/ColumnString.h>
+#include <Core/StringRef.h>
 #include <ext/scope_guard.hpp>
 #include <ext/bit_cast.hpp>
 #include <ext/map.hpp>
diff --git a/dbms/src/Dictionaries/ComplexKeyHashedDictionary.cpp b/dbms/src/Dictionaries/ComplexKeyHashedDictionary.cpp
index 8e6697ec5e3..b3650572a5b 100644
--- a/dbms/src/Dictionaries/ComplexKeyHashedDictionary.cpp
+++ b/dbms/src/Dictionaries/ComplexKeyHashedDictionary.cpp
@@ -1,6 +1,6 @@
 #include <ext/map.hpp>
 #include <ext/range.hpp>
-#include <DB/Dictionaries/ComplexKeyHashedDictionary.h>
+#include <Dictionaries/ComplexKeyHashedDictionary.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h b/dbms/src/Dictionaries/ComplexKeyHashedDictionary.h
similarity index 96%
rename from dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h
rename to dbms/src/Dictionaries/ComplexKeyHashedDictionary.h
index 25fb191721a..fcff362ccf9 100644
--- a/dbms/include/DB/Dictionaries/ComplexKeyHashedDictionary.h
+++ b/dbms/src/Dictionaries/ComplexKeyHashedDictionary.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionary.h>
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Core/StringRef.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Common/Arena.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Core/StringRef.h>
+#include <Common/HashTable/HashMap.h>
+#include <Columns/ColumnString.h>
+#include <Common/Arena.h>
 #include <ext/range.hpp>
 #include <atomic>
 #include <memory>
diff --git a/dbms/include/DB/Dictionaries/DictionaryFactory.h b/dbms/src/Dictionaries/DictionaryFactory.h
similarity index 89%
rename from dbms/include/DB/Dictionaries/DictionaryFactory.h
rename to dbms/src/Dictionaries/DictionaryFactory.h
index 213dbe8f56a..c7d9bf0755e 100644
--- a/dbms/include/DB/Dictionaries/DictionaryFactory.h
+++ b/dbms/src/Dictionaries/DictionaryFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionary.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <common/singleton.h>
 
diff --git a/dbms/src/Dictionaries/DictionarySourceFactory.cpp b/dbms/src/Dictionaries/DictionarySourceFactory.cpp
index 2e70520d141..db76c74f7d1 100644
--- a/dbms/src/Dictionaries/DictionarySourceFactory.cpp
+++ b/dbms/src/Dictionaries/DictionarySourceFactory.cpp
@@ -1,27 +1,27 @@
-#include <DB/Dictionaries/DictionarySourceFactory.h>
+#include <Dictionaries/DictionarySourceFactory.h>
 
-#include <DB/Core/Block.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Dictionaries/FileDictionarySource.h>
-#include <DB/Dictionaries/MySQLDictionarySource.h>
-#include <DB/Dictionaries/ClickHouseDictionarySource.h>
-#include <DB/Dictionaries/ExecutableDictionarySource.h>
-#include <DB/Dictionaries/HTTPDictionarySource.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/IO/HTTPCommon.h>
+#include <Core/Block.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/FileDictionarySource.h>
+#include <Dictionaries/MySQLDictionarySource.h>
+#include <Dictionaries/ClickHouseDictionarySource.h>
+#include <Dictionaries/ExecutableDictionarySource.h>
+#include <Dictionaries/HTTPDictionarySource.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDate.h>
+#include <Core/FieldVisitors.h>
+#include <Columns/ColumnsNumber.h>
+#include <IO/HTTPCommon.h>
 #include <memory>
 #include <mutex>
 
-#include <DB/Common/config.h>
+#include <Common/config.h>
 #if Poco_MongoDB_FOUND
-    #include <DB/Dictionaries/MongoDBDictionarySource.h>
+    #include <Dictionaries/MongoDBDictionarySource.h>
 #endif
 #if Poco_DataODBC_FOUND
     #include <Poco/Data/ODBC/Connector.h>
-    #include <DB/Dictionaries/ODBCDictionarySource.h>
+    #include <Dictionaries/ODBCDictionarySource.h>
 #endif
 
 
diff --git a/dbms/include/DB/Dictionaries/DictionarySourceFactory.h b/dbms/src/Dictionaries/DictionarySourceFactory.h
similarity index 92%
rename from dbms/include/DB/Dictionaries/DictionarySourceFactory.h
rename to dbms/src/Dictionaries/DictionarySourceFactory.h
index 2f946c96030..565ffacdf4f 100644
--- a/dbms/include/DB/Dictionaries/DictionarySourceFactory.h
+++ b/dbms/src/Dictionaries/DictionarySourceFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionarySource.h>
+#include <Dictionaries/IDictionarySource.h>
 #include <common/singleton.h>
 
 
diff --git a/dbms/src/Dictionaries/DictionaryStructure.cpp b/dbms/src/Dictionaries/DictionaryStructure.cpp
index 3a048c39206..62a58a93251 100644
--- a/dbms/src/Dictionaries/DictionaryStructure.cpp
+++ b/dbms/src/Dictionaries/DictionaryStructure.cpp
@@ -1,5 +1,5 @@
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Common/StringUtils.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Common/StringUtils.h>
 
 #include <unordered_set>
 
diff --git a/dbms/include/DB/Dictionaries/DictionaryStructure.h b/dbms/src/Dictionaries/DictionaryStructure.h
similarity index 95%
rename from dbms/include/DB/Dictionaries/DictionaryStructure.h
rename to dbms/src/Dictionaries/DictionaryStructure.h
index 61392f53168..56bfe06f177 100644
--- a/dbms/include/DB/Dictionaries/DictionaryStructure.h
+++ b/dbms/src/Dictionaries/DictionaryStructure.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeFactory.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <ext/range.hpp>
 #include <numeric>
diff --git a/dbms/src/Dictionaries/Embedded/RegionsHierarchies.cpp b/dbms/src/Dictionaries/Embedded/RegionsHierarchies.cpp
index adfca5376e2..e64cf3edf30 100644
--- a/dbms/src/Dictionaries/Embedded/RegionsHierarchies.cpp
+++ b/dbms/src/Dictionaries/Embedded/RegionsHierarchies.cpp
@@ -1,4 +1,4 @@
-#include <DB/Dictionaries/Embedded/RegionsHierarchies.h>
+#include <Dictionaries/Embedded/RegionsHierarchies.h>
 #include <Poco/DirectoryIterator.h>
 #include <Poco/Util/Application.h>
 #include <Poco/Util/AbstractConfiguration.h>
diff --git a/dbms/include/DB/Dictionaries/Embedded/RegionsHierarchies.h b/dbms/src/Dictionaries/Embedded/RegionsHierarchies.h
similarity index 97%
rename from dbms/include/DB/Dictionaries/Embedded/RegionsHierarchies.h
rename to dbms/src/Dictionaries/Embedded/RegionsHierarchies.h
index d3b43c89fa2..7ff530193f2 100644
--- a/dbms/include/DB/Dictionaries/Embedded/RegionsHierarchies.h
+++ b/dbms/src/Dictionaries/Embedded/RegionsHierarchies.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Dictionaries/Embedded/RegionsHierarchy.h>
+#include <Dictionaries/Embedded/RegionsHierarchy.h>
 #include <Poco/Exception.h>
 #include <unordered_map>
 
diff --git a/dbms/src/Dictionaries/Embedded/RegionsHierarchy.cpp b/dbms/src/Dictionaries/Embedded/RegionsHierarchy.cpp
index 60b18cce79d..c17768324c6 100644
--- a/dbms/src/Dictionaries/Embedded/RegionsHierarchy.cpp
+++ b/dbms/src/Dictionaries/Embedded/RegionsHierarchy.cpp
@@ -1,4 +1,4 @@
-#include <DB/Dictionaries/Embedded/RegionsHierarchy.h>
+#include <Dictionaries/Embedded/RegionsHierarchy.h>
 
 #include <Poco/Util/Application.h>
 #include <Poco/Exception.h>
@@ -7,9 +7,9 @@
 #include <common/logger_useful.h>
 #include <common/singleton.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 static constexpr auto config_key = "path_to_regions_hierarchy_file";
diff --git a/dbms/include/DB/Dictionaries/Embedded/RegionsHierarchy.h b/dbms/src/Dictionaries/Embedded/RegionsHierarchy.h
similarity index 100%
rename from dbms/include/DB/Dictionaries/Embedded/RegionsHierarchy.h
rename to dbms/src/Dictionaries/Embedded/RegionsHierarchy.h
diff --git a/dbms/src/Dictionaries/Embedded/RegionsNames.cpp b/dbms/src/Dictionaries/Embedded/RegionsNames.cpp
index 5422a49c656..ef9f7d6e8d0 100644
--- a/dbms/src/Dictionaries/Embedded/RegionsNames.cpp
+++ b/dbms/src/Dictionaries/Embedded/RegionsNames.cpp
@@ -1,4 +1,4 @@
-#include <DB/Dictionaries/Embedded/RegionsNames.h>
+#include <Dictionaries/Embedded/RegionsNames.h>
 
 #include <Poco/File.h>
 #include <Poco/Util/Application.h>
@@ -6,9 +6,9 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromFile.h>
 
 
 static constexpr auto config_key = "path_to_regions_names_files";
diff --git a/dbms/include/DB/Dictionaries/Embedded/RegionsNames.h b/dbms/src/Dictionaries/Embedded/RegionsNames.h
similarity index 99%
rename from dbms/include/DB/Dictionaries/Embedded/RegionsNames.h
rename to dbms/src/Dictionaries/Embedded/RegionsNames.h
index 8447bd1df31..ffaf6127ed2 100644
--- a/dbms/include/DB/Dictionaries/Embedded/RegionsNames.h
+++ b/dbms/src/Dictionaries/Embedded/RegionsNames.h
@@ -4,7 +4,7 @@
 #include <vector>
 #include <Poco/Exception.h>
 #include <common/Common.h>
-#include <DB/Core/StringRef.h>
+#include <Core/StringRef.h>
 
 
 /** Класс, позволяющий узнавать по id региона его текстовое название на одном из поддерживаемых языков: ru, en, ua, by, kz, tr.
diff --git a/dbms/src/Dictionaries/Embedded/TechDataHierarchy.cpp b/dbms/src/Dictionaries/Embedded/TechDataHierarchy.cpp
index c67c0fe7c1b..1e287eabfb8 100644
--- a/dbms/src/Dictionaries/Embedded/TechDataHierarchy.cpp
+++ b/dbms/src/Dictionaries/Embedded/TechDataHierarchy.cpp
@@ -1,4 +1,4 @@
-#include <DB/Dictionaries/Embedded/TechDataHierarchy.h>
+#include <Dictionaries/Embedded/TechDataHierarchy.h>
 
 #include <common/logger_useful.h>
 #include <mysqlxx/PoolWithFailover.h>
diff --git a/dbms/include/DB/Dictionaries/Embedded/TechDataHierarchy.h b/dbms/src/Dictionaries/Embedded/TechDataHierarchy.h
similarity index 100%
rename from dbms/include/DB/Dictionaries/Embedded/TechDataHierarchy.h
rename to dbms/src/Dictionaries/Embedded/TechDataHierarchy.h
diff --git a/dbms/src/Dictionaries/ExecutableDictionarySource.cpp b/dbms/src/Dictionaries/ExecutableDictionarySource.cpp
index 44da1c8f3eb..7c0be77d651 100644
--- a/dbms/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/dbms/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -1,11 +1,11 @@
-#include <DB/Dictionaries/ExecutableDictionarySource.h>
+#include <Dictionaries/ExecutableDictionarySource.h>
 
-#include <DB/Common/ShellCommand.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Dictionaries/OwningBlockInputStream.h>
+#include <Common/ShellCommand.h>
+#include <Interpreters/Context.h>
+#include <Dictionaries/OwningBlockInputStream.h>
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataTypes/DataTypesNumber.h>
 
 #include <common/logger_useful.h>
 
diff --git a/dbms/include/DB/Dictionaries/ExecutableDictionarySource.h b/dbms/src/Dictionaries/ExecutableDictionarySource.h
similarity index 94%
rename from dbms/include/DB/Dictionaries/ExecutableDictionarySource.h
rename to dbms/src/Dictionaries/ExecutableDictionarySource.h
index d99d8b0e7ae..e57bac50828 100644
--- a/dbms/include/DB/Dictionaries/ExecutableDictionarySource.h
+++ b/dbms/src/Dictionaries/ExecutableDictionarySource.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
 
 
 namespace Poco { class Logger; }
diff --git a/dbms/src/Dictionaries/ExternalQueryBuilder.cpp b/dbms/src/Dictionaries/ExternalQueryBuilder.cpp
index 7a0184fabe1..d027a2500b5 100644
--- a/dbms/src/Dictionaries/ExternalQueryBuilder.cpp
+++ b/dbms/src/Dictionaries/ExternalQueryBuilder.cpp
@@ -1,11 +1,11 @@
 #include <ext/range.hpp>
 #include <boost/range/join.hpp>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Dictionaries/writeParenthesisedString.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Dictionaries/ExternalQueryBuilder.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Dictionaries/writeParenthesisedString.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/ExternalQueryBuilder.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Dictionaries/ExternalQueryBuilder.h b/dbms/src/Dictionaries/ExternalQueryBuilder.h
similarity index 98%
rename from dbms/include/DB/Dictionaries/ExternalQueryBuilder.h
rename to dbms/src/Dictionaries/ExternalQueryBuilder.h
index 9e85deae945..33a213cfbda 100644
--- a/dbms/include/DB/Dictionaries/ExternalQueryBuilder.h
+++ b/dbms/src/Dictionaries/ExternalQueryBuilder.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <string>
-#include <DB/Columns/IColumn.h>
+#include <Columns/IColumn.h>
 
 
 namespace DB
diff --git a/dbms/src/Dictionaries/ExternalResultDescription.cpp b/dbms/src/Dictionaries/ExternalResultDescription.cpp
index d71fde7f134..1c8b94e6cc0 100644
--- a/dbms/src/Dictionaries/ExternalResultDescription.cpp
+++ b/dbms/src/Dictionaries/ExternalResultDescription.cpp
@@ -1,9 +1,9 @@
 #include <ext/range.hpp>
-#include <DB/Dictionaries/ExternalResultDescription.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
+#include <Dictionaries/ExternalResultDescription.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Dictionaries/ExternalResultDescription.h b/dbms/src/Dictionaries/ExternalResultDescription.h
similarity index 95%
rename from dbms/include/DB/Dictionaries/ExternalResultDescription.h
rename to dbms/src/Dictionaries/ExternalResultDescription.h
index 82da3d05921..0a462e02f1b 100644
--- a/dbms/include/DB/Dictionaries/ExternalResultDescription.h
+++ b/dbms/src/Dictionaries/ExternalResultDescription.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Block.h>
+#include <Core/Block.h>
 
 
 namespace DB
diff --git a/dbms/src/Dictionaries/FileDictionarySource.cpp b/dbms/src/Dictionaries/FileDictionarySource.cpp
index b3fbe22ea27..575e36b46db 100644
--- a/dbms/src/Dictionaries/FileDictionarySource.cpp
+++ b/dbms/src/Dictionaries/FileDictionarySource.cpp
@@ -1,7 +1,7 @@
-#include <DB/Interpreters/Context.h>
-#include <DB/Dictionaries/OwningBlockInputStream.h>
-#include <DB/Dictionaries/FileDictionarySource.h>
-#include <DB/IO/ReadBufferFromFile.h>
+#include <Interpreters/Context.h>
+#include <Dictionaries/OwningBlockInputStream.h>
+#include <Dictionaries/FileDictionarySource.h>
+#include <IO/ReadBufferFromFile.h>
 #include <Poco/File.h>
 
 
diff --git a/dbms/include/DB/Dictionaries/FileDictionarySource.h b/dbms/src/Dictionaries/FileDictionarySource.h
similarity index 96%
rename from dbms/include/DB/Dictionaries/FileDictionarySource.h
rename to dbms/src/Dictionaries/FileDictionarySource.h
index 6c137c11ae1..9ece4864be9 100644
--- a/dbms/include/DB/Dictionaries/FileDictionarySource.h
+++ b/dbms/src/Dictionaries/FileDictionarySource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionarySource.h>
+#include <Dictionaries/IDictionarySource.h>
 #include <Poco/Timestamp.h>
 
 
diff --git a/dbms/src/Dictionaries/FlatDictionary.cpp b/dbms/src/Dictionaries/FlatDictionary.cpp
index 92d41f0601b..850c2566dc6 100644
--- a/dbms/src/Dictionaries/FlatDictionary.cpp
+++ b/dbms/src/Dictionaries/FlatDictionary.cpp
@@ -1,4 +1,4 @@
-#include <DB/Dictionaries/FlatDictionary.h>
+#include <Dictionaries/FlatDictionary.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Dictionaries/FlatDictionary.h b/dbms/src/Dictionaries/FlatDictionary.h
similarity index 97%
rename from dbms/include/DB/Dictionaries/FlatDictionary.h
rename to dbms/src/Dictionaries/FlatDictionary.h
index 2d2e048abde..6ca4526dfe0 100644
--- a/dbms/include/DB/Dictionaries/FlatDictionary.h
+++ b/dbms/src/Dictionaries/FlatDictionary.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionary.h>
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Common/Arena.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Columns/ColumnString.h>
+#include <Common/Arena.h>
 #include <ext/range.hpp>
 #include <ext/size.hpp>
 #include <atomic>
diff --git a/dbms/src/Dictionaries/HTTPDictionarySource.cpp b/dbms/src/Dictionaries/HTTPDictionarySource.cpp
index 9828963822e..45129e873d2 100644
--- a/dbms/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/dbms/src/Dictionaries/HTTPDictionarySource.cpp
@@ -1,16 +1,16 @@
-#include <DB/Dictionaries/HTTPDictionarySource.h>
+#include <Dictionaries/HTTPDictionarySource.h>
 
 #include <Poco/Net/HTTPRequest.h>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Dictionaries/OwningBlockInputStream.h>
-#include <DB/IO/ReadWriteBufferFromHTTP.h>
+#include <Interpreters/Context.h>
+#include <Dictionaries/OwningBlockInputStream.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/Dictionaries/ExecutableDictionarySource.h> // idsToBuffer, columnsToBuffer
+#include <Dictionaries/ExecutableDictionarySource.h> // idsToBuffer, columnsToBuffer
 
 #include <common/logger_useful.h>
 
diff --git a/dbms/include/DB/Dictionaries/HTTPDictionarySource.h b/dbms/src/Dictionaries/HTTPDictionarySource.h
similarity index 92%
rename from dbms/include/DB/Dictionaries/HTTPDictionarySource.h
rename to dbms/src/Dictionaries/HTTPDictionarySource.h
index a3082ef6110..24dd880827f 100644
--- a/dbms/include/DB/Dictionaries/HTTPDictionarySource.h
+++ b/dbms/src/Dictionaries/HTTPDictionarySource.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
 
 
 namespace Poco { class Logger; }
diff --git a/dbms/src/Dictionaries/HashedDictionary.cpp b/dbms/src/Dictionaries/HashedDictionary.cpp
index 5dff09f0d67..1ba12c67574 100644
--- a/dbms/src/Dictionaries/HashedDictionary.cpp
+++ b/dbms/src/Dictionaries/HashedDictionary.cpp
@@ -1,5 +1,5 @@
 #include <ext/size.hpp>
-#include <DB/Dictionaries/HashedDictionary.h>
+#include <Dictionaries/HashedDictionary.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Dictionaries/HashedDictionary.h b/dbms/src/Dictionaries/HashedDictionary.h
similarity index 97%
rename from dbms/include/DB/Dictionaries/HashedDictionary.h
rename to dbms/src/Dictionaries/HashedDictionary.h
index 212286ab84d..acc77c080e0 100644
--- a/dbms/include/DB/Dictionaries/HashedDictionary.h
+++ b/dbms/src/Dictionaries/HashedDictionary.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionary.h>
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Columns/ColumnString.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Common/HashTable/HashMap.h>
+#include <Columns/ColumnString.h>
 #include <ext/range.hpp>
 #include <atomic>
 #include <memory>
diff --git a/dbms/include/DB/Dictionaries/IDictionary.h b/dbms/src/Dictionaries/IDictionary.h
similarity index 96%
rename from dbms/include/DB/Dictionaries/IDictionary.h
rename to dbms/src/Dictionaries/IDictionary.h
index 02d2efe9934..d29286c3e80 100644
--- a/dbms/include/DB/Dictionaries/IDictionary.h
+++ b/dbms/src/Dictionaries/IDictionary.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Core/Field.h>
-#include <DB/Core/StringRef.h>
+#include <Core/Field.h>
+#include <Core/StringRef.h>
 #include <Poco/Util/XMLConfiguration.h>
-#include <DB/Common/PODArray.h>
+#include <Common/PODArray.h>
 #include <memory>
 #include <chrono>
 
diff --git a/dbms/include/DB/Dictionaries/IDictionarySource.h b/dbms/src/Dictionaries/IDictionarySource.h
similarity index 97%
rename from dbms/include/DB/Dictionaries/IDictionarySource.h
rename to dbms/src/Dictionaries/IDictionarySource.h
index 0f4cd21e60c..701cc5ef632 100644
--- a/dbms/include/DB/Dictionaries/IDictionarySource.h
+++ b/dbms/src/Dictionaries/IDictionarySource.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockInputStream.h>
+#include <DataStreams/IBlockInputStream.h>
 #include <vector>
 
 namespace DB
diff --git a/dbms/src/Dictionaries/MongoDBBlockInputStream.cpp b/dbms/src/Dictionaries/MongoDBBlockInputStream.cpp
index 8698624538e..8729d475a22 100644
--- a/dbms/src/Dictionaries/MongoDBBlockInputStream.cpp
+++ b/dbms/src/Dictionaries/MongoDBBlockInputStream.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/config.h>
+#include <Common/config.h>
 #if Poco_MongoDB_FOUND
 
 #include <vector>
@@ -9,16 +9,16 @@
 #include <Poco/MongoDB/Cursor.h>
 #include <Poco/MongoDB/Element.h>
 
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Dictionaries/MongoDBBlockInputStream.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/MongoDBBlockInputStream.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
 #include <ext/range.hpp>
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Dictionaries/MongoDBBlockInputStream.h b/dbms/src/Dictionaries/MongoDBBlockInputStream.h
similarity index 88%
rename from dbms/include/DB/Dictionaries/MongoDBBlockInputStream.h
rename to dbms/src/Dictionaries/MongoDBBlockInputStream.h
index 57eafc86685..a09ab12f9ac 100644
--- a/dbms/include/DB/Dictionaries/MongoDBBlockInputStream.h
+++ b/dbms/src/Dictionaries/MongoDBBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Dictionaries/ExternalResultDescription.h>
+#include <Core/Block.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Dictionaries/ExternalResultDescription.h>
 
 
 namespace Poco
diff --git a/dbms/src/Dictionaries/MongoDBDictionarySource.cpp b/dbms/src/Dictionaries/MongoDBDictionarySource.cpp
index ad4e99a4288..068c37fb859 100644
--- a/dbms/src/Dictionaries/MongoDBDictionarySource.cpp
+++ b/dbms/src/Dictionaries/MongoDBDictionarySource.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/config.h>
+#include <Common/config.h>
 #if Poco_MongoDB_FOUND
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/MD5Engine.h>
@@ -12,9 +12,9 @@
 // naming conflict:
 // Poco/MongoDB/BSONWriter.h:54: void writeCString(const std::string& value);
 // dbms/include/DB/IO/WriteHelpers.h:146 #define writeCString(s, buf)
-#include <DB/Dictionaries/MongoDBDictionarySource.h>
-#include <DB/Dictionaries/MongoDBBlockInputStream.h>
-#include <DB/Core/FieldVisitors.h>
+#include <Dictionaries/MongoDBDictionarySource.h>
+#include <Dictionaries/MongoDBBlockInputStream.h>
+#include <Core/FieldVisitors.h>
 #include <ext/enumerate.hpp>
 
 
diff --git a/dbms/include/DB/Dictionaries/MongoDBDictionarySource.h b/dbms/src/Dictionaries/MongoDBDictionarySource.h
similarity index 95%
rename from dbms/include/DB/Dictionaries/MongoDBDictionarySource.h
rename to dbms/src/Dictionaries/MongoDBDictionarySource.h
index d9bb6b8e2d1..9a7e0cd4580 100644
--- a/dbms/include/DB/Dictionaries/MongoDBDictionarySource.h
+++ b/dbms/src/Dictionaries/MongoDBDictionarySource.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
 
 
 namespace Poco
diff --git a/dbms/src/Dictionaries/MySQLBlockInputStream.cpp b/dbms/src/Dictionaries/MySQLBlockInputStream.cpp
index 68402a7847e..2e931cba9f3 100644
--- a/dbms/src/Dictionaries/MySQLBlockInputStream.cpp
+++ b/dbms/src/Dictionaries/MySQLBlockInputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/Dictionaries/MySQLBlockInputStream.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
+#include <Dictionaries/MySQLBlockInputStream.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
 #include <ext/range.hpp>
 #include <vector>
 
diff --git a/dbms/include/DB/Dictionaries/MySQLBlockInputStream.h b/dbms/src/Dictionaries/MySQLBlockInputStream.h
similarity index 87%
rename from dbms/include/DB/Dictionaries/MySQLBlockInputStream.h
rename to dbms/src/Dictionaries/MySQLBlockInputStream.h
index 1328eecdae4..8b80b0d4184 100644
--- a/dbms/include/DB/Dictionaries/MySQLBlockInputStream.h
+++ b/dbms/src/Dictionaries/MySQLBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Dictionaries/ExternalResultDescription.h>
+#include <Core/Block.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Dictionaries/ExternalResultDescription.h>
 #include <mysqlxx/Query.h>
 #include <mysqlxx/PoolWithFailover.h>
 #include <string>
diff --git a/dbms/src/Dictionaries/MySQLDictionarySource.cpp b/dbms/src/Dictionaries/MySQLDictionarySource.cpp
index eacc9b28b9d..d61f8026a21 100644
--- a/dbms/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/dbms/src/Dictionaries/MySQLDictionarySource.cpp
@@ -1,7 +1,7 @@
 #include <common/logger_useful.h>
 
-#include <DB/Dictionaries/MySQLDictionarySource.h>
-#include <DB/Dictionaries/MySQLBlockInputStream.h>
+#include <Dictionaries/MySQLDictionarySource.h>
+#include <Dictionaries/MySQLBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Dictionaries/MySQLDictionarySource.h b/dbms/src/Dictionaries/MySQLDictionarySource.h
similarity index 91%
rename from dbms/include/DB/Dictionaries/MySQLDictionarySource.h
rename to dbms/src/Dictionaries/MySQLDictionarySource.h
index 3cd5c338eda..fdc87223bf5 100644
--- a/dbms/include/DB/Dictionaries/MySQLDictionarySource.h
+++ b/dbms/src/Dictionaries/MySQLDictionarySource.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/ExternalQueryBuilder.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/ExternalQueryBuilder.h>
+#include <Dictionaries/DictionaryStructure.h>
 #include <ext/range.hpp>
 #include <mysqlxx/PoolWithFailover.h>
 #include <Poco/Util/AbstractConfiguration.h>
diff --git a/dbms/src/Dictionaries/ODBCBlockInputStream.cpp b/dbms/src/Dictionaries/ODBCBlockInputStream.cpp
index 06caba620f0..f7c098f07ed 100644
--- a/dbms/src/Dictionaries/ODBCBlockInputStream.cpp
+++ b/dbms/src/Dictionaries/ODBCBlockInputStream.cpp
@@ -1,7 +1,7 @@
-#include <DB/Dictionaries/ODBCBlockInputStream.h>
+#include <Dictionaries/ODBCBlockInputStream.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
 
 #include <ext/range.hpp>
 #include <vector>
diff --git a/dbms/include/DB/Dictionaries/ODBCBlockInputStream.h b/dbms/src/Dictionaries/ODBCBlockInputStream.h
similarity index 88%
rename from dbms/include/DB/Dictionaries/ODBCBlockInputStream.h
rename to dbms/src/Dictionaries/ODBCBlockInputStream.h
index 1d7d4acb172..a01987272e8 100644
--- a/dbms/include/DB/Dictionaries/ODBCBlockInputStream.h
+++ b/dbms/src/Dictionaries/ODBCBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Dictionaries/ExternalResultDescription.h>
+#include <Core/Block.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Dictionaries/ExternalResultDescription.h>
 
 #include <Poco/Data/Session.h>
 #include <Poco/Data/Statement.h>
diff --git a/dbms/src/Dictionaries/ODBCDictionarySource.cpp b/dbms/src/Dictionaries/ODBCDictionarySource.cpp
index 3bcc7fa3787..d5002bc94af 100644
--- a/dbms/src/Dictionaries/ODBCDictionarySource.cpp
+++ b/dbms/src/Dictionaries/ODBCDictionarySource.cpp
@@ -1,7 +1,7 @@
 #include <Poco/Data/SessionPool.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <DB/Dictionaries/ODBCDictionarySource.h>
-#include <DB/Dictionaries/ODBCBlockInputStream.h>
+#include <Dictionaries/ODBCDictionarySource.h>
+#include <Dictionaries/ODBCBlockInputStream.h>
 #include <common/logger_useful.h>
 
 
diff --git a/dbms/include/DB/Dictionaries/ODBCDictionarySource.h b/dbms/src/Dictionaries/ODBCDictionarySource.h
similarity index 90%
rename from dbms/include/DB/Dictionaries/ODBCDictionarySource.h
rename to dbms/src/Dictionaries/ODBCDictionarySource.h
index c13807739dd..7dbf95e720f 100644
--- a/dbms/include/DB/Dictionaries/ODBCDictionarySource.h
+++ b/dbms/src/Dictionaries/ODBCDictionarySource.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/ExternalQueryBuilder.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/ExternalQueryBuilder.h>
+#include <Dictionaries/DictionaryStructure.h>
 
 
 namespace Poco
diff --git a/dbms/include/DB/Dictionaries/OwningBlockInputStream.h b/dbms/src/Dictionaries/OwningBlockInputStream.h
similarity index 93%
rename from dbms/include/DB/Dictionaries/OwningBlockInputStream.h
rename to dbms/src/Dictionaries/OwningBlockInputStream.h
index adc40f21575..14f2e9665cd 100644
--- a/dbms/include/DB/Dictionaries/OwningBlockInputStream.h
+++ b/dbms/src/Dictionaries/OwningBlockInputStream.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 namespace DB
 {
diff --git a/dbms/src/Dictionaries/RangeHashedDictionary.cpp b/dbms/src/Dictionaries/RangeHashedDictionary.cpp
index d8a34957167..f106115d341 100644
--- a/dbms/src/Dictionaries/RangeHashedDictionary.cpp
+++ b/dbms/src/Dictionaries/RangeHashedDictionary.cpp
@@ -1,4 +1,4 @@
-#include <DB/Dictionaries/RangeHashedDictionary.h>
+#include <Dictionaries/RangeHashedDictionary.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Dictionaries/RangeHashedDictionary.h b/dbms/src/Dictionaries/RangeHashedDictionary.h
similarity index 96%
rename from dbms/include/DB/Dictionaries/RangeHashedDictionary.h
rename to dbms/src/Dictionaries/RangeHashedDictionary.h
index 6c0ea4e2b19..142b2e31782 100644
--- a/dbms/include/DB/Dictionaries/RangeHashedDictionary.h
+++ b/dbms/src/Dictionaries/RangeHashedDictionary.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionary.h>
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Columns/ColumnString.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Common/HashTable/HashMap.h>
+#include <Columns/ColumnString.h>
 #include <ext/range.hpp>
 #include <atomic>
 #include <memory>
diff --git a/dbms/include/DB/Dictionaries/writeParenthesisedString.h b/dbms/src/Dictionaries/writeParenthesisedString.h
similarity index 76%
rename from dbms/include/DB/Dictionaries/writeParenthesisedString.h
rename to dbms/src/Dictionaries/writeParenthesisedString.h
index 1adadf8bed9..e4f21a9ff62 100644
--- a/dbms/include/DB/Dictionaries/writeParenthesisedString.h
+++ b/dbms/src/Dictionaries/writeParenthesisedString.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Functions/AccurateComparison.h b/dbms/src/Functions/AccurateComparison.h
similarity index 99%
rename from dbms/include/DB/Functions/AccurateComparison.h
rename to dbms/src/Functions/AccurateComparison.h
index 50a0142aef0..292da1a90ff 100644
--- a/dbms/include/DB/Functions/AccurateComparison.h
+++ b/dbms/src/Functions/AccurateComparison.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <limits>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 /** Preceptually-correct number comparisons.
   * Example: Int8(-1) != UInt8(255)
diff --git a/dbms/src/Functions/Conditional/ArgsInfo.cpp b/dbms/src/Functions/Conditional/ArgsInfo.cpp
index 95cd8df5939..f3b9df0a5c5 100644
--- a/dbms/src/Functions/Conditional/ArgsInfo.cpp
+++ b/dbms/src/Functions/Conditional/ArgsInfo.cpp
@@ -1,13 +1,13 @@
-#include <DB/Functions/Conditional/ArgsInfo.h>
-#include <DB/Functions/Conditional/CondException.h>
-#include <DB/Functions/Conditional/common.h>
-#include <DB/Functions/DataTypeTraits.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Functions/Conditional/ArgsInfo.h>
+#include <Functions/Conditional/CondException.h>
+#include <Functions/Conditional/common.h>
+#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/Conditional/ArgsInfo.h b/dbms/src/Functions/Conditional/ArgsInfo.h
similarity index 97%
rename from dbms/include/DB/Functions/Conditional/ArgsInfo.h
rename to dbms/src/Functions/Conditional/ArgsInfo.h
index 6ce58403eb4..82f6c00a4d7 100644
--- a/dbms/include/DB/Functions/Conditional/ArgsInfo.h
+++ b/dbms/src/Functions/Conditional/ArgsInfo.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/Conditional/ArrayEvaluator.h b/dbms/src/Functions/Conditional/ArrayEvaluator.h
similarity index 96%
rename from dbms/include/DB/Functions/Conditional/ArrayEvaluator.h
rename to dbms/src/Functions/Conditional/ArrayEvaluator.h
index 7aac7df3b78..ef226f0160e 100644
--- a/dbms/include/DB/Functions/Conditional/ArrayEvaluator.h
+++ b/dbms/src/Functions/Conditional/ArrayEvaluator.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <DB/Functions/Conditional/CondException.h>
-#include <DB/Functions/Conditional/common.h>
-#include <DB/Functions/Conditional/NullMapBuilder.h>
-#include <DB/Functions/Conditional/CondSource.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Common/memcpySmall.h>
-#include <DB/Functions/NumberTraits.h>
+#include <Functions/Conditional/CondException.h>
+#include <Functions/Conditional/common.h>
+#include <Functions/Conditional/NullMapBuilder.h>
+#include <Functions/Conditional/CondSource.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Common/memcpySmall.h>
+#include <Functions/NumberTraits.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Functions/Conditional/CondException.h b/dbms/src/Functions/Conditional/CondException.h
similarity index 97%
rename from dbms/include/DB/Functions/Conditional/CondException.h
rename to dbms/src/Functions/Conditional/CondException.h
index 4d03bcf5407..be20cf8cd1a 100644
--- a/dbms/include/DB/Functions/Conditional/CondException.h
+++ b/dbms/src/Functions/Conditional/CondException.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
diff --git a/dbms/src/Functions/Conditional/CondSource.cpp b/dbms/src/Functions/Conditional/CondSource.cpp
index a006f1fd052..cb286f9abab 100644
--- a/dbms/src/Functions/Conditional/CondSource.cpp
+++ b/dbms/src/Functions/Conditional/CondSource.cpp
@@ -1,10 +1,10 @@
-#include <DB/Functions/Conditional/CondSource.h>
-#include <DB/Functions/Conditional/CondException.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Functions/Conditional/CondSource.h>
+#include <Functions/Conditional/CondException.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Functions/Conditional/CondSource.h b/dbms/src/Functions/Conditional/CondSource.h
similarity index 93%
rename from dbms/include/DB/Functions/Conditional/CondSource.h
rename to dbms/src/Functions/Conditional/CondSource.h
index 8a82278106f..f7f559ed14a 100644
--- a/dbms/include/DB/Functions/Conditional/CondSource.h
+++ b/dbms/src/Functions/Conditional/CondSource.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Common/PODArray.h>
-#include <DB/Core/Block.h>
-#include <DB/Core/ColumnNumbers.h>
+#include <Common/PODArray.h>
+#include <Core/Block.h>
+#include <Core/ColumnNumbers.h>
 
 namespace DB
 {
diff --git a/dbms/src/Functions/Conditional/NullMapBuilder.cpp b/dbms/src/Functions/Conditional/NullMapBuilder.cpp
index 775c856e256..d986bd6f2e2 100644
--- a/dbms/src/Functions/Conditional/NullMapBuilder.cpp
+++ b/dbms/src/Functions/Conditional/NullMapBuilder.cpp
@@ -1,6 +1,6 @@
-#include <DB/Functions/Conditional/NullMapBuilder.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Functions/Conditional/NullMapBuilder.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnNullable.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/Conditional/NullMapBuilder.h b/dbms/src/Functions/Conditional/NullMapBuilder.h
similarity index 98%
rename from dbms/include/DB/Functions/Conditional/NullMapBuilder.h
rename to dbms/src/Functions/Conditional/NullMapBuilder.h
index 94e77be052d..a6c2ef1a806 100644
--- a/dbms/include/DB/Functions/Conditional/NullMapBuilder.h
+++ b/dbms/src/Functions/Conditional/NullMapBuilder.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Block.h>
+#include <Core/Block.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/Conditional/NumericEvaluator.h b/dbms/src/Functions/Conditional/NumericEvaluator.h
similarity index 95%
rename from dbms/include/DB/Functions/Conditional/NumericEvaluator.h
rename to dbms/src/Functions/Conditional/NumericEvaluator.h
index 70763a8583a..2c01a4c9459 100644
--- a/dbms/include/DB/Functions/Conditional/NumericEvaluator.h
+++ b/dbms/src/Functions/Conditional/NumericEvaluator.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <DB/Functions/Conditional/CondException.h>
-#include <DB/Functions/Conditional/common.h>
-#include <DB/Functions/Conditional/NullMapBuilder.h>
-#include <DB/Functions/Conditional/CondSource.h>
-#include <DB/Functions/NumberTraits.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Functions/Conditional/CondException.h>
+#include <Functions/Conditional/common.h>
+#include <Functions/Conditional/NullMapBuilder.h>
+#include <Functions/Conditional/CondSource.h>
+#include <Functions/NumberTraits.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/Conditional/NumericPerformer.cpp b/dbms/src/Functions/Conditional/NumericPerformer.cpp
index e6ec9b0c5d9..61d9e0a14f3 100644
--- a/dbms/src/Functions/Conditional/NumericPerformer.cpp
+++ b/dbms/src/Functions/Conditional/NumericPerformer.cpp
@@ -1,16 +1,16 @@
-#include <DB/Functions/Conditional/NumericPerformer.h>
-#include <DB/Functions/Conditional/NullMapBuilder.h>
-#include <DB/Functions/Conditional/CondException.h>
-#include <DB/Functions/Conditional/ArgsInfo.h>
-#include <DB/Functions/Conditional/NumericEvaluator.h>
-#include <DB/Functions/Conditional/ArrayEvaluator.h>
-#include <DB/Functions/NumberTraits.h>
-#include <DB/Functions/DataTypeTraits.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
+#include <Functions/Conditional/NumericPerformer.h>
+#include <Functions/Conditional/NullMapBuilder.h>
+#include <Functions/Conditional/CondException.h>
+#include <Functions/Conditional/ArgsInfo.h>
+#include <Functions/Conditional/NumericEvaluator.h>
+#include <Functions/Conditional/ArrayEvaluator.h>
+#include <Functions/NumberTraits.h>
+#include <Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/Conditional/NumericPerformer.h b/dbms/src/Functions/Conditional/NumericPerformer.h
similarity index 88%
rename from dbms/include/DB/Functions/Conditional/NumericPerformer.h
rename to dbms/src/Functions/Conditional/NumericPerformer.h
index 1b24de089d7..ef51270da4b 100644
--- a/dbms/include/DB/Functions/Conditional/NumericPerformer.h
+++ b/dbms/src/Functions/Conditional/NumericPerformer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/Core/ColumnNumbers.h>
+#include <Core/Block.h>
+#include <Core/ColumnNumbers.h>
 
 namespace DB
 {
diff --git a/dbms/src/Functions/Conditional/StringArrayEvaluator.cpp b/dbms/src/Functions/Conditional/StringArrayEvaluator.cpp
index 50806af8330..163651f7e8f 100644
--- a/dbms/src/Functions/Conditional/StringArrayEvaluator.cpp
+++ b/dbms/src/Functions/Conditional/StringArrayEvaluator.cpp
@@ -1,12 +1,12 @@
-#include <DB/Functions/Conditional/StringArrayEvaluator.h>
-#include <DB/Functions/Conditional/CondSource.h>
-#include <DB/Functions/Conditional/common.h>
-#include <DB/Functions/Conditional/NullMapBuilder.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnFixedString.h>
+#include <Functions/Conditional/StringArrayEvaluator.h>
+#include <Functions/Conditional/CondSource.h>
+#include <Functions/Conditional/common.h>
+#include <Functions/Conditional/NullMapBuilder.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnFixedString.h>
 
 /// NOTE: this code is quite complicated and ugly because it handles
 /// the internals of arrays of strings.
diff --git a/dbms/include/DB/Functions/Conditional/StringArrayEvaluator.h b/dbms/src/Functions/Conditional/StringArrayEvaluator.h
similarity index 89%
rename from dbms/include/DB/Functions/Conditional/StringArrayEvaluator.h
rename to dbms/src/Functions/Conditional/StringArrayEvaluator.h
index 628215dd848..9c2a20b9b5c 100644
--- a/dbms/include/DB/Functions/Conditional/StringArrayEvaluator.h
+++ b/dbms/src/Functions/Conditional/StringArrayEvaluator.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/Core/ColumnNumbers.h>
+#include <Core/Block.h>
+#include <Core/ColumnNumbers.h>
 
 namespace DB
 {
diff --git a/dbms/src/Functions/Conditional/StringEvaluator.cpp b/dbms/src/Functions/Conditional/StringEvaluator.cpp
index 38dae164b71..5111cdcc682 100644
--- a/dbms/src/Functions/Conditional/StringEvaluator.cpp
+++ b/dbms/src/Functions/Conditional/StringEvaluator.cpp
@@ -1,16 +1,16 @@
-#include <DB/Functions/Conditional/StringEvaluator.h>
-#include <DB/Functions/Conditional/common.h>
-#include <DB/Functions/Conditional/NullMapBuilder.h>
-#include <DB/Functions/Conditional/CondSource.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Core/Types.h>
+#include <Functions/Conditional/StringEvaluator.h>
+#include <Functions/Conditional/common.h>
+#include <Functions/Conditional/NullMapBuilder.h>
+#include <Functions/Conditional/CondSource.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnsNumber.h>
+#include <Core/Types.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/Conditional/StringEvaluator.h b/dbms/src/Functions/Conditional/StringEvaluator.h
similarity index 84%
rename from dbms/include/DB/Functions/Conditional/StringEvaluator.h
rename to dbms/src/Functions/Conditional/StringEvaluator.h
index 0bd07946850..3f3b291f557 100644
--- a/dbms/include/DB/Functions/Conditional/StringEvaluator.h
+++ b/dbms/src/Functions/Conditional/StringEvaluator.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/Core/ColumnNumbers.h>
+#include <Core/Block.h>
+#include <Core/ColumnNumbers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/Conditional/common.h b/dbms/src/Functions/Conditional/common.h
similarity index 98%
rename from dbms/include/DB/Functions/Conditional/common.h
rename to dbms/src/Functions/Conditional/common.h
index a45e34a9777..e63681056fc 100644
--- a/dbms/include/DB/Functions/Conditional/common.h
+++ b/dbms/src/Functions/Conditional/common.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 #include <memory>
 
 namespace DB
diff --git a/dbms/src/Functions/Conditional/getArrayType.cpp b/dbms/src/Functions/Conditional/getArrayType.cpp
index e25267eb2aa..53ed9c18eaf 100644
--- a/dbms/src/Functions/Conditional/getArrayType.cpp
+++ b/dbms/src/Functions/Conditional/getArrayType.cpp
@@ -1,9 +1,9 @@
-#include <DB/Functions/Conditional/getArrayType.h>
-#include <DB/Functions/Conditional/CondException.h>
-#include <DB/Functions/Conditional/common.h>
-#include <DB/Functions/DataTypeTraits.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Functions/Conditional/getArrayType.h>
+#include <Functions/Conditional/CondException.h>
+#include <Functions/Conditional/common.h>
+#include <Functions/DataTypeTraits.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/Conditional/getArrayType.h b/dbms/src/Functions/Conditional/getArrayType.h
similarity index 71%
rename from dbms/include/DB/Functions/Conditional/getArrayType.h
rename to dbms/src/Functions/Conditional/getArrayType.h
index 7991b210917..c5f8736ae48 100644
--- a/dbms/include/DB/Functions/Conditional/getArrayType.h
+++ b/dbms/src/Functions/Conditional/getArrayType.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
-#include <DB/DataTypes/EnrichedDataTypePtr.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/EnrichedDataTypePtr.h>
 
 namespace DB
 {
diff --git a/dbms/src/Functions/DataTypeTraits.cpp b/dbms/src/Functions/DataTypeTraits.cpp
index c560ae26dfb..f22a49e270a 100644
--- a/dbms/src/Functions/DataTypeTraits.cpp
+++ b/dbms/src/Functions/DataTypeTraits.cpp
@@ -1,4 +1,4 @@
-#include <DB/Functions/DataTypeTraits.h>
+#include <Functions/DataTypeTraits.h>
 
 namespace DB { namespace DataTypeTraits {
 
diff --git a/dbms/include/DB/Functions/DataTypeTraits.h b/dbms/src/Functions/DataTypeTraits.h
similarity index 96%
rename from dbms/include/DB/Functions/DataTypeTraits.h
rename to dbms/src/Functions/DataTypeTraits.h
index 490b8cf5387..5c12d57fa44 100644
--- a/dbms/include/DB/Functions/DataTypeTraits.h
+++ b/dbms/src/Functions/DataTypeTraits.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Functions/NumberTraits.h>
-#include <DB/DataTypes/EnrichedDataTypePtr.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypeNull.h>
+#include <Functions/NumberTraits.h>
+#include <DataTypes/EnrichedDataTypePtr.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeNull.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionFactory.cpp b/dbms/src/Functions/FunctionFactory.cpp
index 2ba53761db7..ff0ec1b2a6b 100644
--- a/dbms/src/Functions/FunctionFactory.cpp
+++ b/dbms/src/Functions/FunctionFactory.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Common/Exception.h>
+#include <Functions/FunctionFactory.h>
+#include <Common/Exception.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Functions/FunctionFactory.h b/dbms/src/Functions/FunctionFactory.h
similarity index 100%
rename from dbms/include/DB/Functions/FunctionFactory.h
rename to dbms/src/Functions/FunctionFactory.h
diff --git a/dbms/src/Functions/FunctionsArithmetic.cpp b/dbms/src/Functions/FunctionsArithmetic.cpp
index 28dd89343ba..84c049e08a2 100644
--- a/dbms/src/Functions/FunctionsArithmetic.cpp
+++ b/dbms/src/Functions/FunctionsArithmetic.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsArithmetic.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsArithmetic.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsArithmetic.h b/dbms/src/Functions/FunctionsArithmetic.h
similarity index 99%
rename from dbms/include/DB/Functions/FunctionsArithmetic.h
rename to dbms/src/Functions/FunctionsArithmetic.h
index 9026de55fb8..9fb659af477 100644
--- a/dbms/include/DB/Functions/FunctionsArithmetic.h
+++ b/dbms/src/Functions/FunctionsArithmetic.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/NumberTraits.h>
-#include <DB/Functions/AccurateComparison.h>
-#include <DB/Core/FieldVisitors.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
+#include <Functions/IFunction.h>
+#include <Functions/NumberTraits.h>
+#include <Functions/AccurateComparison.h>
+#include <Core/FieldVisitors.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsArray.cpp b/dbms/src/Functions/FunctionsArray.cpp
index 10a932f7761..b9c19caac99 100644
--- a/dbms/src/Functions/FunctionsArray.cpp
+++ b/dbms/src/Functions/FunctionsArray.cpp
@@ -1,20 +1,20 @@
-#include <DB/Functions/FunctionsArray.h>
+#include <Functions/FunctionsArray.h>
 
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsConversion.h>
-#include <DB/Functions/Conditional/getArrayType.h>
-#include <DB/Functions/Conditional/CondException.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Common/HashTable/ClearableHashMap.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Interpreters/AggregationCommon.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsConversion.h>
+#include <Functions/Conditional/getArrayType.h>
+#include <Functions/Conditional/CondException.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/ClearableHashMap.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTLiteral.h>
+#include <Interpreters/AggregationCommon.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnAggregateFunction.h>
 #include <tuple>
 #include <array>
 
diff --git a/dbms/include/DB/Functions/FunctionsArray.h b/dbms/src/Functions/FunctionsArray.h
similarity index 99%
rename from dbms/include/DB/Functions/FunctionsArray.h
rename to dbms/src/Functions/FunctionsArray.h
index f8f3b3271db..cd8228f4d2c 100644
--- a/dbms/include/DB/Functions/FunctionsArray.h
+++ b/dbms/src/Functions/FunctionsArray.h
@@ -1,22 +1,22 @@
 #pragma once
 
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeNullable.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnNullable.h>
 
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/DataTypeTraits.h>
-#include <DB/Functions/ObjectPool.h>
-#include <DB/Common/StringUtils.h>
+#include <Functions/IFunction.h>
+#include <Functions/DataTypeTraits.h>
+#include <Functions/ObjectPool.h>
+#include <Common/StringUtils.h>
 
 #include <ext/range.hpp>
 
diff --git a/dbms/src/Functions/FunctionsCharset.cpp b/dbms/src/Functions/FunctionsCharset.cpp
index a6ad3078284..c1499923b53 100644
--- a/dbms/src/Functions/FunctionsCharset.cpp
+++ b/dbms/src/Functions/FunctionsCharset.cpp
@@ -1,10 +1,10 @@
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/ObjectPool.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnConst.h>
+#include <Functions/IFunction.h>
+#include <Functions/ObjectPool.h>
+#include <Functions/FunctionFactory.h>
+#include <IO/WriteHelpers.h>
+#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
 #include <ext/range.hpp>
 
 #include <unicode/ucnv.h>
diff --git a/dbms/src/Functions/FunctionsCoding.cpp b/dbms/src/Functions/FunctionsCoding.cpp
index 88db680fed1..32e64ddb83d 100644
--- a/dbms/src/Functions/FunctionsCoding.cpp
+++ b/dbms/src/Functions/FunctionsCoding.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsCoding.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsCoding.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsCoding.h b/dbms/src/Functions/FunctionsCoding.h
similarity index 99%
rename from dbms/include/DB/Functions/FunctionsCoding.h
rename to dbms/src/Functions/FunctionsCoding.h
index 7d9e957a6da..508a2c8603e 100644
--- a/dbms/include/DB/Functions/FunctionsCoding.h
+++ b/dbms/src/Functions/FunctionsCoding.h
@@ -1,20 +1,20 @@
 #pragma once
 
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Functions/IFunction.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Functions/IFunction.h>
 
 #include <arpa/inet.h>
 #include <ext/range.hpp>
diff --git a/dbms/src/Functions/FunctionsComparison.cpp b/dbms/src/Functions/FunctionsComparison.cpp
index 558d636d3d8..4ee20fc7792 100644
--- a/dbms/src/Functions/FunctionsComparison.cpp
+++ b/dbms/src/Functions/FunctionsComparison.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsComparison.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsComparison.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsComparison.h b/dbms/src/Functions/FunctionsComparison.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsComparison.h
rename to dbms/src/Functions/FunctionsComparison.h
index 2b8eb7f2ca1..26c03d2233a 100644
--- a/dbms/include/DB/Functions/FunctionsComparison.h
+++ b/dbms/src/Functions/FunctionsComparison.h
@@ -1,26 +1,26 @@
 #pragma once
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnArray.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeEnum.h>
 
-#include <DB/Functions/FunctionsLogical.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/AccurateComparison.h>
+#include <Functions/FunctionsLogical.h>
+#include <Functions/IFunction.h>
+#include <Functions/AccurateComparison.h>
 
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
 
 #include <limits>
 #include <type_traits>
diff --git a/dbms/src/Functions/FunctionsConditional.cpp b/dbms/src/Functions/FunctionsConditional.cpp
index 9f3eff1c08e..4895bbb54de 100644
--- a/dbms/src/Functions/FunctionsConditional.cpp
+++ b/dbms/src/Functions/FunctionsConditional.cpp
@@ -1,16 +1,16 @@
-#include <DB/Functions/FunctionsConditional.h>
-#include <DB/Functions/FunctionsArray.h>
-#include <DB/Functions/FunctionsTransform.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/Conditional/common.h>
-#include <DB/Functions/Conditional/NullMapBuilder.h>
-#include <DB/Functions/Conditional/ArgsInfo.h>
-#include <DB/Functions/Conditional/CondSource.h>
-#include <DB/Functions/Conditional/NumericPerformer.h>
-#include <DB/Functions/Conditional/StringEvaluator.h>
-#include <DB/Functions/Conditional/StringArrayEvaluator.h>
-#include <DB/Functions/Conditional/CondException.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Functions/FunctionsConditional.h>
+#include <Functions/FunctionsArray.h>
+#include <Functions/FunctionsTransform.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/Conditional/common.h>
+#include <Functions/Conditional/NullMapBuilder.h>
+#include <Functions/Conditional/ArgsInfo.h>
+#include <Functions/Conditional/CondSource.h>
+#include <Functions/Conditional/NumericPerformer.h>
+#include <Functions/Conditional/StringEvaluator.h>
+#include <Functions/Conditional/StringArrayEvaluator.h>
+#include <Functions/Conditional/CondException.h>
+#include <Columns/ColumnNullable.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsConditional.h b/dbms/src/Functions/FunctionsConditional.h
similarity index 99%
rename from dbms/include/DB/Functions/FunctionsConditional.h
rename to dbms/src/Functions/FunctionsConditional.h
index b44fd4b0c2e..767b6f636e8 100644
--- a/dbms/include/DB/Functions/FunctionsConditional.h
+++ b/dbms/src/Functions/FunctionsConditional.h
@@ -1,20 +1,20 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/NumberTraits.h>
-#include <DB/Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnNullable.h>
+#include <Functions/IFunction.h>
+#include <Functions/NumberTraits.h>
+#include <Functions/DataTypeTraits.h>
 
 namespace DB
 {
diff --git a/dbms/src/Functions/FunctionsConversion.cpp b/dbms/src/Functions/FunctionsConversion.cpp
index 30b551d87be..4a778c2e8c6 100644
--- a/dbms/src/Functions/FunctionsConversion.cpp
+++ b/dbms/src/Functions/FunctionsConversion.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsConversion.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsConversion.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsConversion.h b/dbms/src/Functions/FunctionsConversion.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsConversion.h
rename to dbms/src/Functions/FunctionsConversion.h
index 8c5f18eb58f..3781ec44dfc 100644
--- a/dbms/include/DB/Functions/FunctionsConversion.h
+++ b/dbms/src/Functions/FunctionsConversion.h
@@ -5,31 +5,31 @@
 #include <ext/range.hpp>
 #include <type_traits>
 
-#include <DB/IO/WriteBufferFromVector.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/Operators.h>
-#include <DB/IO/ReadBufferFromMemory.h>
-#include <DB/DataTypes/DataTypeFactory.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeEnum.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/FunctionsMiscellaneous.h>
-#include <DB/Functions/FunctionsDateTime.h>
+#include <IO/WriteBufferFromVector.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/Operators.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnTuple.h>
+#include <Core/FieldVisitors.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Functions/IFunction.h>
+#include <Functions/FunctionsMiscellaneous.h>
+#include <Functions/FunctionsDateTime.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsDateTime.cpp b/dbms/src/Functions/FunctionsDateTime.cpp
index db44c747839..029944b9652 100644
--- a/dbms/src/Functions/FunctionsDateTime.cpp
+++ b/dbms/src/Functions/FunctionsDateTime.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsDateTime.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsDateTime.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsDateTime.h b/dbms/src/Functions/FunctionsDateTime.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsDateTime.h
rename to dbms/src/Functions/FunctionsDateTime.h
index 19576b58b91..a10f040cafe 100644
--- a/dbms/include/DB/Functions/FunctionsDateTime.h
+++ b/dbms/src/Functions/FunctionsDateTime.h
@@ -1,19 +1,19 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnFixedString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnFixedString.h>
 
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Functions/IFunction.h>
+#include <Functions/IFunction.h>
 
 #include <common/DateLUT.h>
 
diff --git a/dbms/src/Functions/FunctionsEmbeddedDictionaries.cpp b/dbms/src/Functions/FunctionsEmbeddedDictionaries.cpp
index 3501f1551df..c48f52805b4 100644
--- a/dbms/src/Functions/FunctionsEmbeddedDictionaries.cpp
+++ b/dbms/src/Functions/FunctionsEmbeddedDictionaries.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsEmbeddedDictionaries.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsEmbeddedDictionaries.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsEmbeddedDictionaries.h b/dbms/src/Functions/FunctionsEmbeddedDictionaries.h
similarity index 97%
rename from dbms/include/DB/Functions/FunctionsEmbeddedDictionaries.h
rename to dbms/src/Functions/FunctionsEmbeddedDictionaries.h
index ed8dc904756..277ed4e054d 100644
--- a/dbms/include/DB/Functions/FunctionsEmbeddedDictionaries.h
+++ b/dbms/src/Functions/FunctionsEmbeddedDictionaries.h
@@ -1,22 +1,22 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/EmbeddedDictionaries.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/EmbeddedDictionaries.h>
 
-#include <DB/Functions/IFunction.h>
-#include <DB/Dictionaries/Embedded/RegionsHierarchy.h>
-#include <DB/Dictionaries/Embedded/RegionsHierarchies.h>
-#include <DB/Dictionaries/Embedded/RegionsNames.h>
-#include <DB/Dictionaries/Embedded/TechDataHierarchy.h>
+#include <Functions/IFunction.h>
+#include <Dictionaries/Embedded/RegionsHierarchy.h>
+#include <Dictionaries/Embedded/RegionsHierarchies.h>
+#include <Dictionaries/Embedded/RegionsNames.h>
+#include <Dictionaries/Embedded/TechDataHierarchy.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsExternalDictionaries.cpp b/dbms/src/Functions/FunctionsExternalDictionaries.cpp
index daf69307372..b8bab620058 100644
--- a/dbms/src/Functions/FunctionsExternalDictionaries.cpp
+++ b/dbms/src/Functions/FunctionsExternalDictionaries.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsExternalDictionaries.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsExternalDictionaries.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsExternalDictionaries.h b/dbms/src/Functions/FunctionsExternalDictionaries.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsExternalDictionaries.h
rename to dbms/src/Functions/FunctionsExternalDictionaries.h
index cb76aecd130..375f5212911 100644
--- a/dbms/include/DB/Functions/FunctionsExternalDictionaries.h
+++ b/dbms/src/Functions/FunctionsExternalDictionaries.h
@@ -1,28 +1,28 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeTuple.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/ExternalDictionaries.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExternalDictionaries.h>
 
-#include <DB/Functions/IFunction.h>
-#include <DB/Dictionaries/FlatDictionary.h>
-#include <DB/Dictionaries/HashedDictionary.h>
-#include <DB/Dictionaries/CacheDictionary.h>
-#include <DB/Dictionaries/ComplexKeyHashedDictionary.h>
-#include <DB/Dictionaries/ComplexKeyCacheDictionary.h>
-#include <DB/Dictionaries/RangeHashedDictionary.h>
+#include <Functions/IFunction.h>
+#include <Dictionaries/FlatDictionary.h>
+#include <Dictionaries/HashedDictionary.h>
+#include <Dictionaries/CacheDictionary.h>
+#include <Dictionaries/ComplexKeyHashedDictionary.h>
+#include <Dictionaries/ComplexKeyCacheDictionary.h>
+#include <Dictionaries/RangeHashedDictionary.h>
 
 #include <ext/range.hpp>
 
diff --git a/dbms/src/Functions/FunctionsFormatting.cpp b/dbms/src/Functions/FunctionsFormatting.cpp
index 8a22d787795..64c62d0ff44 100644
--- a/dbms/src/Functions/FunctionsFormatting.cpp
+++ b/dbms/src/Functions/FunctionsFormatting.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsFormatting.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsFormatting.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsFormatting.h b/dbms/src/Functions/FunctionsFormatting.h
similarity index 95%
rename from dbms/include/DB/Functions/FunctionsFormatting.h
rename to dbms/src/Functions/FunctionsFormatting.h
index e31992e954c..288c453f464 100644
--- a/dbms/include/DB/Functions/FunctionsFormatting.h
+++ b/dbms/src/Functions/FunctionsFormatting.h
@@ -1,13 +1,13 @@
-#include <DB/Functions/IFunction.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/IO/WriteBufferFromVector.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/formatReadable.h>
+#include <Functions/IFunction.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <IO/WriteBufferFromVector.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Common/formatReadable.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsGeo.cpp b/dbms/src/Functions/FunctionsGeo.cpp
index 5994881edc7..e76daa6afa0 100644
--- a/dbms/src/Functions/FunctionsGeo.cpp
+++ b/dbms/src/Functions/FunctionsGeo.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsGeo.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsGeo.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Functions/FunctionsGeo.h b/dbms/src/Functions/FunctionsGeo.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsGeo.h
rename to dbms/src/Functions/FunctionsGeo.h
index 15afcd71378..aaa76c6b0f9 100644
--- a/dbms/include/DB/Functions/FunctionsGeo.h
+++ b/dbms/src/Functions/FunctionsGeo.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Functions/IFunction.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <Functions/IFunction.h>
 #include <ext/range.hpp>
 #include <math.h>
 #include <array>
diff --git a/dbms/src/Functions/FunctionsHashing.cpp b/dbms/src/Functions/FunctionsHashing.cpp
index 307a5b1cc05..2aca07e477d 100644
--- a/dbms/src/Functions/FunctionsHashing.cpp
+++ b/dbms/src/Functions/FunctionsHashing.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsHashing.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsHashing.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Functions/FunctionsHashing.h b/dbms/src/Functions/FunctionsHashing.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsHashing.h
rename to dbms/src/Functions/FunctionsHashing.h
index c966617bf8a..b07f1f04136 100644
--- a/dbms/include/DB/Functions/FunctionsHashing.h
+++ b/dbms/src/Functions/FunctionsHashing.h
@@ -8,22 +8,22 @@
 
 #include <Poco/ByteOrder.h>
 
-#include <DB/Common/SipHash.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeEnum.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Common/HashTable/Hash.h>
-#include <DB/Functions/IFunction.h>
+#include <Common/SipHash.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <Common/HashTable/Hash.h>
+#include <Functions/IFunction.h>
 
 #include <ext/range.hpp>
 
diff --git a/dbms/src/Functions/FunctionsHigherOrder.cpp b/dbms/src/Functions/FunctionsHigherOrder.cpp
index 8cf4c7d98e9..0c93b64b9c7 100644
--- a/dbms/src/Functions/FunctionsHigherOrder.cpp
+++ b/dbms/src/Functions/FunctionsHigherOrder.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsHigherOrder.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsHigherOrder.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsHigherOrder.h b/dbms/src/Functions/FunctionsHigherOrder.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsHigherOrder.h
rename to dbms/src/Functions/FunctionsHigherOrder.h
index 5d573486432..7439f779dea 100644
--- a/dbms/include/DB/Functions/FunctionsHigherOrder.h
+++ b/dbms/src/Functions/FunctionsHigherOrder.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeExpression.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnExpression.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/FunctionsMiscellaneous.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeExpression.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnExpression.h>
+#include <Functions/IFunction.h>
+#include <Functions/FunctionsMiscellaneous.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsLogical.cpp b/dbms/src/Functions/FunctionsLogical.cpp
index 3e14e77efb8..29035366909 100644
--- a/dbms/src/Functions/FunctionsLogical.cpp
+++ b/dbms/src/Functions/FunctionsLogical.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsLogical.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsLogical.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsLogical.h b/dbms/src/Functions/FunctionsLogical.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsLogical.h
rename to dbms/src/Functions/FunctionsLogical.h
index 48c3f9626a0..6f5ddf32673 100644
--- a/dbms/include/DB/Functions/FunctionsLogical.h
+++ b/dbms/src/Functions/FunctionsLogical.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/FunctionsArithmetic.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <IO/WriteHelpers.h>
+#include <Functions/IFunction.h>
+#include <Functions/FunctionsArithmetic.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsMath.cpp b/dbms/src/Functions/FunctionsMath.cpp
index a1d5db78505..49036dbe247 100644
--- a/dbms/src/Functions/FunctionsMath.cpp
+++ b/dbms/src/Functions/FunctionsMath.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsMath.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsMath.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsMath.h b/dbms/src/Functions/FunctionsMath.h
similarity index 99%
rename from dbms/include/DB/Functions/FunctionsMath.h
rename to dbms/src/Functions/FunctionsMath.h
index f9c39feda83..ed808067b53 100644
--- a/dbms/include/DB/Functions/FunctionsMath.h
+++ b/dbms/src/Functions/FunctionsMath.h
@@ -1,11 +1,11 @@
 #pragma once
 
 #include <common/exp10.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Common/config.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnConst.h>
+#include <Functions/IFunction.h>
+#include <Common/config.h>
 
 /** More effective implementations of mathematical functions are possible when connecting a separate library
   * Disabled due licence compatibility limitations
diff --git a/dbms/src/Functions/FunctionsMiscellaneous.cpp b/dbms/src/Functions/FunctionsMiscellaneous.cpp
index 3726673a81c..1a130ca8a8d 100644
--- a/dbms/src/Functions/FunctionsMiscellaneous.cpp
+++ b/dbms/src/Functions/FunctionsMiscellaneous.cpp
@@ -1,23 +1,23 @@
-#include <DB/Functions/FunctionsMiscellaneous.h>
+#include <Functions/FunctionsMiscellaneous.h>
 
 #include <cmath>
 #include <ext/range.hpp>
 #include <Poco/Net/DNS.h>
-#include <DB/Common/ClickHouseRevision.h>
-#include <DB/Columns/ColumnSet.h>
-#include <DB/Common/UnicodeBar.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/Set.h>
-#include <DB/Storages/IStorage.h>
+#include <Common/ClickHouseRevision.h>
+#include <Columns/ColumnSet.h>
+#include <Common/UnicodeBar.h>
+#include <Core/FieldVisitors.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/Set.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Functions/FunctionsMiscellaneous.h b/dbms/src/Functions/FunctionsMiscellaneous.h
similarity index 84%
rename from dbms/include/DB/Functions/FunctionsMiscellaneous.h
rename to dbms/src/Functions/FunctionsMiscellaneous.h
index 2a09a3e05ae..d2d516a26f4 100644
--- a/dbms/include/DB/Functions/FunctionsMiscellaneous.h
+++ b/dbms/src/Functions/FunctionsMiscellaneous.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/Columns/ColumnAggregateFunction.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/NumberTraits.h>
-#include <DB/Interpreters/ExpressionActions.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
+#include <Functions/IFunction.h>
+#include <Functions/NumberTraits.h>
+#include <Interpreters/ExpressionActions.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsNull.cpp b/dbms/src/Functions/FunctionsNull.cpp
index f6b04986198..9510fac0a72 100644
--- a/dbms/src/Functions/FunctionsNull.cpp
+++ b/dbms/src/Functions/FunctionsNull.cpp
@@ -1,13 +1,13 @@
-#include <DB/Functions/FunctionsNull.h>
-#include <DB/Functions/FunctionsLogical.h>
-#include <DB/Functions/FunctionsComparison.h>
-#include <DB/Functions/FunctionsConditional.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeNull.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Functions/FunctionsNull.h>
+#include <Functions/FunctionsLogical.h>
+#include <Functions/FunctionsComparison.h>
+#include <Functions/FunctionsConditional.h>
+#include <Functions/FunctionFactory.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNull.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsNull.h b/dbms/src/Functions/FunctionsNull.h
similarity index 97%
rename from dbms/include/DB/Functions/FunctionsNull.h
rename to dbms/src/Functions/FunctionsNull.h
index 88245f47679..f1ef52de818 100644
--- a/dbms/include/DB/Functions/FunctionsNull.h
+++ b/dbms/src/Functions/FunctionsNull.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Functions/IFunction.h>
-#include <DB/DataTypes/IDataType.h>
-#include <DB/Core/ColumnNumbers.h>
+#include <Functions/IFunction.h>
+#include <DataTypes/IDataType.h>
+#include <Core/ColumnNumbers.h>
 
 namespace DB
 {
diff --git a/dbms/src/Functions/FunctionsRandom.cpp b/dbms/src/Functions/FunctionsRandom.cpp
index 6766f5bd09a..40e30e2c421 100644
--- a/dbms/src/Functions/FunctionsRandom.cpp
+++ b/dbms/src/Functions/FunctionsRandom.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsRandom.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsRandom.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsRandom.h b/dbms/src/Functions/FunctionsRandom.h
similarity index 97%
rename from dbms/include/DB/Functions/FunctionsRandom.h
rename to dbms/src/Functions/FunctionsRandom.h
index 104f719f7f6..7b514751713 100644
--- a/dbms/include/DB/Functions/FunctionsRandom.h
+++ b/dbms/src/Functions/FunctionsRandom.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/HashTable/Hash.h>
-#include <DB/Common/randomSeed.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
+#include <Functions/IFunction.h>
+#include <IO/WriteHelpers.h>
+#include <Common/HashTable/Hash.h>
+#include <Common/randomSeed.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsReinterpret.cpp b/dbms/src/Functions/FunctionsReinterpret.cpp
index f0f89ca3c16..b5e2b14dd10 100644
--- a/dbms/src/Functions/FunctionsReinterpret.cpp
+++ b/dbms/src/Functions/FunctionsReinterpret.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsReinterpret.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsReinterpret.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsReinterpret.h b/dbms/src/Functions/FunctionsReinterpret.h
similarity index 96%
rename from dbms/include/DB/Functions/FunctionsReinterpret.h
rename to dbms/src/Functions/FunctionsReinterpret.h
index 461dc517cc0..5e7f72075b9 100644
--- a/dbms/include/DB/Functions/FunctionsReinterpret.h
+++ b/dbms/src/Functions/FunctionsReinterpret.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Functions/IFunction.h>
+#include <IO/ReadBufferFromString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnConst.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsRound.cpp b/dbms/src/Functions/FunctionsRound.cpp
index f98179eab95..c252787c9aa 100644
--- a/dbms/src/Functions/FunctionsRound.cpp
+++ b/dbms/src/Functions/FunctionsRound.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsRound.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsRound.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsRound.h b/dbms/src/Functions/FunctionsRound.h
similarity index 99%
rename from dbms/include/DB/Functions/FunctionsRound.h
rename to dbms/src/Functions/FunctionsRound.h
index 19719f0d431..8051380ac87 100644
--- a/dbms/include/DB/Functions/FunctionsRound.h
+++ b/dbms/src/Functions/FunctionsRound.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Functions/FunctionsArithmetic.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Functions/FunctionsArithmetic.h>
+#include <IO/WriteHelpers.h>
 
 #include <cmath>
 #include <type_traits>
diff --git a/dbms/src/Functions/FunctionsString.cpp b/dbms/src/Functions/FunctionsString.cpp
index 317b8e52839..aa9ca486c6c 100644
--- a/dbms/src/Functions/FunctionsString.cpp
+++ b/dbms/src/Functions/FunctionsString.cpp
@@ -1,11 +1,11 @@
-#include <DB/Functions/FunctionsString.h>
+#include <Functions/FunctionsString.h>
 
 #include <ext/range.hpp>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsArray.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Columns/ColumnArray.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsArray.h>
+#include <IO/WriteHelpers.h>
 
 
 #if __SSE2__
diff --git a/dbms/include/DB/Functions/FunctionsString.h b/dbms/src/Functions/FunctionsString.h
similarity index 96%
rename from dbms/include/DB/Functions/FunctionsString.h
rename to dbms/src/Functions/FunctionsString.h
index 7361e991b92..8dacaba47c3 100644
--- a/dbms/include/DB/Functions/FunctionsString.h
+++ b/dbms/src/Functions/FunctionsString.h
@@ -2,13 +2,13 @@
 
 #include <Poco/UTF8Encoding.h>
 #include <Poco/Unicode.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Functions/IFunction.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeString.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsStringArray.cpp b/dbms/src/Functions/FunctionsStringArray.cpp
index 94cc83c4469..97fd34fb1e8 100644
--- a/dbms/src/Functions/FunctionsStringArray.cpp
+++ b/dbms/src/Functions/FunctionsStringArray.cpp
@@ -1,5 +1,5 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsStringArray.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsStringArray.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsStringArray.h b/dbms/src/Functions/FunctionsStringArray.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsStringArray.h
rename to dbms/src/Functions/FunctionsStringArray.h
index 43f99889ba7..30bbc0e8abf 100644
--- a/dbms/include/DB/Functions/FunctionsStringArray.h
+++ b/dbms/src/Functions/FunctionsStringArray.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Functions/Regexps.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/IO/WriteHelpers.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnArray.h>
+#include <Common/StringUtils.h>
+#include <Functions/IFunction.h>
+#include <Functions/Regexps.h>
+#include <DataTypes/DataTypeString.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsStringSearch.cpp b/dbms/src/Functions/FunctionsStringSearch.cpp
index ac9ace5a752..9d8a72098c5 100644
--- a/dbms/src/Functions/FunctionsStringSearch.cpp
+++ b/dbms/src/Functions/FunctionsStringSearch.cpp
@@ -1,15 +1,15 @@
-#include <DB/Functions/FunctionsStringSearch.h>
+#include <Functions/FunctionsStringSearch.h>
 
 #include <memory>
 #include <mutex>
 #include <Poco/UTF8String.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Common/Volnitsky.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/Regexps.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/config.h>
+#include <Columns/ColumnFixedString.h>
+#include <Common/Volnitsky.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/Regexps.h>
+#include <IO/WriteHelpers.h>
+#include <Common/config.h>
 #include <re2/re2.h>
 #include <re2/stringpiece.h>
 
diff --git a/dbms/include/DB/Functions/FunctionsStringSearch.h b/dbms/src/Functions/FunctionsStringSearch.h
similarity index 97%
rename from dbms/include/DB/Functions/FunctionsStringSearch.h
rename to dbms/src/Functions/FunctionsStringSearch.h
index 2c193e00109..633aa0928ed 100644
--- a/dbms/include/DB/Functions/FunctionsStringSearch.h
+++ b/dbms/src/Functions/FunctionsStringSearch.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Functions/FunctionsArithmetic.h>
-#include <DB/Functions/IFunction.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <Functions/FunctionsArithmetic.h>
+#include <Functions/IFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsTransform.cpp b/dbms/src/Functions/FunctionsTransform.cpp
index beaa4fa68d7..dbd7c487cb2 100644
--- a/dbms/src/Functions/FunctionsTransform.cpp
+++ b/dbms/src/Functions/FunctionsTransform.cpp
@@ -1,6 +1,6 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsTransform.h>
-#include <DB/Functions/DataTypeTraits.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsTransform.h>
+#include <Functions/DataTypeTraits.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/FunctionsTransform.h b/dbms/src/Functions/FunctionsTransform.h
similarity index 98%
rename from dbms/include/DB/Functions/FunctionsTransform.h
rename to dbms/src/Functions/FunctionsTransform.h
index d89c4d3587c..7800919c2d5 100644
--- a/dbms/include/DB/Functions/FunctionsTransform.h
+++ b/dbms/src/Functions/FunctionsTransform.h
@@ -2,18 +2,18 @@
 
 #include <mutex>
 
-#include <DB/Core/FieldVisitors.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Common/Arena.h>
-#include <DB/Core/StringRef.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/DataTypes/EnrichedDataTypePtr.h>
+#include <Core/FieldVisitors.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnsNumber.h>
+#include <Common/Arena.h>
+#include <Core/StringRef.h>
+#include <Common/HashTable/HashMap.h>
+#include <Functions/IFunction.h>
+#include <DataTypes/EnrichedDataTypePtr.h>
 
 
 namespace DB
diff --git a/dbms/src/Functions/FunctionsURL.cpp b/dbms/src/Functions/FunctionsURL.cpp
index f3e8f1e18b0..95bb9b65ec2 100644
--- a/dbms/src/Functions/FunctionsURL.cpp
+++ b/dbms/src/Functions/FunctionsURL.cpp
@@ -1,7 +1,7 @@
-#include <DB/Common/hex.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsURL.h>
-#include <DB/Functions/FunctionsStringSearch.h>
+#include <Common/hex.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsURL.h>
+#include <Functions/FunctionsStringSearch.h>
 #include <common/find_first_symbols.h>
 
 namespace DB
diff --git a/dbms/include/DB/Functions/FunctionsURL.h b/dbms/src/Functions/FunctionsURL.h
similarity index 99%
rename from dbms/include/DB/Functions/FunctionsURL.h
rename to dbms/src/Functions/FunctionsURL.h
index a8a1a5ab271..66786853c91 100644
--- a/dbms/include/DB/Functions/FunctionsURL.h
+++ b/dbms/src/Functions/FunctionsURL.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Common/StringView.h>
-#include <DB/Functions/FunctionsString.h>
-#include <DB/Functions/FunctionsStringArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+#include <Common/StringUtils.h>
+#include <Common/StringView.h>
+#include <Functions/FunctionsString.h>
+#include <Functions/FunctionsStringArray.h>
 
 #ifdef __APPLE__
 #include <common/apple_memrchr.h>
diff --git a/dbms/src/Functions/FunctionsVisitParam.cpp b/dbms/src/Functions/FunctionsVisitParam.cpp
index 5bf7cfea3c1..58c6dae729d 100644
--- a/dbms/src/Functions/FunctionsVisitParam.cpp
+++ b/dbms/src/Functions/FunctionsVisitParam.cpp
@@ -1,8 +1,8 @@
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/FunctionsVisitParam.h>
-#include <DB/Functions/FunctionsStringSearch.h>
-#include <DB/Functions/FunctionsString.h>
-#include <DB/Functions/FunctionsURL.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionsVisitParam.h>
+#include <Functions/FunctionsStringSearch.h>
+#include <Functions/FunctionsString.h>
+#include <Functions/FunctionsURL.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Functions/FunctionsVisitParam.h b/dbms/src/Functions/FunctionsVisitParam.h
similarity index 96%
rename from dbms/include/DB/Functions/FunctionsVisitParam.h
rename to dbms/src/Functions/FunctionsVisitParam.h
index e5e599fcbff..c6817438533 100644
--- a/dbms/include/DB/Functions/FunctionsVisitParam.h
+++ b/dbms/src/Functions/FunctionsVisitParam.h
@@ -2,18 +2,18 @@
 
 #include <Poco/UTF8Encoding.h>
 #include <Poco/Unicode.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Common/Volnitsky.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/IO/ReadBufferFromMemory.h>
-#include <DB/IO/ReadHelpers.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnConst.h>
+#include <Common/Volnitsky.h>
+#include <Functions/IFunction.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
 
 
 /** Функции для извлечения параметров визитов.
diff --git a/dbms/src/Functions/IFunction.cpp b/dbms/src/Functions/IFunction.cpp
index 346f796dd29..db0fe6dd60e 100644
--- a/dbms/src/Functions/IFunction.cpp
+++ b/dbms/src/Functions/IFunction.cpp
@@ -1,9 +1,9 @@
-#include <DB/Functions/IFunction.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/DataTypes/DataTypeNull.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Interpreters/ExpressionActions.h>
+#include <Functions/IFunction.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeNull.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Interpreters/ExpressionActions.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Functions/IFunction.h b/dbms/src/Functions/IFunction.h
similarity index 98%
rename from dbms/include/DB/Functions/IFunction.h
rename to dbms/src/Functions/IFunction.h
index bd452a3b589..80bfd13843f 100644
--- a/dbms/include/DB/Functions/IFunction.h
+++ b/dbms/src/Functions/IFunction.h
@@ -2,11 +2,11 @@
 
 #include <memory>
 
-#include <DB/Core/Names.h>
-#include <DB/Core/Block.h>
-#include <DB/Core/ColumnNumbers.h>
-#include <DB/Core/ColumnsWithTypeAndName.h>
-#include <DB/DataTypes/IDataType.h>
+#include <Core/Names.h>
+#include <Core/Block.h>
+#include <Core/ColumnNumbers.h>
+#include <Core/ColumnsWithTypeAndName.h>
+#include <DataTypes/IDataType.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Functions/NumberTraits.h b/dbms/src/Functions/NumberTraits.h
similarity index 99%
rename from dbms/include/DB/Functions/NumberTraits.h
rename to dbms/src/Functions/NumberTraits.h
index 66718e6038a..00149d1508f 100644
--- a/dbms/include/DB/Functions/NumberTraits.h
+++ b/dbms/src/Functions/NumberTraits.h
@@ -11,7 +11,7 @@
 #include <boost/mpl/equal_to.hpp>
 #include <boost/mpl/comparison.hpp>
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 #include <tuple>
 #include <type_traits>
 
diff --git a/dbms/include/DB/Functions/ObjectPool.h b/dbms/src/Functions/ObjectPool.h
similarity index 100%
rename from dbms/include/DB/Functions/ObjectPool.h
rename to dbms/src/Functions/ObjectPool.h
diff --git a/dbms/include/DB/Functions/Regexps.h b/dbms/src/Functions/Regexps.h
similarity index 87%
rename from dbms/include/DB/Functions/Regexps.h
rename to dbms/src/Functions/Regexps.h
index cba6d2b2527..117930aebbd 100644
--- a/dbms/include/DB/Functions/Regexps.h
+++ b/dbms/src/Functions/Regexps.h
@@ -1,8 +1,8 @@
 #pragma once
-#include <DB/Common/OptimizedRegularExpression.h>
-#include <DB/Functions/ObjectPool.h>
-#include <DB/Functions/likePatternToRegexp.h>
-#include <DB/Common/ProfileEvents.h>
+#include <Common/OptimizedRegularExpression.h>
+#include <Functions/ObjectPool.h>
+#include <Functions/likePatternToRegexp.h>
+#include <Common/ProfileEvents.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Functions/likePatternToRegexp.h b/dbms/src/Functions/likePatternToRegexp.h
similarity index 98%
rename from dbms/include/DB/Functions/likePatternToRegexp.h
rename to dbms/src/Functions/likePatternToRegexp.h
index e2cb9aa4229..9d769eb6fe4 100644
--- a/dbms/include/DB/Functions/likePatternToRegexp.h
+++ b/dbms/src/Functions/likePatternToRegexp.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 namespace DB
 {
diff --git a/dbms/src/Functions/tests/functions_arithmetic.cpp b/dbms/src/Functions/tests/functions_arithmetic.cpp
index 4d49072c306..a89e8a0362b 100644
--- a/dbms/src/Functions/tests/functions_arithmetic.cpp
+++ b/dbms/src/Functions/tests/functions_arithmetic.cpp
@@ -1,12 +1,12 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
 
-#include <DB/Functions/FunctionsArithmetic.h>
+#include <Functions/FunctionsArithmetic.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Functions/tests/logical_functions_performance.cpp b/dbms/src/Functions/tests/logical_functions_performance.cpp
index bd8595d4002..0a4980a4586 100644
--- a/dbms/src/Functions/tests/logical_functions_performance.cpp
+++ b/dbms/src/Functions/tests/logical_functions_performance.cpp
@@ -1,8 +1,8 @@
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/IO/WriteHelpers.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <Functions/IFunction.h>
+#include <Common/Stopwatch.h>
+#include <IO/WriteHelpers.h>
 #include <iomanip>
 
 
diff --git a/dbms/src/Functions/tests/number_traits.cpp b/dbms/src/Functions/tests/number_traits.cpp
index 8c396846c9f..22fab20c185 100644
--- a/dbms/src/Functions/tests/number_traits.cpp
+++ b/dbms/src/Functions/tests/number_traits.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 
-#include <DB/Functions/NumberTraits.h>
+#include <Functions/NumberTraits.h>
 
 
 void printType(DB::UInt8 x)        { std::cout << "UInt8"; }
diff --git a/dbms/include/DB/IO/AsynchronousWriteBuffer.h b/dbms/src/IO/AsynchronousWriteBuffer.h
similarity index 96%
rename from dbms/include/DB/IO/AsynchronousWriteBuffer.h
rename to dbms/src/IO/AsynchronousWriteBuffer.h
index 7b83da77693..aafb77a8ab6 100644
--- a/dbms/include/DB/IO/AsynchronousWriteBuffer.h
+++ b/dbms/src/IO/AsynchronousWriteBuffer.h
@@ -4,8 +4,8 @@
 
 #include <vector>
 
-#include <DB/Common/ThreadPool.h>
-#include <DB/IO/WriteBuffer.h>
+#include <Common/ThreadPool.h>
+#include <IO/WriteBuffer.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/BufferBase.h b/dbms/src/IO/BufferBase.h
similarity index 99%
rename from dbms/include/DB/IO/BufferBase.h
rename to dbms/src/IO/BufferBase.h
index cda7de680ae..9a119fc667a 100644
--- a/dbms/include/DB/IO/BufferBase.h
+++ b/dbms/src/IO/BufferBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Defines.h>
+#include <Core/Defines.h>
 #include <algorithm>
 
 
diff --git a/dbms/include/DB/IO/BufferWithOwnMemory.h b/dbms/src/IO/BufferWithOwnMemory.h
similarity index 96%
rename from dbms/include/DB/IO/BufferWithOwnMemory.h
rename to dbms/src/IO/BufferWithOwnMemory.h
index d283d435194..89ffcf053ac 100644
--- a/dbms/include/DB/IO/BufferWithOwnMemory.h
+++ b/dbms/src/IO/BufferWithOwnMemory.h
@@ -2,11 +2,11 @@
 
 #include <boost/noncopyable.hpp>
 
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/Allocator.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Allocator.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Core/Defines.h>
+#include <Common/Exception.h>
+#include <Core/Defines.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/src/IO/CachedCompressedReadBuffer.cpp b/dbms/src/IO/CachedCompressedReadBuffer.cpp
index 050d6099689..f65780fa7f6 100644
--- a/dbms/src/IO/CachedCompressedReadBuffer.cpp
+++ b/dbms/src/IO/CachedCompressedReadBuffer.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/CachedCompressedReadBuffer.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/CachedCompressedReadBuffer.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/CachedCompressedReadBuffer.h b/dbms/src/IO/CachedCompressedReadBuffer.h
similarity index 93%
rename from dbms/include/DB/IO/CachedCompressedReadBuffer.h
rename to dbms/src/IO/CachedCompressedReadBuffer.h
index 6d38c3a29c8..dc91c563689 100644
--- a/dbms/include/DB/IO/CachedCompressedReadBuffer.h
+++ b/dbms/src/IO/CachedCompressedReadBuffer.h
@@ -3,9 +3,9 @@
 #include <memory>
 #include <time.h>
 
-#include <DB/IO/createReadBufferFromFileBase.h>
-#include <DB/IO/CompressedReadBufferBase.h>
-#include <DB/IO/UncompressedCache.h>
+#include <IO/createReadBufferFromFileBase.h>
+#include <IO/CompressedReadBufferBase.h>
+#include <IO/UncompressedCache.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/CascadeWriteBuffer.cpp b/dbms/src/IO/CascadeWriteBuffer.cpp
index 4d3db611049..3d552129039 100644
--- a/dbms/src/IO/CascadeWriteBuffer.cpp
+++ b/dbms/src/IO/CascadeWriteBuffer.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/CascadeWriteBuffer.h>
-#include <DB/Common/Exception.h>
+#include <IO/CascadeWriteBuffer.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/IO/CascadeWriteBuffer.h b/dbms/src/IO/CascadeWriteBuffer.h
similarity index 98%
rename from dbms/include/DB/IO/CascadeWriteBuffer.h
rename to dbms/src/IO/CascadeWriteBuffer.h
index 66d5afba139..303ed55ad70 100644
--- a/dbms/include/DB/IO/CascadeWriteBuffer.h
+++ b/dbms/src/IO/CascadeWriteBuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <functional>
-#include <DB/IO/WriteBuffer.h>
+#include <IO/WriteBuffer.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/CompressedReadBuffer.cpp b/dbms/src/IO/CompressedReadBuffer.cpp
index e4ae6f9ef5f..e14cb568e7a 100644
--- a/dbms/src/IO/CompressedReadBuffer.cpp
+++ b/dbms/src/IO/CompressedReadBuffer.cpp
@@ -1,4 +1,4 @@
-#include <DB/IO/CompressedReadBuffer.h>
+#include <IO/CompressedReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/CompressedReadBuffer.h b/dbms/src/IO/CompressedReadBuffer.h
similarity index 82%
rename from dbms/include/DB/IO/CompressedReadBuffer.h
rename to dbms/src/IO/CompressedReadBuffer.h
index 1073b481a5a..9804c7041e2 100644
--- a/dbms/include/DB/IO/CompressedReadBuffer.h
+++ b/dbms/src/IO/CompressedReadBuffer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/IO/CompressedReadBufferBase.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/IO/ReadBuffer.h>
+#include <IO/CompressedReadBufferBase.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/ReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/CompressedReadBufferBase.cpp b/dbms/src/IO/CompressedReadBufferBase.cpp
index cd521df08a8..77b7907e403 100644
--- a/dbms/src/IO/CompressedReadBufferBase.cpp
+++ b/dbms/src/IO/CompressedReadBufferBase.cpp
@@ -1,4 +1,4 @@
-#include <DB/IO/CompressedReadBufferBase.h>
+#include <IO/CompressedReadBufferBase.h>
 
 #include <vector>
 
@@ -11,14 +11,14 @@
 #include <lz4.h>
 #include <zstd.h>
 
-#include <DB/Common/PODArray.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/unaligned.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/IO/CompressedStream.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/PODArray.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Exception.h>
+#include <Common/unaligned.h>
+#include <IO/ReadBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/CompressedStream.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/IO/CompressedReadBufferBase.h b/dbms/src/IO/CompressedReadBufferBase.h
similarity index 98%
rename from dbms/include/DB/IO/CompressedReadBufferBase.h
rename to dbms/src/IO/CompressedReadBufferBase.h
index b78466929ee..2639f014116 100644
--- a/dbms/include/DB/IO/CompressedReadBufferBase.h
+++ b/dbms/src/IO/CompressedReadBufferBase.h
@@ -4,7 +4,7 @@
     struct qlz_state_decompress;
 #endif
 
-#include <DB/Common/PODArray.h>
+#include <Common/PODArray.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/CompressedReadBufferFromFile.cpp b/dbms/src/IO/CompressedReadBufferFromFile.cpp
index e1826a68ce0..fb5639afcc3 100644
--- a/dbms/src/IO/CompressedReadBufferFromFile.cpp
+++ b/dbms/src/IO/CompressedReadBufferFromFile.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/CompressedReadBufferFromFile.h>
-#include <DB/IO/createReadBufferFromFileBase.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/CompressedReadBufferFromFile.h>
+#include <IO/createReadBufferFromFileBase.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/CompressedReadBufferFromFile.h b/dbms/src/IO/CompressedReadBufferFromFile.h
similarity index 93%
rename from dbms/include/DB/IO/CompressedReadBufferFromFile.h
rename to dbms/src/IO/CompressedReadBufferFromFile.h
index 1c180b8eb15..7becf513be1 100644
--- a/dbms/include/DB/IO/CompressedReadBufferFromFile.h
+++ b/dbms/src/IO/CompressedReadBufferFromFile.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/CompressedReadBufferBase.h>
-#include <DB/IO/ReadBufferFromFileBase.h>
+#include <IO/CompressedReadBufferBase.h>
+#include <IO/ReadBufferFromFileBase.h>
 
 #include <time.h>
 #include <memory>
diff --git a/dbms/include/DB/IO/CompressedStream.h b/dbms/src/IO/CompressedStream.h
similarity index 100%
rename from dbms/include/DB/IO/CompressedStream.h
rename to dbms/src/IO/CompressedStream.h
diff --git a/dbms/src/IO/CompressedWriteBuffer.cpp b/dbms/src/IO/CompressedWriteBuffer.cpp
index 6e6a2b8bce9..63fd0b916a2 100644
--- a/dbms/src/IO/CompressedWriteBuffer.cpp
+++ b/dbms/src/IO/CompressedWriteBuffer.cpp
@@ -9,9 +9,9 @@
 #include <lz4hc.h>
 #include <zstd.h>
 
-#include <DB/Common/unaligned.h>
+#include <Common/unaligned.h>
 
-#include <DB/IO/CompressedWriteBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/CompressedWriteBuffer.h b/dbms/src/IO/CompressedWriteBuffer.h
similarity index 90%
rename from dbms/include/DB/IO/CompressedWriteBuffer.h
rename to dbms/src/IO/CompressedWriteBuffer.h
index 4da19ed5b48..81bdbe4ed02 100644
--- a/dbms/include/DB/IO/CompressedWriteBuffer.h
+++ b/dbms/src/IO/CompressedWriteBuffer.h
@@ -6,11 +6,11 @@
     struct qlz_state_compress;
 #endif
 
-#include <DB/Common/PODArray.h>
+#include <Common/PODArray.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/IO/CompressedStream.h>
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/CompressedStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/ConcatReadBuffer.h b/dbms/src/IO/ConcatReadBuffer.h
similarity index 98%
rename from dbms/include/DB/IO/ConcatReadBuffer.h
rename to dbms/src/IO/ConcatReadBuffer.h
index 4a2e20cdcf4..7ab433b8d59 100644
--- a/dbms/include/DB/IO/ConcatReadBuffer.h
+++ b/dbms/src/IO/ConcatReadBuffer.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <DB/IO/ReadBuffer.h>
+#include <IO/ReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/DoubleConverter.h b/dbms/src/IO/DoubleConverter.h
similarity index 100%
rename from dbms/include/DB/IO/DoubleConverter.h
rename to dbms/src/IO/DoubleConverter.h
diff --git a/dbms/src/IO/HTTPCommon.cpp b/dbms/src/IO/HTTPCommon.cpp
index 469b57f7860..7e06377f002 100644
--- a/dbms/src/IO/HTTPCommon.cpp
+++ b/dbms/src/IO/HTTPCommon.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/HTTPCommon.h>
+#include <IO/HTTPCommon.h>
 
-#include <DB/Common/config.h>
+#include <Common/config.h>
 #if Poco_NetSSL_FOUND
 #include <Poco/Net/AcceptCertificateHandler.h>
 #include <Poco/Net/Context.h>
diff --git a/dbms/include/DB/IO/HTTPCommon.h b/dbms/src/IO/HTTPCommon.h
similarity index 100%
rename from dbms/include/DB/IO/HTTPCommon.h
rename to dbms/src/IO/HTTPCommon.h
diff --git a/dbms/include/DB/IO/HashingReadBuffer.h b/dbms/src/IO/HashingReadBuffer.h
similarity index 93%
rename from dbms/include/DB/IO/HashingReadBuffer.h
rename to dbms/src/IO/HashingReadBuffer.h
index ad47cc86757..1267b9ad493 100644
--- a/dbms/include/DB/IO/HashingReadBuffer.h
+++ b/dbms/src/IO/HashingReadBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/HashingWriteBuffer.h>
+#include <IO/ReadBuffer.h>
+#include <IO/HashingWriteBuffer.h>
 
 namespace DB
 {
diff --git a/dbms/src/IO/HashingWriteBuffer.cpp b/dbms/src/IO/HashingWriteBuffer.cpp
index cc47b1e6134..39f1d958b31 100644
--- a/dbms/src/IO/HashingWriteBuffer.cpp
+++ b/dbms/src/IO/HashingWriteBuffer.cpp
@@ -1,4 +1,4 @@
-#include <DB/IO/HashingWriteBuffer.h>
+#include <IO/HashingWriteBuffer.h>
 #include <iomanip>
 #include <city.h>
 
diff --git a/dbms/include/DB/IO/HashingWriteBuffer.h b/dbms/src/IO/HashingWriteBuffer.h
similarity index 96%
rename from dbms/include/DB/IO/HashingWriteBuffer.h
rename to dbms/src/IO/HashingWriteBuffer.h
index dc53821c6df..11f39577e70 100644
--- a/dbms/include/DB/IO/HashingWriteBuffer.h
+++ b/dbms/src/IO/HashingWriteBuffer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/ReadHelpers.h>
 
 #define DBMS_DEFAULT_HASHING_BLOCK_SIZE 2048ULL
 
diff --git a/dbms/include/DB/IO/HexWriteBuffer.h b/dbms/src/IO/HexWriteBuffer.h
similarity index 94%
rename from dbms/include/DB/IO/HexWriteBuffer.h
rename to dbms/src/IO/HexWriteBuffer.h
index e7127101328..2ec499fb28d 100644
--- a/dbms/include/DB/IO/HexWriteBuffer.h
+++ b/dbms/src/IO/HexWriteBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/WriteBuffer.h>
 
 
 /// Так как HexWriteBuffer часто создаётся во внутреннем цикле, сделаем у него размер буфера маленьким.
diff --git a/dbms/include/DB/IO/IReadableWriteBuffer.h b/dbms/src/IO/IReadableWriteBuffer.h
similarity index 95%
rename from dbms/include/DB/IO/IReadableWriteBuffer.h
rename to dbms/src/IO/IReadableWriteBuffer.h
index 6f89d17f81f..a02dd4e23cb 100644
--- a/dbms/include/DB/IO/IReadableWriteBuffer.h
+++ b/dbms/src/IO/IReadableWriteBuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <memory>
-#include <DB/IO/ReadBuffer.h>
+#include <IO/ReadBuffer.h>
 
 namespace DB
 {
diff --git a/dbms/src/IO/InterserverWriteBuffer.cpp b/dbms/src/IO/InterserverWriteBuffer.cpp
index 89c4d4bfa8d..29e7f9b3ec5 100644
--- a/dbms/src/IO/InterserverWriteBuffer.cpp
+++ b/dbms/src/IO/InterserverWriteBuffer.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/InterserverWriteBuffer.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/InterserverWriteBuffer.h>
+#include <IO/WriteBufferFromOStream.h>
 
 #include <Poco/Version.h>
 #include <Poco/URI.h>
diff --git a/dbms/include/DB/IO/InterserverWriteBuffer.h b/dbms/src/IO/InterserverWriteBuffer.h
similarity index 95%
rename from dbms/include/DB/IO/InterserverWriteBuffer.h
rename to dbms/src/IO/InterserverWriteBuffer.h
index 507d4ef6c99..d21209dc8eb 100644
--- a/dbms/include/DB/IO/InterserverWriteBuffer.h
+++ b/dbms/src/IO/InterserverWriteBuffer.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/HashingWriteBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/HashingWriteBuffer.h>
 
 #include <Poco/Net/HTTPClientSession.h>
 
diff --git a/dbms/include/DB/IO/LimitReadBuffer.h b/dbms/src/IO/LimitReadBuffer.h
similarity index 95%
rename from dbms/include/DB/IO/LimitReadBuffer.h
rename to dbms/src/IO/LimitReadBuffer.h
index 943f29ba821..7e0db53c048 100644
--- a/dbms/include/DB/IO/LimitReadBuffer.h
+++ b/dbms/src/IO/LimitReadBuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/IO/ReadBuffer.h>
+#include <IO/ReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/MemoryReadWriteBuffer.cpp b/dbms/src/IO/MemoryReadWriteBuffer.cpp
index a8bad9095b5..111a418c88c 100644
--- a/dbms/src/IO/MemoryReadWriteBuffer.cpp
+++ b/dbms/src/IO/MemoryReadWriteBuffer.cpp
@@ -1,4 +1,4 @@
-#include <DB/IO/MemoryReadWriteBuffer.h>
+#include <IO/MemoryReadWriteBuffer.h>
 #include <common/likely.h>
 
 namespace DB
diff --git a/dbms/include/DB/IO/MemoryReadWriteBuffer.h b/dbms/src/IO/MemoryReadWriteBuffer.h
similarity index 89%
rename from dbms/include/DB/IO/MemoryReadWriteBuffer.h
rename to dbms/src/IO/MemoryReadWriteBuffer.h
index b485126de81..6e3aacb9113 100644
--- a/dbms/include/DB/IO/MemoryReadWriteBuffer.h
+++ b/dbms/src/IO/MemoryReadWriteBuffer.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <forward_list>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/IReadableWriteBuffer.h>
-#include <DB/Common/Allocator.h>
-#include <DB/Core/Defines.h>
+#include <IO/WriteBuffer.h>
+#include <IO/IReadableWriteBuffer.h>
+#include <Common/Allocator.h>
+#include <Core/Defines.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/IO/MySQLxxHelpers.h b/dbms/src/IO/MySQLxxHelpers.h
similarity index 96%
rename from dbms/include/DB/IO/MySQLxxHelpers.h
rename to dbms/src/IO/MySQLxxHelpers.h
index 48811021b30..b411b45ffa5 100644
--- a/dbms/include/DB/IO/MySQLxxHelpers.h
+++ b/dbms/src/IO/MySQLxxHelpers.h
@@ -4,9 +4,9 @@
 #include <mysqlxx/Null.h>
 #include <mysqlxx/Manip.h>
 
-#include <DB/Core/Field.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Core/Field.h>
+#include <Core/FieldVisitors.h>
+#include <IO/WriteHelpers.h>
 
 
 /// This is for Yandex.Metrica code.
diff --git a/dbms/include/DB/IO/Operators.h b/dbms/src/IO/Operators.h
similarity index 98%
rename from dbms/include/DB/IO/Operators.h
rename to dbms/src/IO/Operators.h
index c8c1bf722ac..a65f20d5119 100644
--- a/dbms/include/DB/IO/Operators.h
+++ b/dbms/src/IO/Operators.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/ReadBuffer.h b/dbms/src/IO/ReadBuffer.h
similarity index 99%
rename from dbms/include/DB/IO/ReadBuffer.h
rename to dbms/src/IO/ReadBuffer.h
index 164ffd7eac2..9847bb61170 100644
--- a/dbms/include/DB/IO/ReadBuffer.h
+++ b/dbms/src/IO/ReadBuffer.h
@@ -4,8 +4,8 @@
 #include <algorithm>
 #include <memory>
 
-#include <DB/Common/Exception.h>
-#include <DB/IO/BufferBase.h>
+#include <Common/Exception.h>
+#include <IO/BufferBase.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/ReadBufferAIO.cpp b/dbms/src/IO/ReadBufferAIO.cpp
index 9d5e0908371..cc6d28c199f 100644
--- a/dbms/src/IO/ReadBufferAIO.cpp
+++ b/dbms/src/IO/ReadBufferAIO.cpp
@@ -1,7 +1,7 @@
-#include <DB/IO/ReadBufferAIO.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Core/Defines.h>
+#include <IO/ReadBufferAIO.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Stopwatch.h>
+#include <Core/Defines.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/dbms/include/DB/IO/ReadBufferAIO.h b/dbms/src/IO/ReadBufferAIO.h
similarity index 95%
rename from dbms/include/DB/IO/ReadBufferAIO.h
rename to dbms/src/IO/ReadBufferAIO.h
index 9864925e63b..e385a3c0fb3 100644
--- a/dbms/include/DB/IO/ReadBufferAIO.h
+++ b/dbms/src/IO/ReadBufferAIO.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/IO/ReadBufferFromFileBase.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/Core/Defines.h>
-#include <DB/Common/AIO.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <IO/ReadBufferFromFileBase.h>
+#include <IO/ReadBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <Core/Defines.h>
+#include <Common/AIO.h>
+#include <Common/CurrentMetrics.h>
 
 #include <string>
 #include <limits>
diff --git a/dbms/src/IO/ReadBufferFromFile.cpp b/dbms/src/IO/ReadBufferFromFile.cpp
index a9d03698ba4..9b634582d44 100644
--- a/dbms/src/IO/ReadBufferFromFile.cpp
+++ b/dbms/src/IO/ReadBufferFromFile.cpp
@@ -1,8 +1,8 @@
 #include <fcntl.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/ProfileEvents.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteHelpers.h>
+#include <Common/ProfileEvents.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/IO/ReadBufferFromFile.h b/dbms/src/IO/ReadBufferFromFile.h
similarity index 92%
rename from dbms/include/DB/IO/ReadBufferFromFile.h
rename to dbms/src/IO/ReadBufferFromFile.h
index c4b340588c8..90f7d293351 100644
--- a/dbms/include/DB/IO/ReadBufferFromFile.h
+++ b/dbms/src/IO/ReadBufferFromFile.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <Common/CurrentMetrics.h>
 
 #ifndef O_DIRECT
 #define O_DIRECT 00040000
diff --git a/dbms/src/IO/ReadBufferFromFileBase.cpp b/dbms/src/IO/ReadBufferFromFileBase.cpp
index 6472e318a10..320053bad12 100644
--- a/dbms/src/IO/ReadBufferFromFileBase.cpp
+++ b/dbms/src/IO/ReadBufferFromFileBase.cpp
@@ -1,4 +1,4 @@
-#include <DB/IO/ReadBufferFromFileBase.h>
+#include <IO/ReadBufferFromFileBase.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/IO/ReadBufferFromFileBase.h b/dbms/src/IO/ReadBufferFromFileBase.h
similarity index 95%
rename from dbms/include/DB/IO/ReadBufferFromFileBase.h
rename to dbms/src/IO/ReadBufferFromFileBase.h
index 3f1de8c09b1..6b8f759580f 100644
--- a/dbms/include/DB/IO/ReadBufferFromFileBase.h
+++ b/dbms/src/IO/ReadBufferFromFileBase.h
@@ -4,8 +4,8 @@
 #include <ctime>
 #include <fcntl.h>
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
+#include <IO/ReadBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
 
 #ifdef __APPLE__
 #include <common/apple_rt.h>
diff --git a/dbms/src/IO/ReadBufferFromFileDescriptor.cpp b/dbms/src/IO/ReadBufferFromFileDescriptor.cpp
index 4048ed149cd..f623a7bb4c1 100644
--- a/dbms/src/IO/ReadBufferFromFileDescriptor.cpp
+++ b/dbms/src/IO/ReadBufferFromFileDescriptor.cpp
@@ -3,14 +3,14 @@
 
 #include <experimental/optional>
 
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/Stopwatch.h>
+#include <Common/ProfileEvents.h>
+#include <Common/Stopwatch.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/Exception.h>
+#include <Common/CurrentMetrics.h>
 
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/IO/ReadBufferFromFileDescriptor.h b/dbms/src/IO/ReadBufferFromFileDescriptor.h
similarity index 94%
rename from dbms/include/DB/IO/ReadBufferFromFileDescriptor.h
rename to dbms/src/IO/ReadBufferFromFileDescriptor.h
index 492b3bba410..e5bd3e05142 100644
--- a/dbms/include/DB/IO/ReadBufferFromFileDescriptor.h
+++ b/dbms/src/IO/ReadBufferFromFileDescriptor.h
@@ -2,8 +2,8 @@
 
 #include <unistd.h>
 
-#include <DB/IO/ReadBufferFromFileBase.h>
-#include <DB/IO/ReadBuffer.h>
+#include <IO/ReadBufferFromFileBase.h>
+#include <IO/ReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/ReadBufferFromHTTP.cpp b/dbms/src/IO/ReadBufferFromHTTP.cpp
index 1982ec8998e..4f26a8566e4 100644
--- a/dbms/src/IO/ReadBufferFromHTTP.cpp
+++ b/dbms/src/IO/ReadBufferFromHTTP.cpp
@@ -4,10 +4,10 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
 
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/ReadBufferFromHTTP.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/ReadBufferFromHTTP.h>
 
-#include <DB/Common/SimpleCache.h>
+#include <Common/SimpleCache.h>
 
 #include <common/logger_useful.h>
 
diff --git a/dbms/include/DB/IO/ReadBufferFromHTTP.h b/dbms/src/IO/ReadBufferFromHTTP.h
similarity index 95%
rename from dbms/include/DB/IO/ReadBufferFromHTTP.h
rename to dbms/src/IO/ReadBufferFromHTTP.h
index d6c5a704390..937de38e1fc 100644
--- a/dbms/include/DB/IO/ReadBufferFromHTTP.h
+++ b/dbms/src/IO/ReadBufferFromHTTP.h
@@ -4,8 +4,8 @@
 
 #include <Poco/Net/HTTPClientSession.h>
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/Core/Types.h>
+#include <IO/ReadBuffer.h>
+#include <Core/Types.h>
 
 #define DEFAULT_HTTP_READ_BUFFER_TIMEOUT 1800
 #define DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT 1
diff --git a/dbms/include/DB/IO/ReadBufferFromIStream.h b/dbms/src/IO/ReadBufferFromIStream.h
similarity index 89%
rename from dbms/include/DB/IO/ReadBufferFromIStream.h
rename to dbms/src/IO/ReadBufferFromIStream.h
index a3349b02e19..203200b0cac 100644
--- a/dbms/include/DB/IO/ReadBufferFromIStream.h
+++ b/dbms/src/IO/ReadBufferFromIStream.h
@@ -2,10 +2,10 @@
 
 #include <iostream>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
+#include <IO/ReadBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/ReadBufferFromMemory.h b/dbms/src/IO/ReadBufferFromMemory.h
similarity index 96%
rename from dbms/include/DB/IO/ReadBufferFromMemory.h
rename to dbms/src/IO/ReadBufferFromMemory.h
index a3d1f1c471e..bcf8d17a1cc 100644
--- a/dbms/include/DB/IO/ReadBufferFromMemory.h
+++ b/dbms/src/IO/ReadBufferFromMemory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/IO/ReadBuffer.h>
+#include <IO/ReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/ReadBufferFromPocoSocket.cpp b/dbms/src/IO/ReadBufferFromPocoSocket.cpp
index a8726359d2d..fa20a41b004 100644
--- a/dbms/src/IO/ReadBufferFromPocoSocket.cpp
+++ b/dbms/src/IO/ReadBufferFromPocoSocket.cpp
@@ -1,9 +1,9 @@
 #include <Poco/Net/NetException.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/ReadBufferFromPocoSocket.h>
-#include <DB/Common/NetException.h>
+#include <IO/ReadBufferFromPocoSocket.h>
+#include <Common/NetException.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/ReadBufferFromPocoSocket.h b/dbms/src/IO/ReadBufferFromPocoSocket.h
similarity index 92%
rename from dbms/include/DB/IO/ReadBufferFromPocoSocket.h
rename to dbms/src/IO/ReadBufferFromPocoSocket.h
index b43494279a5..5237a69c109 100644
--- a/dbms/include/DB/IO/ReadBufferFromPocoSocket.h
+++ b/dbms/src/IO/ReadBufferFromPocoSocket.h
@@ -2,8 +2,8 @@
 
 #include <Poco/Net/Socket.h>
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
+#include <IO/ReadBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/ReadBufferFromString.h b/dbms/src/IO/ReadBufferFromString.h
similarity index 88%
rename from dbms/include/DB/IO/ReadBufferFromString.h
rename to dbms/src/IO/ReadBufferFromString.h
index 389306bb1c8..3be308325ff 100644
--- a/dbms/include/DB/IO/ReadBufferFromString.h
+++ b/dbms/src/IO/ReadBufferFromString.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/IO/ReadBufferFromMemory.h>
+#include <IO/ReadBufferFromMemory.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/ReadHelpers.cpp b/dbms/src/IO/ReadHelpers.cpp
index 0c41984d3ec..8fbdb70b1cc 100644
--- a/dbms/src/IO/ReadHelpers.cpp
+++ b/dbms/src/IO/ReadHelpers.cpp
@@ -2,10 +2,10 @@
 
 #include <mysqlxx/Manip.h>
 
-#include <DB/Core/Defines.h>
-#include <DB/Common/PODArray.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Core/Defines.h>
+#include <Common/PODArray.h>
+#include <Common/StringUtils.h>
+#include <IO/ReadHelpers.h>
 #include <common/find_first_symbols.h>
 
 namespace DB
diff --git a/dbms/include/DB/IO/ReadHelpers.h b/dbms/src/IO/ReadHelpers.h
similarity index 99%
rename from dbms/include/DB/IO/ReadHelpers.h
rename to dbms/src/IO/ReadHelpers.h
index 27d796e870d..3cbad8d18b0 100644
--- a/dbms/include/DB/IO/ReadHelpers.h
+++ b/dbms/src/IO/ReadHelpers.h
@@ -15,15 +15,15 @@
 
 #include <common/exp10.h>
 
-#include <DB/Core/Types.h>
-#include <DB/Core/StringRef.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Common/Arena.h>
+#include <Core/Types.h>
+#include <Core/StringRef.h>
+#include <Common/Exception.h>
+#include <Common/StringUtils.h>
+#include <Common/Arena.h>
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadBufferFromMemory.h>
-#include <DB/IO/VarInt.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/VarInt.h>
 #include <city.h>
 
 #define DEFAULT_MAX_STRING_SIZE 0x00FFFFFFULL
diff --git a/dbms/src/IO/ReadWriteBufferFromHTTP.cpp b/dbms/src/IO/ReadWriteBufferFromHTTP.cpp
index 4c1d0ab8e3a..27eb1e7f7bf 100644
--- a/dbms/src/IO/ReadWriteBufferFromHTTP.cpp
+++ b/dbms/src/IO/ReadWriteBufferFromHTTP.cpp
@@ -1,15 +1,15 @@
-#include <DB/IO/ReadWriteBufferFromHTTP.h>
+#include <IO/ReadWriteBufferFromHTTP.h>
 
 #include <Poco/Version.h>
 #include <Poco/URI.h>
 #include <Poco/Net/DNS.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/Common/SimpleCache.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <Common/SimpleCache.h>
 #include <common/logger_useful.h>
 
-#include <DB/Common/config.h>
+#include <Common/config.h>
 #if Poco_NetSSL_FOUND
 #include <Poco/Net/HTTPSClientSession.h>
 #endif
diff --git a/dbms/include/DB/IO/ReadWriteBufferFromHTTP.h b/dbms/src/IO/ReadWriteBufferFromHTTP.h
similarity index 94%
rename from dbms/include/DB/IO/ReadWriteBufferFromHTTP.h
rename to dbms/src/IO/ReadWriteBufferFromHTTP.h
index 0adebf9c2b8..d3f1a91d8c8 100644
--- a/dbms/include/DB/IO/ReadWriteBufferFromHTTP.h
+++ b/dbms/src/IO/ReadWriteBufferFromHTTP.h
@@ -3,8 +3,8 @@
 #include <functional>
 #include <Poco/Net/HTTPClientSession.h>
 #include <Poco/URI.h>
-#include <DB/IO/ReadBufferFromHTTP.h>
-#include <DB/IO/ReadBuffer.h>
+#include <IO/ReadBufferFromHTTP.h>
+#include <IO/ReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/RemoteReadBuffer.h b/dbms/src/IO/RemoteReadBuffer.h
similarity index 98%
rename from dbms/include/DB/IO/RemoteReadBuffer.h
rename to dbms/src/IO/RemoteReadBuffer.h
index 574ad3f7ccd..444f32b3656 100644
--- a/dbms/include/DB/IO/RemoteReadBuffer.h
+++ b/dbms/src/IO/RemoteReadBuffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/IO/ReadBufferFromHTTP.h>
+#include <IO/ReadBufferFromHTTP.h>
 #include "ReadHelpers.h"
 
 #define DEFAULT_REMOTE_READ_BUFFER_CONNECTION_TIMEOUT 1
diff --git a/dbms/include/DB/IO/RemoteWriteBuffer.h b/dbms/src/IO/RemoteWriteBuffer.h
similarity index 98%
rename from dbms/include/DB/IO/RemoteWriteBuffer.h
rename to dbms/src/IO/RemoteWriteBuffer.h
index 79a3b069d5a..db7b3387ea2 100644
--- a/dbms/include/DB/IO/RemoteWriteBuffer.h
+++ b/dbms/src/IO/RemoteWriteBuffer.h
@@ -7,9 +7,9 @@
 #include <Poco/Net/HTTPClientSession.h>
 #include <Poco/Net/NetException.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteBufferFromOStream.h>
-#include <DB/IO/HashingWriteBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <IO/HashingWriteBuffer.h>
 
 #include <common/logger_useful.h>
 
diff --git a/dbms/include/DB/IO/UncompressedCache.h b/dbms/src/IO/UncompressedCache.h
similarity index 90%
rename from dbms/include/DB/IO/UncompressedCache.h
rename to dbms/src/IO/UncompressedCache.h
index 2f0a2ac9d73..b53528049c6 100644
--- a/dbms/include/DB/IO/UncompressedCache.h
+++ b/dbms/src/IO/UncompressedCache.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Common/LRUCache.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Common/LRUCache.h>
+#include <Common/SipHash.h>
+#include <Common/ProfileEvents.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <Interpreters/AggregationCommon.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/IO/VarInt.h b/dbms/src/IO/VarInt.h
similarity index 98%
rename from dbms/include/DB/IO/VarInt.h
rename to dbms/src/IO/VarInt.h
index e1bff80aeb8..34efd77d3a1 100644
--- a/dbms/include/DB/IO/VarInt.h
+++ b/dbms/src/IO/VarInt.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <iostream>
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
+#include <Core/Types.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/WriteBuffer.h b/dbms/src/IO/WriteBuffer.h
similarity index 98%
rename from dbms/include/DB/IO/WriteBuffer.h
rename to dbms/src/IO/WriteBuffer.h
index 4f51d432ef0..9dd09f60d63 100644
--- a/dbms/include/DB/IO/WriteBuffer.h
+++ b/dbms/src/IO/WriteBuffer.h
@@ -5,8 +5,8 @@
 #include <memory>
 #include <iostream>
 
-#include <DB/Common/Exception.h>
-#include <DB/IO/BufferBase.h>
+#include <Common/Exception.h>
+#include <IO/BufferBase.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/WriteBufferAIO.cpp b/dbms/src/IO/WriteBufferAIO.cpp
index e6de27c5826..c4b36a84cc4 100644
--- a/dbms/src/IO/WriteBufferAIO.cpp
+++ b/dbms/src/IO/WriteBufferAIO.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/WriteBufferAIO.h>
-#include <DB/Common/ProfileEvents.h>
+#include <IO/WriteBufferAIO.h>
+#include <Common/ProfileEvents.h>
 
 #include <limits>
 #include <sys/types.h>
diff --git a/dbms/include/DB/IO/WriteBufferAIO.h b/dbms/src/IO/WriteBufferAIO.h
similarity index 94%
rename from dbms/include/DB/IO/WriteBufferAIO.h
rename to dbms/src/IO/WriteBufferAIO.h
index c9026502c41..427a6bdb3e6 100644
--- a/dbms/include/DB/IO/WriteBufferAIO.h
+++ b/dbms/src/IO/WriteBufferAIO.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/IO/WriteBufferFromFileBase.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/Core/Defines.h>
-#include <DB/Common/AIO.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <IO/WriteBufferFromFileBase.h>
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <Core/Defines.h>
+#include <Common/AIO.h>
+#include <Common/CurrentMetrics.h>
 
 #include <string>
 #include <unistd.h>
diff --git a/dbms/src/IO/WriteBufferFromFile.cpp b/dbms/src/IO/WriteBufferFromFile.cpp
index 7b25725f358..73678bc4de9 100644
--- a/dbms/src/IO/WriteBufferFromFile.cpp
+++ b/dbms/src/IO/WriteBufferFromFile.cpp
@@ -1,10 +1,10 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include <DB/Common/ProfileEvents.h>
+#include <Common/ProfileEvents.h>
 
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/IO/WriteBufferFromFile.h b/dbms/src/IO/WriteBufferFromFile.h
similarity index 93%
rename from dbms/include/DB/IO/WriteBufferFromFile.h
rename to dbms/src/IO/WriteBufferFromFile.h
index cb5626ac7db..14da9841fc1 100644
--- a/dbms/include/DB/IO/WriteBufferFromFile.h
+++ b/dbms/src/IO/WriteBufferFromFile.h
@@ -2,8 +2,8 @@
 
 #include <sys/types.h>
 
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
+#include <Common/CurrentMetrics.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
 
 
 namespace CurrentMetrics
diff --git a/dbms/src/IO/WriteBufferFromFileBase.cpp b/dbms/src/IO/WriteBufferFromFileBase.cpp
index b74f265f50e..7a3bf1e7378 100644
--- a/dbms/src/IO/WriteBufferFromFileBase.cpp
+++ b/dbms/src/IO/WriteBufferFromFileBase.cpp
@@ -1,4 +1,4 @@
-#include <DB/IO/WriteBufferFromFileBase.h>
+#include <IO/WriteBufferFromFileBase.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/IO/WriteBufferFromFileBase.h b/dbms/src/IO/WriteBufferFromFileBase.h
similarity index 90%
rename from dbms/include/DB/IO/WriteBufferFromFileBase.h
rename to dbms/src/IO/WriteBufferFromFileBase.h
index bd829bd4c2e..18bc6b36085 100644
--- a/dbms/include/DB/IO/WriteBufferFromFileBase.h
+++ b/dbms/src/IO/WriteBufferFromFileBase.h
@@ -3,8 +3,8 @@
 #include <string>
 #include <fcntl.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
 
 namespace DB
 {
diff --git a/dbms/src/IO/WriteBufferFromFileDescriptor.cpp b/dbms/src/IO/WriteBufferFromFileDescriptor.cpp
index 8c30b48edf5..8f6f2b1b126 100644
--- a/dbms/src/IO/WriteBufferFromFileDescriptor.cpp
+++ b/dbms/src/IO/WriteBufferFromFileDescriptor.cpp
@@ -1,12 +1,12 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/Exception.h>
+#include <Common/ProfileEvents.h>
+#include <Common/CurrentMetrics.h>
 
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/IO/WriteBufferFromFileDescriptor.h b/dbms/src/IO/WriteBufferFromFileDescriptor.h
similarity index 95%
rename from dbms/include/DB/IO/WriteBufferFromFileDescriptor.h
rename to dbms/src/IO/WriteBufferFromFileDescriptor.h
index d2d9771b2de..da608b9739a 100644
--- a/dbms/include/DB/IO/WriteBufferFromFileDescriptor.h
+++ b/dbms/src/IO/WriteBufferFromFileDescriptor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/IO/WriteBufferFromFileBase.h>
+#include <IO/WriteBufferFromFileBase.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/WriteBufferFromHTTPServerResponse.cpp b/dbms/src/IO/WriteBufferFromHTTPServerResponse.cpp
index 35a934bf4cb..34a6274505f 100644
--- a/dbms/src/IO/WriteBufferFromHTTPServerResponse.cpp
+++ b/dbms/src/IO/WriteBufferFromHTTPServerResponse.cpp
@@ -1,13 +1,13 @@
-#include <DB/IO/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteBufferFromHTTPServerResponse.h>
 
 #include <Poco/Version.h>
 #include <Poco/Net/HTTPServerResponse.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/HTTPCommon.h>
-#include <DB/Common/NetException.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Core/Progress.h>
+#include <Common/Exception.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/HTTPCommon.h>
+#include <Common/NetException.h>
+#include <Common/Stopwatch.h>
+#include <Core/Progress.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/IO/WriteBufferFromHTTPServerResponse.h b/dbms/src/IO/WriteBufferFromHTTPServerResponse.h
similarity index 93%
rename from dbms/include/DB/IO/WriteBufferFromHTTPServerResponse.h
rename to dbms/src/IO/WriteBufferFromHTTPServerResponse.h
index 982018e40c9..a2ddb1afeb2 100644
--- a/dbms/include/DB/IO/WriteBufferFromHTTPServerResponse.h
+++ b/dbms/src/IO/WriteBufferFromHTTPServerResponse.h
@@ -3,14 +3,14 @@
 #include <experimental/optional>
 #include <mutex>
 #include <Poco/Version.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/IO/WriteBufferFromOStream.h>
-#include <DB/IO/ZlibDeflatingWriteBuffer.h>
-#include <DB/IO/HTTPCommon.h>
-#include <DB/Common/NetException.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Core/Progress.h>
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <IO/ZlibDeflatingWriteBuffer.h>
+#include <IO/HTTPCommon.h>
+#include <Common/NetException.h>
+#include <Common/Stopwatch.h>
+#include <Core/Progress.h>
 
 
 namespace Poco
diff --git a/dbms/include/DB/IO/WriteBufferFromOStream.h b/dbms/src/IO/WriteBufferFromOStream.h
similarity index 90%
rename from dbms/include/DB/IO/WriteBufferFromOStream.h
rename to dbms/src/IO/WriteBufferFromOStream.h
index c38b56a6470..b5a5cbf62f6 100644
--- a/dbms/include/DB/IO/WriteBufferFromOStream.h
+++ b/dbms/src/IO/WriteBufferFromOStream.h
@@ -2,10 +2,10 @@
 
 #include <iostream>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/WriteBufferFromPocoSocket.cpp b/dbms/src/IO/WriteBufferFromPocoSocket.cpp
index af9120dd249..0255f7bf5a0 100644
--- a/dbms/src/IO/WriteBufferFromPocoSocket.cpp
+++ b/dbms/src/IO/WriteBufferFromPocoSocket.cpp
@@ -1,9 +1,9 @@
 #include <Poco/Net/NetException.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/WriteBufferFromPocoSocket.h>
-#include <DB/Common/NetException.h>
+#include <IO/WriteBufferFromPocoSocket.h>
+#include <Common/NetException.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/WriteBufferFromPocoSocket.h b/dbms/src/IO/WriteBufferFromPocoSocket.h
similarity index 92%
rename from dbms/include/DB/IO/WriteBufferFromPocoSocket.h
rename to dbms/src/IO/WriteBufferFromPocoSocket.h
index 53368a77015..4744bb0f36d 100644
--- a/dbms/include/DB/IO/WriteBufferFromPocoSocket.h
+++ b/dbms/src/IO/WriteBufferFromPocoSocket.h
@@ -2,8 +2,8 @@
 
 #include <Poco/Net/Socket.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/WriteBufferFromString.h b/dbms/src/IO/WriteBufferFromString.h
similarity index 97%
rename from dbms/include/DB/IO/WriteBufferFromString.h
rename to dbms/src/IO/WriteBufferFromString.h
index b941b986313..7ac7b948c66 100644
--- a/dbms/include/DB/IO/WriteBufferFromString.h
+++ b/dbms/src/IO/WriteBufferFromString.h
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <DB/IO/WriteBuffer.h>
+#include <IO/WriteBuffer.h>
 
 #define WRITE_BUFFER_FROM_STRING_INITIAL_SIZE_IF_EMPTY 32
 
diff --git a/dbms/src/IO/WriteBufferFromTemporaryFile.cpp b/dbms/src/IO/WriteBufferFromTemporaryFile.cpp
index a8325190b1d..9a47760b8aa 100644
--- a/dbms/src/IO/WriteBufferFromTemporaryFile.cpp
+++ b/dbms/src/IO/WriteBufferFromTemporaryFile.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/WriteBufferFromTemporaryFile.h>
-#include <DB/IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromTemporaryFile.h>
+#include <IO/ReadBufferFromFile.h>
 
 #include <Poco/Path.h>
 #include <fcntl.h>
diff --git a/dbms/include/DB/IO/WriteBufferFromTemporaryFile.h b/dbms/src/IO/WriteBufferFromTemporaryFile.h
similarity index 86%
rename from dbms/include/DB/IO/WriteBufferFromTemporaryFile.h
rename to dbms/src/IO/WriteBufferFromTemporaryFile.h
index 2f54b5882e9..12b5f04a576 100644
--- a/dbms/include/DB/IO/WriteBufferFromTemporaryFile.h
+++ b/dbms/src/IO/WriteBufferFromTemporaryFile.h
@@ -1,6 +1,6 @@
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/IReadableWriteBuffer.h>
-#include <DB/IO/WriteBufferFromFile.h>
+#include <IO/WriteBuffer.h>
+#include <IO/IReadableWriteBuffer.h>
+#include <IO/WriteBufferFromFile.h>
 #include <Poco/TemporaryFile.h>
 
 
diff --git a/dbms/include/DB/IO/WriteBufferFromVector.h b/dbms/src/IO/WriteBufferFromVector.h
similarity index 97%
rename from dbms/include/DB/IO/WriteBufferFromVector.h
rename to dbms/src/IO/WriteBufferFromVector.h
index 4d6a111a55a..d9b8a060fe9 100644
--- a/dbms/include/DB/IO/WriteBufferFromVector.h
+++ b/dbms/src/IO/WriteBufferFromVector.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include <DB/IO/WriteBuffer.h>
+#include <IO/WriteBuffer.h>
 
 
 #define WRITE_BUFFER_FROM_VECTOR_INITIAL_SIZE_IF_EMPTY 32
diff --git a/dbms/src/IO/WriteBufferValidUTF8.cpp b/dbms/src/IO/WriteBufferValidUTF8.cpp
index f296190cfa1..dddd38b2a10 100644
--- a/dbms/src/IO/WriteBufferValidUTF8.cpp
+++ b/dbms/src/IO/WriteBufferValidUTF8.cpp
@@ -1,6 +1,6 @@
 #include <Poco/UTF8Encoding.h>
-#include <DB/IO/WriteBufferValidUTF8.h>
-#include <DB/Core/Types.h>
+#include <IO/WriteBufferValidUTF8.h>
+#include <Core/Types.h>
 
 #if __SSE2__
     #include <emmintrin.h>
diff --git a/dbms/include/DB/IO/WriteBufferValidUTF8.h b/dbms/src/IO/WriteBufferValidUTF8.h
similarity index 94%
rename from dbms/include/DB/IO/WriteBufferValidUTF8.h
rename to dbms/src/IO/WriteBufferValidUTF8.h
index 6f0a6ba5f1c..ab9054e0556 100644
--- a/dbms/include/DB/IO/WriteBufferValidUTF8.h
+++ b/dbms/src/IO/WriteBufferValidUTF8.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
 
 
 namespace DB
diff --git a/dbms/src/IO/WriteHelpers.cpp b/dbms/src/IO/WriteHelpers.cpp
index d8a1ec404cf..049f396ee2c 100644
--- a/dbms/src/IO/WriteHelpers.cpp
+++ b/dbms/src/IO/WriteHelpers.cpp
@@ -1,4 +1,4 @@
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteHelpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/IO/WriteHelpers.h b/dbms/src/IO/WriteHelpers.h
similarity index 98%
rename from dbms/include/DB/IO/WriteHelpers.h
rename to dbms/src/IO/WriteHelpers.h
index 052e28a89f9..d1342642108 100644
--- a/dbms/include/DB/IO/WriteHelpers.h
+++ b/dbms/src/IO/WriteHelpers.h
@@ -11,16 +11,16 @@
 #include <common/LocalDateTime.h>
 #include <common/find_first_symbols.h>
 
-#include <DB/Core/Types.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Core/StringRef.h>
+#include <Core/Types.h>
+#include <Common/Exception.h>
+#include <Common/StringUtils.h>
+#include <Core/StringRef.h>
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteIntText.h>
-#include <DB/IO/VarInt.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/DoubleConverter.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteIntText.h>
+#include <IO/VarInt.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/DoubleConverter.h>
 #include <city.h>
 
 
diff --git a/dbms/include/DB/IO/WriteIntText.h b/dbms/src/IO/WriteIntText.h
similarity index 98%
rename from dbms/include/DB/IO/WriteIntText.h
rename to dbms/src/IO/WriteIntText.h
index 11252bd8223..61191dc346d 100644
--- a/dbms/include/DB/IO/WriteIntText.h
+++ b/dbms/src/IO/WriteIntText.h
@@ -5,8 +5,8 @@
 
 #include <common/likely.h>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/WriteBuffer.h>
+#include <Core/Types.h>
+#include <IO/WriteBuffer.h>
 
 /// 20 цифр или 19 цифр и знак
 #define WRITE_HELPERS_MAX_INT_WIDTH 20U
diff --git a/dbms/include/DB/IO/ZlibCompressionMethod.h b/dbms/src/IO/ZlibCompressionMethod.h
similarity index 100%
rename from dbms/include/DB/IO/ZlibCompressionMethod.h
rename to dbms/src/IO/ZlibCompressionMethod.h
diff --git a/dbms/src/IO/ZlibDeflatingWriteBuffer.cpp b/dbms/src/IO/ZlibDeflatingWriteBuffer.cpp
index 2c3882e77f4..c2165c382a9 100644
--- a/dbms/src/IO/ZlibDeflatingWriteBuffer.cpp
+++ b/dbms/src/IO/ZlibDeflatingWriteBuffer.cpp
@@ -1,4 +1,4 @@
-#include <DB/IO/ZlibDeflatingWriteBuffer.h>
+#include <IO/ZlibDeflatingWriteBuffer.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/ZlibDeflatingWriteBuffer.h b/dbms/src/IO/ZlibDeflatingWriteBuffer.h
similarity index 89%
rename from dbms/include/DB/IO/ZlibDeflatingWriteBuffer.h
rename to dbms/src/IO/ZlibDeflatingWriteBuffer.h
index bec1739d69a..7a8b388af01 100644
--- a/dbms/include/DB/IO/ZlibDeflatingWriteBuffer.h
+++ b/dbms/src/IO/ZlibDeflatingWriteBuffer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/IO/ZlibCompressionMethod.h>
+#include <IO/WriteBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/ZlibCompressionMethod.h>
 
 #include <zlib.h>
 
diff --git a/dbms/src/IO/ZlibInflatingReadBuffer.cpp b/dbms/src/IO/ZlibInflatingReadBuffer.cpp
index 081e7eda2f8..869108515d3 100644
--- a/dbms/src/IO/ZlibInflatingReadBuffer.cpp
+++ b/dbms/src/IO/ZlibInflatingReadBuffer.cpp
@@ -1,4 +1,4 @@
-#include <DB/IO/ZlibInflatingReadBuffer.h>
+#include <IO/ZlibInflatingReadBuffer.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/ZlibInflatingReadBuffer.h b/dbms/src/IO/ZlibInflatingReadBuffer.h
similarity index 87%
rename from dbms/include/DB/IO/ZlibInflatingReadBuffer.h
rename to dbms/src/IO/ZlibInflatingReadBuffer.h
index f82030d74ed..b65e5768a3c 100644
--- a/dbms/include/DB/IO/ZlibInflatingReadBuffer.h
+++ b/dbms/src/IO/ZlibInflatingReadBuffer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/BufferWithOwnMemory.h>
-#include <DB/IO/ZlibCompressionMethod.h>
+#include <IO/ReadBuffer.h>
+#include <IO/BufferWithOwnMemory.h>
+#include <IO/ZlibCompressionMethod.h>
 
 #include <zlib.h>
 
diff --git a/dbms/src/IO/copyData.cpp b/dbms/src/IO/copyData.cpp
index 30bbb0e62b3..ec47a335fd7 100644
--- a/dbms/src/IO/copyData.cpp
+++ b/dbms/src/IO/copyData.cpp
@@ -1,7 +1,7 @@
-#include <DB/Common/Exception.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/copyData.h>
+#include <Common/Exception.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/copyData.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/IO/copyData.h b/dbms/src/IO/copyData.h
similarity index 100%
rename from dbms/include/DB/IO/copyData.h
rename to dbms/src/IO/copyData.h
diff --git a/dbms/src/IO/createReadBufferFromFileBase.cpp b/dbms/src/IO/createReadBufferFromFileBase.cpp
index 12b632edffe..bae7a737d36 100644
--- a/dbms/src/IO/createReadBufferFromFileBase.cpp
+++ b/dbms/src/IO/createReadBufferFromFileBase.cpp
@@ -1,9 +1,9 @@
-#include <DB/IO/createReadBufferFromFileBase.h>
-#include <DB/IO/ReadBufferFromFile.h>
+#include <IO/createReadBufferFromFileBase.h>
+#include <IO/ReadBufferFromFile.h>
 #if !defined(__APPLE__) && !defined(__FreeBSD__)
-#include <DB/IO/ReadBufferAIO.h>
+#include <IO/ReadBufferAIO.h>
 #endif
-#include <DB/Common/ProfileEvents.h>
+#include <Common/ProfileEvents.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/IO/createReadBufferFromFileBase.h b/dbms/src/IO/createReadBufferFromFileBase.h
similarity index 95%
rename from dbms/include/DB/IO/createReadBufferFromFileBase.h
rename to dbms/src/IO/createReadBufferFromFileBase.h
index fafdb10030b..4d6009a8c87 100644
--- a/dbms/include/DB/IO/createReadBufferFromFileBase.h
+++ b/dbms/src/IO/createReadBufferFromFileBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/IO/ReadBufferFromFileBase.h>
+#include <IO/ReadBufferFromFileBase.h>
 #include <string>
 #include <memory>
 
diff --git a/dbms/src/IO/createWriteBufferFromFileBase.cpp b/dbms/src/IO/createWriteBufferFromFileBase.cpp
index 27a7cfb870d..94d16d1d41b 100644
--- a/dbms/src/IO/createWriteBufferFromFileBase.cpp
+++ b/dbms/src/IO/createWriteBufferFromFileBase.cpp
@@ -1,9 +1,9 @@
-#include <DB/IO/createWriteBufferFromFileBase.h>
-#include <DB/IO/WriteBufferFromFile.h>
+#include <IO/createWriteBufferFromFileBase.h>
+#include <IO/WriteBufferFromFile.h>
 #if !defined(__APPLE__) && !defined(__FreeBSD__)
-#include <DB/IO/WriteBufferAIO.h>
+#include <IO/WriteBufferAIO.h>
 #endif
-#include <DB/Common/ProfileEvents.h>
+#include <Common/ProfileEvents.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/IO/createWriteBufferFromFileBase.h b/dbms/src/IO/createWriteBufferFromFileBase.h
similarity index 95%
rename from dbms/include/DB/IO/createWriteBufferFromFileBase.h
rename to dbms/src/IO/createWriteBufferFromFileBase.h
index 826bdfc7c68..209c7702cc4 100644
--- a/dbms/include/DB/IO/createWriteBufferFromFileBase.h
+++ b/dbms/src/IO/createWriteBufferFromFileBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/IO/WriteBufferFromFileBase.h>
+#include <IO/WriteBufferFromFileBase.h>
 #include <string>
 
 namespace DB
diff --git a/dbms/src/IO/tests/async_write.cpp b/dbms/src/IO/tests/async_write.cpp
index f1194a555ee..30993dbb189 100644
--- a/dbms/src/IO/tests/async_write.cpp
+++ b/dbms/src/IO/tests/async_write.cpp
@@ -1,10 +1,10 @@
 #include <iostream>
 
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/AsynchronousWriteBuffer.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/copyData.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/AsynchronousWriteBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/copyData.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/cached_compressed_read_buffer.cpp b/dbms/src/IO/tests/cached_compressed_read_buffer.cpp
index 10d0a78d3c1..c3ee7ab0dea 100644
--- a/dbms/src/IO/tests/cached_compressed_read_buffer.cpp
+++ b/dbms/src/IO/tests/cached_compressed_read_buffer.cpp
@@ -2,11 +2,11 @@
 #include <iomanip>
 #include <limits>
 
-#include <DB/IO/CachedCompressedReadBuffer.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/copyData.h>
+#include <IO/CachedCompressedReadBuffer.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/copyData.h>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/compressed_buffer.cpp b/dbms/src/IO/tests/compressed_buffer.cpp
index f5f6e3eae0d..f663474b035 100644
--- a/dbms/src/IO/tests/compressed_buffer.cpp
+++ b/dbms/src/IO/tests/compressed_buffer.cpp
@@ -5,14 +5,14 @@
 #include <fstream>
 #include <iomanip>
 
-#include <DB/Core/Types.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Core/Types.h>
+#include <Common/Stopwatch.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp b/dbms/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
index 2b91e86f162..6132831800c 100644
--- a/dbms/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
+++ b/dbms/src/IO/tests/gtest_cascade_and_memory_write_buffer.cpp
@@ -4,17 +4,17 @@
 
 #include <Poco/File.h>
 
-#include <DB/IO/CascadeWriteBuffer.h>
-#include <DB/IO/MemoryReadWriteBuffer.h>
-#include <DB/IO/WriteBufferFromTemporaryFile.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBufferFromString.h>
+#include <IO/CascadeWriteBuffer.h>
+#include <IO/MemoryReadWriteBuffer.h>
+#include <IO/WriteBufferFromTemporaryFile.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
 
-#include <DB/IO/ConcatReadBuffer.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/copyData.h>
+#include <IO/ConcatReadBuffer.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/copyData.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 using namespace DB;
 
diff --git a/dbms/src/IO/tests/hashing_buffer.h b/dbms/src/IO/tests/hashing_buffer.h
index dd2aaad215a..f595e3b8e6f 100644
--- a/dbms/src/IO/tests/hashing_buffer.h
+++ b/dbms/src/IO/tests/hashing_buffer.h
@@ -1,5 +1,5 @@
-#include <DB/IO/HashingWriteBuffer.h>
-#include <DB/IO/WriteBufferFromFile.h>
+#include <IO/HashingWriteBuffer.h>
+#include <IO/WriteBufferFromFile.h>
 
 #define FAIL(msg) { std::cout << msg; exit(1); }
 
diff --git a/dbms/src/IO/tests/hashing_read_buffer.cpp b/dbms/src/IO/tests/hashing_read_buffer.cpp
index a6e4b40b285..5d6dbd0fa39 100644
--- a/dbms/src/IO/tests/hashing_read_buffer.cpp
+++ b/dbms/src/IO/tests/hashing_read_buffer.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/HashingReadBuffer.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/HashingReadBuffer.h>
+#include <IO/WriteBufferFromOStream.h>
 #include "hashing_buffer.h"
 #include <iostream>
 
diff --git a/dbms/src/IO/tests/hashing_write_buffer.cpp b/dbms/src/IO/tests/hashing_write_buffer.cpp
index 4aeda24020f..92c6ec70934 100644
--- a/dbms/src/IO/tests/hashing_write_buffer.cpp
+++ b/dbms/src/IO/tests/hashing_write_buffer.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/HashingWriteBuffer.h>
-#include <DB/IO/WriteBufferFromFile.h>
+#include <IO/HashingWriteBuffer.h>
+#include <IO/WriteBufferFromFile.h>
 
 #include "hashing_buffer.h"
 
diff --git a/dbms/src/IO/tests/mempbrk.cpp b/dbms/src/IO/tests/mempbrk.cpp
index ad2d144817a..c40dedb41b9 100644
--- a/dbms/src/IO/tests/mempbrk.cpp
+++ b/dbms/src/IO/tests/mempbrk.cpp
@@ -2,13 +2,13 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
+#include <Core/Types.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
 
 #include <common/find_first_symbols.h>
 
diff --git a/dbms/src/IO/tests/o_direct_and_dirty_pages.cpp b/dbms/src/IO/tests/o_direct_and_dirty_pages.cpp
index 26502c92b77..22d1d6a1a4e 100644
--- a/dbms/src/IO/tests/o_direct_and_dirty_pages.cpp
+++ b/dbms/src/IO/tests/o_direct_and_dirty_pages.cpp
@@ -2,11 +2,11 @@
 
 #include <iostream>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/ReadBufferFromFile.h>
+#include <Core/Types.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadBufferFromFile.h>
 
 int main(int argc, char ** argv)
 {
diff --git a/dbms/src/IO/tests/operators.cpp b/dbms/src/IO/tests/operators.cpp
index ee51e5de6ce..56c4c5b31a3 100644
--- a/dbms/src/IO/tests/operators.cpp
+++ b/dbms/src/IO/tests/operators.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/Operators.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromString.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/parse_int_perf.cpp b/dbms/src/IO/tests/parse_int_perf.cpp
index 9f211d9319a..915cc019f72 100644
--- a/dbms/src/IO/tests/parse_int_perf.cpp
+++ b/dbms/src/IO/tests/parse_int_perf.cpp
@@ -3,16 +3,16 @@
 
 #include <common/Common.h>
 
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/WriteIntText.h>
-#include <DB/IO/WriteBufferFromVector.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/AsynchronousWriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteIntText.h>
+#include <IO/WriteBufferFromVector.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/AsynchronousWriteBuffer.h>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 
 #if 0
diff --git a/dbms/src/IO/tests/parse_int_perf2.cpp b/dbms/src/IO/tests/parse_int_perf2.cpp
index fe75e6bbebb..4534c71985e 100644
--- a/dbms/src/IO/tests/parse_int_perf2.cpp
+++ b/dbms/src/IO/tests/parse_int_perf2.cpp
@@ -1,10 +1,10 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 
 namespace test
diff --git a/dbms/src/IO/tests/read_buffer.cpp b/dbms/src/IO/tests/read_buffer.cpp
index f7037220201..cc778b5321d 100644
--- a/dbms/src/IO/tests/read_buffer.cpp
+++ b/dbms/src/IO/tests/read_buffer.cpp
@@ -3,9 +3,9 @@
 #include <iostream>
 #include <sstream>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/ReadBufferFromIStream.h>
+#include <Core/Types.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromIStream.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/read_buffer_aio.cpp b/dbms/src/IO/tests/read_buffer_aio.cpp
index e1bdb4a02c2..e5a3e69113d 100644
--- a/dbms/src/IO/tests/read_buffer_aio.cpp
+++ b/dbms/src/IO/tests/read_buffer_aio.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/ReadBufferAIO.h>
-#include <DB/Core/Defines.h>
+#include <IO/ReadBufferAIO.h>
+#include <Core/Defines.h>
 
 #include <boost/filesystem.hpp>
 
diff --git a/dbms/src/IO/tests/read_buffer_perf.cpp b/dbms/src/IO/tests/read_buffer_perf.cpp
index 6f3c31ea93e..2c10dd3cf0c 100644
--- a/dbms/src/IO/tests/read_buffer_perf.cpp
+++ b/dbms/src/IO/tests/read_buffer_perf.cpp
@@ -3,9 +3,9 @@
 #include <iostream>
 #include <fstream>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/ReadBufferFromIStream.h>
+#include <Core/Types.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromIStream.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/read_escaped_string.cpp b/dbms/src/IO/tests/read_escaped_string.cpp
index 396325e60d4..3642c97f330 100644
--- a/dbms/src/IO/tests/read_escaped_string.cpp
+++ b/dbms/src/IO/tests/read_escaped_string.cpp
@@ -2,10 +2,10 @@
 
 #include <iostream>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/ReadBufferFromMemory.h>
-#include <DB/IO/ConcatReadBuffer.h>
+#include <Core/Types.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/ConcatReadBuffer.h>
 
 
 using namespace DB;
diff --git a/dbms/src/IO/tests/read_float_perf.cpp b/dbms/src/IO/tests/read_float_perf.cpp
index fe7acd0f0b9..249abf22f3e 100644
--- a/dbms/src/IO/tests/read_float_perf.cpp
+++ b/dbms/src/IO/tests/read_float_perf.cpp
@@ -3,10 +3,10 @@
 #include <iostream>
 #include <fstream>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/CompressedReadBuffer.h>
+#include <Core/Types.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/CompressedReadBuffer.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/read_write_int.cpp b/dbms/src/IO/tests/read_write_int.cpp
index 4ab21181bc6..9041e53915b 100644
--- a/dbms/src/IO/tests/read_write_int.cpp
+++ b/dbms/src/IO/tests/read_write_int.cpp
@@ -3,11 +3,11 @@
 #include <iostream>
 #include <sstream>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Core/Types.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/valid_utf8.cpp b/dbms/src/IO/tests/valid_utf8.cpp
index df3cf7bb46f..ccf176386f9 100644
--- a/dbms/src/IO/tests/valid_utf8.cpp
+++ b/dbms/src/IO/tests/valid_utf8.cpp
@@ -1,7 +1,7 @@
-#include <DB/IO/WriteBufferValidUTF8.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteBufferValidUTF8.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 #include <string>
 #include <streambuf>
 #include <iostream>
diff --git a/dbms/src/IO/tests/valid_utf8_perf.cpp b/dbms/src/IO/tests/valid_utf8_perf.cpp
index e53131c0411..b483c333934 100644
--- a/dbms/src/IO/tests/valid_utf8_perf.cpp
+++ b/dbms/src/IO/tests/valid_utf8_perf.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/WriteBufferValidUTF8.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/Common/Stopwatch.h>
+#include <IO/WriteBufferValidUTF8.h>
+#include <IO/WriteBufferFromString.h>
+#include <Common/Stopwatch.h>
 #include <string>
 #include <streambuf>
 #include <iostream>
diff --git a/dbms/src/IO/tests/var_uint.cpp b/dbms/src/IO/tests/var_uint.cpp
index 080e9d41c57..8a6c6f66733 100644
--- a/dbms/src/IO/tests/var_uint.cpp
+++ b/dbms/src/IO/tests/var_uint.cpp
@@ -1,10 +1,10 @@
 #include <string>
 
 #include <iostream>
-#include <DB/IO/VarInt.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/VarInt.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
 #include <Poco/HexBinaryEncoder.h>
 
 
diff --git a/dbms/src/IO/tests/write_buffer.cpp b/dbms/src/IO/tests/write_buffer.cpp
index 65acf28a775..664d721c9e6 100644
--- a/dbms/src/IO/tests/write_buffer.cpp
+++ b/dbms/src/IO/tests/write_buffer.cpp
@@ -3,9 +3,9 @@
 #include <iostream>
 #include <sstream>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <Core/Types.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferFromOStream.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/write_buffer_aio.cpp b/dbms/src/IO/tests/write_buffer_aio.cpp
index 9ec65a4b15d..1eb8d539ce8 100644
--- a/dbms/src/IO/tests/write_buffer_aio.cpp
+++ b/dbms/src/IO/tests/write_buffer_aio.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/WriteBufferAIO.h>
-#include <DB/Core/Defines.h>
+#include <IO/WriteBufferAIO.h>
+#include <Core/Defines.h>
 
 #include <boost/filesystem.hpp>
 
diff --git a/dbms/src/IO/tests/write_buffer_perf.cpp b/dbms/src/IO/tests/write_buffer_perf.cpp
index 883f05fcbef..6c9f6eb4aa4 100644
--- a/dbms/src/IO/tests/write_buffer_perf.cpp
+++ b/dbms/src/IO/tests/write_buffer_perf.cpp
@@ -3,9 +3,9 @@
 #include <iostream>
 #include <fstream>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <Core/Types.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferFromOStream.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/IO/tests/zlib_buffers.cpp b/dbms/src/IO/tests/zlib_buffers.cpp
index e7d5b25704d..333f35745e2 100644
--- a/dbms/src/IO/tests/zlib_buffers.cpp
+++ b/dbms/src/IO/tests/zlib_buffers.cpp
@@ -3,14 +3,14 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/Core/Types.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/ZlibDeflatingWriteBuffer.h>
-#include <DB/IO/ZlibInflatingReadBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Core/Types.h>
+#include <Common/Stopwatch.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ZlibDeflatingWriteBuffer.h>
+#include <IO/ZlibInflatingReadBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/include/DB/Interpreters/AggregateDescription.h b/dbms/src/Interpreters/AggregateDescription.h
similarity index 83%
rename from dbms/include/DB/Interpreters/AggregateDescription.h
rename to dbms/src/Interpreters/AggregateDescription.h
index d79d8add9ef..de770eba50a 100644
--- a/dbms/include/DB/Interpreters/AggregateDescription.h
+++ b/dbms/src/Interpreters/AggregateDescription.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/ColumnNumbers.h>
-#include <DB/Core/Names.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
+#include <Core/ColumnNumbers.h>
+#include <Core/Names.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/AggregationCommon.h b/dbms/src/Interpreters/AggregationCommon.h
similarity index 96%
rename from dbms/include/DB/Interpreters/AggregationCommon.h
rename to dbms/src/Interpreters/AggregationCommon.h
index 3213913fd56..84b34c0f9ea 100644
--- a/dbms/include/DB/Interpreters/AggregationCommon.h
+++ b/dbms/src/Interpreters/AggregationCommon.h
@@ -2,15 +2,15 @@
 
 #include <array>
 
-#include <DB/Common/SipHash.h>
-#include <DB/Common/Arena.h>
-#include <DB/Common/UInt128.h>
-#include <DB/Core/Defines.h>
-#include <DB/Core/StringRef.h>
-#include <DB/Columns/IColumn.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Common/SipHash.h>
+#include <Common/Arena.h>
+#include <Common/UInt128.h>
+#include <Core/Defines.h>
+#include <Core/StringRef.h>
+#include <Columns/IColumn.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnNullable.h>
 
 
 template <>
diff --git a/dbms/src/Interpreters/Aggregator.cpp b/dbms/src/Interpreters/Aggregator.cpp
index 011b0f7eaf9..dd697068b75 100644
--- a/dbms/src/Interpreters/Aggregator.cpp
+++ b/dbms/src/Interpreters/Aggregator.cpp
@@ -4,23 +4,23 @@
 
 #include <cxxabi.h>
 
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/setThreadName.h>
+#include <Common/Stopwatch.h>
+#include <Common/setThreadName.h>
 
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/AggregateFunctions/AggregateFunctionCount.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
-#include <DB/DataStreams/NullBlockInputStream.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedWriteBuffer.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnTuple.h>
+#include <AggregateFunctions/AggregateFunctionCount.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/NativeBlockOutputStream.h>
+#include <DataStreams/NullBlockInputStream.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
 
-#include <DB/Interpreters/Aggregator.h>
-#include <DB/Common/ClickHouseRevision.h>
-#include <DB/Interpreters/config_compile.h>
+#include <Interpreters/Aggregator.h>
+#include <Common/ClickHouseRevision.h>
+#include <Interpreters/config_compile.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Interpreters/Aggregator.h b/dbms/src/Interpreters/Aggregator.h
similarity index 99%
rename from dbms/include/DB/Interpreters/Aggregator.h
rename to dbms/src/Interpreters/Aggregator.h
index a4be7f6ed34..58a0342d53b 100644
--- a/dbms/include/DB/Interpreters/Aggregator.h
+++ b/dbms/src/Interpreters/Aggregator.h
@@ -8,24 +8,24 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Core/StringRef.h>
-#include <DB/Common/Arena.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Common/HashTable/TwoLevelHashMap.h>
-#include <DB/Common/ThreadPool.h>
+#include <Core/StringRef.h>
+#include <Common/Arena.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/HashTable/TwoLevelHashMap.h>
+#include <Common/ThreadPool.h>
 
-#include <DB/DataStreams/IBlockInputStream.h>
+#include <DataStreams/IBlockInputStream.h>
 
-#include <DB/Interpreters/AggregateDescription.h>
-#include <DB/Interpreters/AggregationCommon.h>
-#include <DB/Interpreters/Limits.h>
-#include <DB/Interpreters/Compiler.h>
+#include <Interpreters/AggregateDescription.h>
+#include <Interpreters/AggregationCommon.h>
+#include <Interpreters/Limits.h>
+#include <Interpreters/Compiler.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnAggregateFunction.h>
-#include <DB/Columns/ColumnVector.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnNullable.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/AsynchronousMetrics.cpp b/dbms/src/Interpreters/AsynchronousMetrics.cpp
index 8bbcbf22eb6..afb94a5faeb 100644
--- a/dbms/src/Interpreters/AsynchronousMetrics.cpp
+++ b/dbms/src/Interpreters/AsynchronousMetrics.cpp
@@ -1,12 +1,12 @@
-#include <DB/Interpreters/AsynchronousMetrics.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Storages/MarkCache.h>
-#include <DB/Storages/StorageMergeTree.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/IO/UncompressedCache.h>
-#include <DB/Databases/IDatabase.h>
+#include <Interpreters/AsynchronousMetrics.h>
+#include <Common/Exception.h>
+#include <Common/setThreadName.h>
+#include <Common/CurrentMetrics.h>
+#include <Storages/MarkCache.h>
+#include <Storages/StorageMergeTree.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <IO/UncompressedCache.h>
+#include <Databases/IDatabase.h>
 #include <chrono>
 
 #include <common/config_common.h>
diff --git a/dbms/include/DB/Interpreters/AsynchronousMetrics.h b/dbms/src/Interpreters/AsynchronousMetrics.h
similarity index 100%
rename from dbms/include/DB/Interpreters/AsynchronousMetrics.h
rename to dbms/src/Interpreters/AsynchronousMetrics.h
diff --git a/dbms/src/Interpreters/CMakeLists.txt b/dbms/src/Interpreters/CMakeLists.txt
index 74f60b061e0..e1123e5bbe1 100644
--- a/dbms/src/Interpreters/CMakeLists.txt
+++ b/dbms/src/Interpreters/CMakeLists.txt
@@ -35,8 +35,8 @@ string (REPLACE ${ClickHouse_SOURCE_DIR} ${INTERNAL_COMPILER_HEADERS} INTERNAL_P
 
 message (STATUS "Using internal compiler: headers=${INTERNAL_COMPILER_HEADERS} : ${INTERNAL_COMPILER_EXECUTABLE} ${INTERNAL_COMPILER_FLAGS}")
 
-set (CONFIG_COMPILE ${ClickHouse_BINARY_DIR}/dbms/include/DB/Interpreters/config_compile.h)
-configure_file (${ClickHouse_SOURCE_DIR}/dbms/include/DB/Interpreters/config_compile.h.in ${CONFIG_COMPILE})
+set (CONFIG_COMPILE ${ClickHouse_BINARY_DIR}/dbms/src/Interpreters/config_compile.h)
+configure_file (${ClickHouse_SOURCE_DIR}/dbms/src/Interpreters/config_compile.h.in ${CONFIG_COMPILE})
 
 if (ENABLE_TESTS)
     add_subdirectory (tests)
diff --git a/dbms/src/Interpreters/ClientInfo.cpp b/dbms/src/Interpreters/ClientInfo.cpp
index 17fc543ee4a..40ebabc60df 100644
--- a/dbms/src/Interpreters/ClientInfo.cpp
+++ b/dbms/src/Interpreters/ClientInfo.cpp
@@ -1,13 +1,13 @@
 #include <unistd.h>
 
-#include <DB/Interpreters/ClientInfo.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Core/Defines.h>
-#include <DB/Common/getFQDNOrHostName.h>
-#include <DB/Common/ClickHouseRevision.h>
+#include <Interpreters/ClientInfo.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Core/Defines.h>
+#include <Common/getFQDNOrHostName.h>
+#include <Common/ClickHouseRevision.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/ClientInfo.h b/dbms/src/Interpreters/ClientInfo.h
similarity index 98%
rename from dbms/include/DB/Interpreters/ClientInfo.h
rename to dbms/src/Interpreters/ClientInfo.h
index 0901b6ef332..760087c2cd2 100644
--- a/dbms/include/DB/Interpreters/ClientInfo.h
+++ b/dbms/src/Interpreters/ClientInfo.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Poco/Net/SocketAddress.h>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/Cluster.cpp b/dbms/src/Interpreters/Cluster.cpp
index a4c6f989c61..527f7a00e65 100644
--- a/dbms/src/Interpreters/Cluster.cpp
+++ b/dbms/src/Interpreters/Cluster.cpp
@@ -1,9 +1,9 @@
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Common/isLocalAddress.h>
-#include <DB/Common/SimpleCache.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/IO/HexWriteBuffer.h>
+#include <Interpreters/Cluster.h>
+#include <Common/escapeForFileName.h>
+#include <Common/isLocalAddress.h>
+#include <Common/SimpleCache.h>
+#include <Common/StringUtils.h>
+#include <IO/HexWriteBuffer.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/Application.h>
 #include <openssl/sha.h>
diff --git a/dbms/include/DB/Interpreters/Cluster.h b/dbms/src/Interpreters/Cluster.h
similarity index 98%
rename from dbms/include/DB/Interpreters/Cluster.h
rename to dbms/src/Interpreters/Cluster.h
index 7bbde0eda26..fa07c453ab2 100644
--- a/dbms/include/DB/Interpreters/Cluster.h
+++ b/dbms/src/Interpreters/Cluster.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <map>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Client/ConnectionPool.h>
-#include <DB/Client/ConnectionPoolWithFailover.h>
+#include <Interpreters/Settings.h>
+#include <Client/ConnectionPool.h>
+#include <Client/ConnectionPoolWithFailover.h>
 #include <Poco/Net/SocketAddress.h>
 
 namespace DB
diff --git a/dbms/src/Interpreters/ClusterProxy/AlterQueryConstructor.cpp b/dbms/src/Interpreters/ClusterProxy/AlterQueryConstructor.cpp
index adbb16d2aa8..dc1eab9ae26 100644
--- a/dbms/src/Interpreters/ClusterProxy/AlterQueryConstructor.cpp
+++ b/dbms/src/Interpreters/ClusterProxy/AlterQueryConstructor.cpp
@@ -1,7 +1,7 @@
-#include <DB/Interpreters/ClusterProxy/AlterQueryConstructor.h>
-#include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/DataStreams/RemoteBlockInputStream.h>
-#include <DB/DataStreams/LazyBlockInputStream.h>
+#include <Interpreters/ClusterProxy/AlterQueryConstructor.h>
+#include <Interpreters/InterpreterAlterQuery.h>
+#include <DataStreams/RemoteBlockInputStream.h>
+#include <DataStreams/LazyBlockInputStream.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Interpreters/ClusterProxy/AlterQueryConstructor.h b/dbms/src/Interpreters/ClusterProxy/AlterQueryConstructor.h
similarity index 92%
rename from dbms/include/DB/Interpreters/ClusterProxy/AlterQueryConstructor.h
rename to dbms/src/Interpreters/ClusterProxy/AlterQueryConstructor.h
index bbbd2c08c88..2f0f7e758ce 100644
--- a/dbms/include/DB/Interpreters/ClusterProxy/AlterQueryConstructor.h
+++ b/dbms/src/Interpreters/ClusterProxy/AlterQueryConstructor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Interpreters/ClusterProxy/IQueryConstructor.h>
+#include <Interpreters/ClusterProxy/IQueryConstructor.h>
 
 namespace DB
 {
diff --git a/dbms/src/Interpreters/ClusterProxy/DescribeQueryConstructor.cpp b/dbms/src/Interpreters/ClusterProxy/DescribeQueryConstructor.cpp
index be5c032ee21..b2e9187b18b 100644
--- a/dbms/src/Interpreters/ClusterProxy/DescribeQueryConstructor.cpp
+++ b/dbms/src/Interpreters/ClusterProxy/DescribeQueryConstructor.cpp
@@ -1,8 +1,8 @@
-#include <DB/Interpreters/ClusterProxy/DescribeQueryConstructor.h>
-#include <DB/Interpreters/InterpreterDescribeQuery.h>
-#include <DB/DataStreams/MaterializingBlockInputStream.h>
-#include <DB/DataStreams/BlockExtraInfoInputStream.h>
-#include <DB/DataStreams/RemoteBlockInputStream.h>
+#include <Interpreters/ClusterProxy/DescribeQueryConstructor.h>
+#include <Interpreters/InterpreterDescribeQuery.h>
+#include <DataStreams/MaterializingBlockInputStream.h>
+#include <DataStreams/BlockExtraInfoInputStream.h>
+#include <DataStreams/RemoteBlockInputStream.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Interpreters/ClusterProxy/DescribeQueryConstructor.h b/dbms/src/Interpreters/ClusterProxy/DescribeQueryConstructor.h
similarity index 92%
rename from dbms/include/DB/Interpreters/ClusterProxy/DescribeQueryConstructor.h
rename to dbms/src/Interpreters/ClusterProxy/DescribeQueryConstructor.h
index 6542286893b..ebba485128a 100644
--- a/dbms/include/DB/Interpreters/ClusterProxy/DescribeQueryConstructor.h
+++ b/dbms/src/Interpreters/ClusterProxy/DescribeQueryConstructor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Interpreters/ClusterProxy/IQueryConstructor.h>
+#include <Interpreters/ClusterProxy/IQueryConstructor.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Interpreters/ClusterProxy/IQueryConstructor.h b/dbms/src/Interpreters/ClusterProxy/IQueryConstructor.h
similarity index 89%
rename from dbms/include/DB/Interpreters/ClusterProxy/IQueryConstructor.h
rename to dbms/src/Interpreters/ClusterProxy/IQueryConstructor.h
index 68f1a2a7787..661125cffe3 100644
--- a/dbms/include/DB/Interpreters/ClusterProxy/IQueryConstructor.h
+++ b/dbms/src/Interpreters/ClusterProxy/IQueryConstructor.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Parsers/IAST.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/Client/ConnectionPool.h>
+#include <Interpreters/Cluster.h>
+#include <Parsers/IAST.h>
+#include <Storages/IStorage.h>
+#include <Client/ConnectionPool.h>
 
 namespace DB
 {
diff --git a/dbms/src/Interpreters/ClusterProxy/Query.cpp b/dbms/src/Interpreters/ClusterProxy/Query.cpp
index b27bf49a274..62d029c3cd1 100644
--- a/dbms/src/Interpreters/ClusterProxy/Query.cpp
+++ b/dbms/src/Interpreters/ClusterProxy/Query.cpp
@@ -1,11 +1,11 @@
-#include <DB/Interpreters/ClusterProxy/Query.h>
-#include <DB/Interpreters/ClusterProxy/IQueryConstructor.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Interpreters/IInterpreter.h>
-#include <DB/Parsers/queryToString.h>
-#include <DB/DataStreams/RemoteBlockInputStream.h>
+#include <Interpreters/ClusterProxy/Query.h>
+#include <Interpreters/ClusterProxy/IQueryConstructor.h>
+#include <Interpreters/Settings.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/Cluster.h>
+#include <Interpreters/IInterpreter.h>
+#include <Parsers/queryToString.h>
+#include <DataStreams/RemoteBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/ClusterProxy/Query.h b/dbms/src/Interpreters/ClusterProxy/Query.h
similarity index 91%
rename from dbms/include/DB/Interpreters/ClusterProxy/Query.h
rename to dbms/src/Interpreters/ClusterProxy/Query.h
index 5012a43825d..e6194deafa1 100644
--- a/dbms/include/DB/Interpreters/ClusterProxy/Query.h
+++ b/dbms/src/Interpreters/ClusterProxy/Query.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/Interpreters/Cluster.h>
+#include <Parsers/IAST.h>
+#include <Storages/IStorage.h>
+#include <Interpreters/Cluster.h>
 
 namespace DB
 {
diff --git a/dbms/src/Interpreters/ClusterProxy/SelectQueryConstructor.cpp b/dbms/src/Interpreters/ClusterProxy/SelectQueryConstructor.cpp
index fc23e6d921c..d59764c44a4 100644
--- a/dbms/src/Interpreters/ClusterProxy/SelectQueryConstructor.cpp
+++ b/dbms/src/Interpreters/ClusterProxy/SelectQueryConstructor.cpp
@@ -1,7 +1,7 @@
-#include <DB/Interpreters/ClusterProxy/SelectQueryConstructor.h>
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/DataStreams/RemoteBlockInputStream.h>
-#include <DB/DataStreams/MaterializingBlockInputStream.h>
+#include <Interpreters/ClusterProxy/SelectQueryConstructor.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <DataStreams/RemoteBlockInputStream.h>
+#include <DataStreams/MaterializingBlockInputStream.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Interpreters/ClusterProxy/SelectQueryConstructor.h b/dbms/src/Interpreters/ClusterProxy/SelectQueryConstructor.h
similarity index 86%
rename from dbms/include/DB/Interpreters/ClusterProxy/SelectQueryConstructor.h
rename to dbms/src/Interpreters/ClusterProxy/SelectQueryConstructor.h
index 91ed7a6a51e..fa255e23a3f 100644
--- a/dbms/include/DB/Interpreters/ClusterProxy/SelectQueryConstructor.h
+++ b/dbms/src/Interpreters/ClusterProxy/SelectQueryConstructor.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Interpreters/ClusterProxy/IQueryConstructor.h>
-#include <DB/Core/QueryProcessingStage.h>
-#include <DB/Storages/IStorage.h>
+#include <Interpreters/ClusterProxy/IQueryConstructor.h>
+#include <Core/QueryProcessingStage.h>
+#include <Storages/IStorage.h>
 
 namespace DB
 {
diff --git a/dbms/src/Interpreters/Compiler.cpp b/dbms/src/Interpreters/Compiler.cpp
index 398b7a1e39b..1b581b7ada2 100644
--- a/dbms/src/Interpreters/Compiler.cpp
+++ b/dbms/src/Interpreters/Compiler.cpp
@@ -1,18 +1,18 @@
 #include <Poco/DirectoryIterator.h>
-#include <DB/Common/ClickHouseRevision.h>
+#include <Common/ClickHouseRevision.h>
 #include <ext/unlock_guard.hpp>
 
-#include <DB/Common/SipHash.h>
-#include <DB/Common/ShellCommand.h>
-#include <DB/Common/StringUtils.h>
+#include <Common/SipHash.h>
+#include <Common/ShellCommand.h>
+#include <Common/StringUtils.h>
 
-#include <DB/IO/Operators.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFile.h>
+#include <IO/Operators.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFile.h>
 
-#include <DB/Interpreters/Compiler.h>
-#include <DB/Interpreters/config_compile.h>
+#include <Interpreters/Compiler.h>
+#include <Interpreters/config_compile.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Interpreters/Compiler.h b/dbms/src/Interpreters/Compiler.h
similarity index 97%
rename from dbms/include/DB/Interpreters/Compiler.h
rename to dbms/src/Interpreters/Compiler.h
index c90e5e07bdb..20f4bc9e17b 100644
--- a/dbms/include/DB/Interpreters/Compiler.h
+++ b/dbms/src/Interpreters/Compiler.h
@@ -10,10 +10,10 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Core/Types.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/UInt128.h>
-#include <DB/Common/ThreadPool.h>
+#include <Core/Types.h>
+#include <Common/Exception.h>
+#include <Common/UInt128.h>
+#include <Common/ThreadPool.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/Context.cpp b/dbms/src/Interpreters/Context.cpp
index 2a197ac1a70..e1bdb38a17a 100644
--- a/dbms/src/Interpreters/Context.cpp
+++ b/dbms/src/Interpreters/Context.cpp
@@ -9,40 +9,40 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Common/Macros.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/formatReadable.h>
-#include <DB/DataStreams/FormatFactory.h>
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/TableFunctions/TableFunctionFactory.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/Storages/MarkCache.h>
-#include <DB/Storages/MergeTree/BackgroundProcessingPool.h>
-#include <DB/Storages/MergeTree/ReshardingWorker.h>
-#include <DB/Storages/MergeTree/MergeList.h>
-#include <DB/Storages/MergeTree/MergeTreeSettings.h>
-#include <DB/Storages/CompressionMethodSelector.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Interpreters/Users.h>
-#include <DB/Interpreters/Quota.h>
-#include <DB/Interpreters/EmbeddedDictionaries.h>
-#include <DB/Interpreters/ExternalDictionaries.h>
-#include <DB/Interpreters/ProcessList.h>
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Interpreters/InterserverIOHandler.h>
-#include <DB/Interpreters/Compiler.h>
-#include <DB/Interpreters/QueryLog.h>
-#include <DB/Interpreters/PartLog.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/UncompressedCache.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Databases/IDatabase.h>
+#include <Common/Macros.h>
+#include <Common/escapeForFileName.h>
+#include <Common/Stopwatch.h>
+#include <Common/formatReadable.h>
+#include <DataStreams/FormatFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <Storages/IStorage.h>
+#include <Storages/MarkCache.h>
+#include <Storages/MergeTree/BackgroundProcessingPool.h>
+#include <Storages/MergeTree/ReshardingWorker.h>
+#include <Storages/MergeTree/MergeList.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
+#include <Storages/CompressionMethodSelector.h>
+#include <Interpreters/Settings.h>
+#include <Interpreters/Users.h>
+#include <Interpreters/Quota.h>
+#include <Interpreters/EmbeddedDictionaries.h>
+#include <Interpreters/ExternalDictionaries.h>
+#include <Interpreters/ProcessList.h>
+#include <Interpreters/Cluster.h>
+#include <Interpreters/InterserverIOHandler.h>
+#include <Interpreters/Compiler.h>
+#include <Interpreters/QueryLog.h>
+#include <Interpreters/PartLog.h>
+#include <Interpreters/Context.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/UncompressedCache.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Databases/IDatabase.h>
 
-#include <DB/Common/ConfigProcessor.h>
+#include <Common/ConfigProcessor.h>
 #include <zkutil/ZooKeeper.h>
 
 
diff --git a/dbms/include/DB/Interpreters/Context.h b/dbms/src/Interpreters/Context.h
similarity index 98%
rename from dbms/include/DB/Interpreters/Context.h
rename to dbms/src/Interpreters/Context.h
index 67c243291ad..fa0d1b7b8b1 100644
--- a/dbms/include/DB/Interpreters/Context.h
+++ b/dbms/src/Interpreters/Context.h
@@ -3,11 +3,11 @@
 #include <functional>
 #include <memory>
 
-#include <DB/Core/Types.h>
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Interpreters/ClientInfo.h>
-#include <DB/IO/CompressedStream.h>
+#include <Core/Types.h>
+#include <Core/NamesAndTypes.h>
+#include <Interpreters/Settings.h>
+#include <Interpreters/ClientInfo.h>
+#include <IO/CompressedStream.h>
 
 
 namespace Poco
diff --git a/dbms/src/Interpreters/DictionaryFactory.cpp b/dbms/src/Interpreters/DictionaryFactory.cpp
index 30eae9df4aa..c208eb70cbb 100644
--- a/dbms/src/Interpreters/DictionaryFactory.cpp
+++ b/dbms/src/Interpreters/DictionaryFactory.cpp
@@ -1,12 +1,12 @@
-#include <DB/Dictionaries/DictionaryFactory.h>
-#include <DB/Dictionaries/DictionarySourceFactory.h>
-#include <DB/Dictionaries/FlatDictionary.h>
-#include <DB/Dictionaries/HashedDictionary.h>
-#include <DB/Dictionaries/CacheDictionary.h>
-#include <DB/Dictionaries/RangeHashedDictionary.h>
-#include <DB/Dictionaries/ComplexKeyHashedDictionary.h>
-#include <DB/Dictionaries/ComplexKeyCacheDictionary.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/DictionaryFactory.h>
+#include <Dictionaries/DictionarySourceFactory.h>
+#include <Dictionaries/FlatDictionary.h>
+#include <Dictionaries/HashedDictionary.h>
+#include <Dictionaries/CacheDictionary.h>
+#include <Dictionaries/RangeHashedDictionary.h>
+#include <Dictionaries/ComplexKeyHashedDictionary.h>
+#include <Dictionaries/ComplexKeyCacheDictionary.h>
+#include <Dictionaries/DictionaryStructure.h>
 #include <memory>
 
 
diff --git a/dbms/src/Interpreters/EmbeddedDictionaries.cpp b/dbms/src/Interpreters/EmbeddedDictionaries.cpp
index ec5d8ba4be7..bdc3207eb2d 100644
--- a/dbms/src/Interpreters/EmbeddedDictionaries.cpp
+++ b/dbms/src/Interpreters/EmbeddedDictionaries.cpp
@@ -1,11 +1,11 @@
 #include <common/logger_useful.h>
 #include <Poco/Util/Application.h>
-#include <DB/Interpreters/EmbeddedDictionaries.h>
-#include <DB/Dictionaries/Embedded/RegionsHierarchies.h>
-#include <DB/Dictionaries/Embedded/TechDataHierarchy.h>
-#include <DB/Dictionaries/Embedded/RegionsNames.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/Exception.h>
+#include <Interpreters/EmbeddedDictionaries.h>
+#include <Dictionaries/Embedded/RegionsHierarchies.h>
+#include <Dictionaries/Embedded/TechDataHierarchy.h>
+#include <Dictionaries/Embedded/RegionsNames.h>
+#include <Common/setThreadName.h>
+#include <Common/Exception.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/EmbeddedDictionaries.h b/dbms/src/Interpreters/EmbeddedDictionaries.h
similarity index 100%
rename from dbms/include/DB/Interpreters/EmbeddedDictionaries.h
rename to dbms/src/Interpreters/EmbeddedDictionaries.h
diff --git a/dbms/src/Interpreters/ExpressionActions.cpp b/dbms/src/Interpreters/ExpressionActions.cpp
index 72c47052d5b..4816a54a3bf 100644
--- a/dbms/src/Interpreters/ExpressionActions.cpp
+++ b/dbms/src/Interpreters/ExpressionActions.cpp
@@ -1,11 +1,11 @@
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/Join.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/IFunction.h>
+#include <Common/ProfileEvents.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/Join.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
 #include <set>
 
 
diff --git a/dbms/include/DB/Interpreters/ExpressionActions.h b/dbms/src/Interpreters/ExpressionActions.h
similarity index 98%
rename from dbms/include/DB/Interpreters/ExpressionActions.h
rename to dbms/src/Interpreters/ExpressionActions.h
index afbf431654c..ac365da057b 100644
--- a/dbms/include/DB/Interpreters/ExpressionActions.h
+++ b/dbms/src/Interpreters/ExpressionActions.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Interpreters/Settings.h>
-#include <DB/Core/Names.h>
-#include <DB/Core/ColumnWithTypeAndName.h>
-#include <DB/Core/Block.h>
+#include <Interpreters/Settings.h>
+#include <Core/Names.h>
+#include <Core/ColumnWithTypeAndName.h>
+#include <Core/Block.h>
 
 #include <unordered_set>
 #include <unordered_map>
diff --git a/dbms/src/Interpreters/ExpressionAnalyzer.cpp b/dbms/src/Interpreters/ExpressionAnalyzer.cpp
index 104ef501e11..4728300cae2 100644
--- a/dbms/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/dbms/src/Interpreters/ExpressionAnalyzer.cpp
@@ -1,59 +1,59 @@
 #include <Poco/Util/Application.h>
 #include <Poco/String.h>
 
-#include <DB/DataTypes/FieldToDataType.h>
+#include <DataTypes/FieldToDataType.h>
 
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTAsterisk.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTSubquery.h>
-#include <DB/Parsers/ASTSet.h>
-#include <DB/Parsers/ASTOrderByElement.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTAsterisk.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTSet.h>
+#include <Parsers/ASTOrderByElement.h>
 
-#include <DB/DataTypes/DataTypeSet.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeTuple.h>
-#include <DB/DataTypes/DataTypeExpression.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeSet.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeExpression.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/Columns/ColumnSet.h>
-#include <DB/Columns/ColumnExpression.h>
+#include <Columns/ColumnSet.h>
+#include <Columns/ColumnExpression.h>
 
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/InJoinSubqueriesPreprocessor.h>
-#include <DB/Interpreters/LogicalExpressionsOptimizer.h>
-#include <DB/Interpreters/ExternalDictionaries.h>
-#include <DB/Interpreters/Set.h>
-#include <DB/Interpreters/Join.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/InJoinSubqueriesPreprocessor.h>
+#include <Interpreters/LogicalExpressionsOptimizer.h>
+#include <Interpreters/ExternalDictionaries.h>
+#include <Interpreters/Set.h>
+#include <Interpreters/Join.h>
 
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
 
-#include <DB/Storages/StorageDistributed.h>
-#include <DB/Storages/StorageMemory.h>
-#include <DB/Storages/StorageSet.h>
-#include <DB/Storages/StorageJoin.h>
+#include <Storages/StorageDistributed.h>
+#include <Storages/StorageMemory.h>
+#include <Storages/StorageSet.h>
+#include <Storages/StorageJoin.h>
 
-#include <DB/DataStreams/LazyBlockInputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/LazyBlockInputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionary.h>
 
-#include <DB/Common/typeid_cast.h>
-#include <DB/Common/StringUtils.h>
+#include <Common/typeid_cast.h>
+#include <Common/StringUtils.h>
 
-#include <DB/Parsers/formatAST.h>
+#include <Parsers/formatAST.h>
 
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
 
 #include <ext/range.hpp>
-#include <DB/DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeFactory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/ExpressionAnalyzer.h b/dbms/src/Interpreters/ExpressionAnalyzer.h
similarity index 99%
rename from dbms/include/DB/Interpreters/ExpressionAnalyzer.h
rename to dbms/src/Interpreters/ExpressionAnalyzer.h
index a76464f296e..f747bc47eca 100644
--- a/dbms/include/DB/Interpreters/ExpressionAnalyzer.h
+++ b/dbms/src/Interpreters/ExpressionAnalyzer.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Interpreters/AggregateDescription.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Core/Block.h>
+#include <Interpreters/AggregateDescription.h>
+#include <Interpreters/Settings.h>
+#include <Core/Block.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/ExternalDictionaries.cpp b/dbms/src/Interpreters/ExternalDictionaries.cpp
index 2ccb9c580a8..1e57b5047c3 100644
--- a/dbms/src/Interpreters/ExternalDictionaries.cpp
+++ b/dbms/src/Interpreters/ExternalDictionaries.cpp
@@ -1,8 +1,8 @@
-#include <DB/Interpreters/ExternalDictionaries.h>
-#include <DB/Dictionaries/DictionaryFactory.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Common/StringUtils.h>
+#include <Interpreters/ExternalDictionaries.h>
+#include <Dictionaries/DictionaryFactory.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Common/StringUtils.h>
 #include <ext/scope_guard.hpp>
 #include <Poco/Util/Application.h>
 #include <Poco/Glob.h>
diff --git a/dbms/include/DB/Interpreters/ExternalDictionaries.h b/dbms/src/Interpreters/ExternalDictionaries.h
similarity index 96%
rename from dbms/include/DB/Interpreters/ExternalDictionaries.h
rename to dbms/src/Interpreters/ExternalDictionaries.h
index bc5f298c712..2fff082974c 100644
--- a/dbms/include/DB/Interpreters/ExternalDictionaries.h
+++ b/dbms/src/Interpreters/ExternalDictionaries.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Dictionaries/IDictionary.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/randomSeed.h>
+#include <Dictionaries/IDictionary.h>
+#include <Common/Exception.h>
+#include <Common/setThreadName.h>
+#include <Common/randomSeed.h>
 #include <common/MultiVersion.h>
 #include <common/logger_useful.h>
 #include <Poco/Event.h>
diff --git a/dbms/include/DB/Interpreters/IInterpreter.h b/dbms/src/Interpreters/IInterpreter.h
similarity index 95%
rename from dbms/include/DB/Interpreters/IInterpreter.h
rename to dbms/src/Interpreters/IInterpreter.h
index 249e8a4e2ef..5cacb2c0449 100644
--- a/dbms/include/DB/Interpreters/IInterpreter.h
+++ b/dbms/src/Interpreters/IInterpreter.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataStreams/BlockIO.h>
+#include <DataStreams/BlockIO.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.cpp b/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
index b8f51d2e6e5..2e08e2edb11 100644
--- a/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
+++ b/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
@@ -1,10 +1,10 @@
-#include <DB/Interpreters/InJoinSubqueriesPreprocessor.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/StorageDistributed.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTIdentifier.h>
+#include <Interpreters/InJoinSubqueriesPreprocessor.h>
+#include <Interpreters/Context.h>
+#include <Storages/StorageDistributed.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InJoinSubqueriesPreprocessor.h b/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h
similarity index 95%
rename from dbms/include/DB/Interpreters/InJoinSubqueriesPreprocessor.h
rename to dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h
index 2e5c66881b6..a3e3140eeb0 100644
--- a/dbms/include/DB/Interpreters/InJoinSubqueriesPreprocessor.h
+++ b/dbms/src/Interpreters/InJoinSubqueriesPreprocessor.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <string>
-#include <DB/Core/Types.h>
-#include <DB/Interpreters/SettingsCommon.h>
+#include <Core/Types.h>
+#include <Interpreters/SettingsCommon.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterAlterQuery.cpp b/dbms/src/Interpreters/InterpreterAlterQuery.cpp
index fedaaa21717..2b07b39ce47 100644
--- a/dbms/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterAlterQuery.cpp
@@ -1,20 +1,20 @@
-#include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/Interpreters/InterpreterCreateQuery.h>
-#include <DB/Parsers/ASTAlterQuery.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTNameTypePair.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTWeightedZooKeeperPath.h>
+#include <Interpreters/InterpreterAlterQuery.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Parsers/ASTAlterQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTNameTypePair.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTWeightedZooKeeperPath.h>
 
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/IO/copyData.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/DataTypes/DataTypeFactory.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <IO/copyData.h>
+#include <IO/ReadBufferFromFile.h>
+#include <Common/escapeForFileName.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
 
 #include <Poco/FileStream.h>
 
diff --git a/dbms/include/DB/Interpreters/InterpreterAlterQuery.h b/dbms/src/Interpreters/InterpreterAlterQuery.h
similarity index 94%
rename from dbms/include/DB/Interpreters/InterpreterAlterQuery.h
rename to dbms/src/Interpreters/InterpreterAlterQuery.h
index a3e166c461e..4424096756f 100644
--- a/dbms/include/DB/Interpreters/InterpreterAlterQuery.h
+++ b/dbms/src/Interpreters/InterpreterAlterQuery.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Storages/IStorage.h>
-#include <DB/Storages/AlterCommands.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
-#include <DB/Parsers/ASTAlterQuery.h>
+#include <Storages/IStorage.h>
+#include <Storages/AlterCommands.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
+#include <Parsers/ASTAlterQuery.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterCheckQuery.cpp b/dbms/src/Interpreters/InterpreterCheckQuery.cpp
index 9bbd72c1a13..b76f3ac3487 100644
--- a/dbms/src/Interpreters/InterpreterCheckQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterCheckQuery.cpp
@@ -1,12 +1,12 @@
-#include <DB/Interpreters/InterpreterCheckQuery.h>
-#include <DB/Parsers/ASTCheckQuery.h>
-#include <DB/Storages/StorageDistributed.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/DataStreams/UnionBlockInputStream.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Interpreters/InterpreterCheckQuery.h>
+#include <Parsers/ASTCheckQuery.h>
+#include <Storages/StorageDistributed.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/UnionBlockInputStream.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
 
 #include <openssl/sha.h>
 #include <deque>
diff --git a/dbms/include/DB/Interpreters/InterpreterCheckQuery.h b/dbms/src/Interpreters/InterpreterCheckQuery.h
similarity index 79%
rename from dbms/include/DB/Interpreters/InterpreterCheckQuery.h
rename to dbms/src/Interpreters/InterpreterCheckQuery.h
index 6f11c6b16b9..f76234eccf2 100644
--- a/dbms/include/DB/Interpreters/InterpreterCheckQuery.h
+++ b/dbms/src/Interpreters/InterpreterCheckQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 namespace DB
 {
diff --git a/dbms/src/Interpreters/InterpreterCreateQuery.cpp b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
index 6f7c71cb525..0ded661b14d 100644
--- a/dbms/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
@@ -3,40 +3,40 @@
 #include <Poco/File.h>
 #include <Poco/FileStream.h>
 
-#include <DB/Common/escapeForFileName.h>
+#include <Common/escapeForFileName.h>
 
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/DataStreams/NullAndDoCopyBlockInputStream.h>
-#include <DB/DataStreams/ProhibitColumnsBlockOutputStream.h>
-#include <DB/DataStreams/MaterializingBlockOutputStream.h>
-#include <DB/DataStreams/AddingDefaultBlockOutputStream.h>
-#include <DB/DataStreams/PushingToViewsBlockOutputStream.h>
+#include <DataStreams/NullAndDoCopyBlockInputStream.h>
+#include <DataStreams/ProhibitColumnsBlockOutputStream.h>
+#include <DataStreams/MaterializingBlockOutputStream.h>
+#include <DataStreams/AddingDefaultBlockOutputStream.h>
+#include <DataStreams/PushingToViewsBlockOutputStream.h>
 
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/ASTNameTypePair.h>
-#include <DB/Parsers/ASTColumnDeclaration.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTNameTypePair.h>
+#include <Parsers/ASTColumnDeclaration.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/parseQuery.h>
 
-#include <DB/Storages/StorageFactory.h>
-#include <DB/Storages/StorageLog.h>
+#include <Storages/StorageFactory.h>
+#include <Storages/StorageLog.h>
 
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/Interpreters/InterpreterCreateQuery.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/ExpressionAnalyzer.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeFactory.h>
 
-#include <DB/Databases/DatabaseFactory.h>
-#include <DB/Databases/IDatabase.h>
+#include <Databases/DatabaseFactory.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InterpreterCreateQuery.h b/dbms/src/Interpreters/InterpreterCreateQuery.h
similarity index 91%
rename from dbms/include/DB/Interpreters/InterpreterCreateQuery.h
rename to dbms/src/Interpreters/InterpreterCreateQuery.h
index 8e7307a7d4e..01e81424894 100644
--- a/dbms/include/DB/Interpreters/InterpreterCreateQuery.h
+++ b/dbms/src/Interpreters/InterpreterCreateQuery.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Storages/IStorage.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
-#include <DB/Storages/ColumnDefault.h>
-#include <DB/Common/ThreadPool.h>
+#include <Storages/IStorage.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
+#include <Storages/ColumnDefault.h>
+#include <Common/ThreadPool.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterDescribeQuery.cpp b/dbms/src/Interpreters/InterpreterDescribeQuery.cpp
index ac0491da9a4..3dc87ba8fac 100644
--- a/dbms/src/Interpreters/InterpreterDescribeQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterDescribeQuery.cpp
@@ -1,14 +1,14 @@
-#include <DB/Storages/IStorage.h>
-#include <DB/Parsers/TablePropertiesQueriesASTs.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/DataStreams/BlockIO.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/queryToString.h>
-#include <DB/Interpreters/InterpreterDescribeQuery.h>
+#include <Storages/IStorage.h>
+#include <Parsers/TablePropertiesQueriesASTs.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/BlockIO.h>
+#include <DataStreams/copyData.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnString.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/queryToString.h>
+#include <Interpreters/InterpreterDescribeQuery.h>
 
 
 
diff --git a/dbms/include/DB/Interpreters/InterpreterDescribeQuery.h b/dbms/src/Interpreters/InterpreterDescribeQuery.h
similarity index 86%
rename from dbms/include/DB/Interpreters/InterpreterDescribeQuery.h
rename to dbms/src/Interpreters/InterpreterDescribeQuery.h
index a10982acd96..828d4806fb1 100644
--- a/dbms/include/DB/Interpreters/InterpreterDescribeQuery.h
+++ b/dbms/src/Interpreters/InterpreterDescribeQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterDropQuery.cpp b/dbms/src/Interpreters/InterpreterDropQuery.cpp
index 6ecff620b9d..d75196c3eca 100644
--- a/dbms/src/Interpreters/InterpreterDropQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterDropQuery.cpp
@@ -1,10 +1,10 @@
 #include <Poco/File.h>
 
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Parsers/ASTDropQuery.h>
-#include <DB/Interpreters/InterpreterDropQuery.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/Databases/IDatabase.h>
+#include <Common/escapeForFileName.h>
+#include <Parsers/ASTDropQuery.h>
+#include <Interpreters/InterpreterDropQuery.h>
+#include <Storages/IStorage.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InterpreterDropQuery.h b/dbms/src/Interpreters/InterpreterDropQuery.h
similarity index 81%
rename from dbms/include/DB/Interpreters/InterpreterDropQuery.h
rename to dbms/src/Interpreters/InterpreterDropQuery.h
index e3b99c0e457..604121b5c50 100644
--- a/dbms/include/DB/Interpreters/InterpreterDropQuery.h
+++ b/dbms/src/Interpreters/InterpreterDropQuery.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Storages/IStorage.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Storages/IStorage.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterExistsQuery.cpp b/dbms/src/Interpreters/InterpreterExistsQuery.cpp
index 21e32cd3f0e..662bc402682 100644
--- a/dbms/src/Interpreters/InterpreterExistsQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterExistsQuery.cpp
@@ -1,11 +1,11 @@
-#include <DB/Storages/IStorage.h>
-#include <DB/Parsers/TablePropertiesQueriesASTs.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/DataStreams/BlockIO.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Interpreters/InterpreterExistsQuery.h>
+#include <Storages/IStorage.h>
+#include <Parsers/TablePropertiesQueriesASTs.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/BlockIO.h>
+#include <DataStreams/copyData.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <Interpreters/InterpreterExistsQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InterpreterExistsQuery.h b/dbms/src/Interpreters/InterpreterExistsQuery.h
similarity index 87%
rename from dbms/include/DB/Interpreters/InterpreterExistsQuery.h
rename to dbms/src/Interpreters/InterpreterExistsQuery.h
index be25efea4a1..9c81e4bed72 100644
--- a/dbms/include/DB/Interpreters/InterpreterExistsQuery.h
+++ b/dbms/src/Interpreters/InterpreterExistsQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterFactory.cpp b/dbms/src/Interpreters/InterpreterFactory.cpp
index 6c7145cd58a..3d27628b37a 100644
--- a/dbms/src/Interpreters/InterpreterFactory.cpp
+++ b/dbms/src/Interpreters/InterpreterFactory.cpp
@@ -1,35 +1,35 @@
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/ASTDropQuery.h>
-#include <DB/Parsers/ASTRenameQuery.h>
-#include <DB/Parsers/ASTShowTablesQuery.h>
-#include <DB/Parsers/ASTUseQuery.h>
-#include <DB/Parsers/ASTSetQuery.h>
-#include <DB/Parsers/ASTOptimizeQuery.h>
-#include <DB/Parsers/ASTAlterQuery.h>
-#include <DB/Parsers/ASTShowProcesslistQuery.h>
-#include <DB/Parsers/TablePropertiesQueriesASTs.h>
-#include <DB/Parsers/ASTCheckQuery.h>
-#include <DB/Parsers/ASTKillQueryQuery.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTRenameQuery.h>
+#include <Parsers/ASTShowTablesQuery.h>
+#include <Parsers/ASTUseQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTOptimizeQuery.h>
+#include <Parsers/ASTAlterQuery.h>
+#include <Parsers/ASTShowProcesslistQuery.h>
+#include <Parsers/TablePropertiesQueriesASTs.h>
+#include <Parsers/ASTCheckQuery.h>
+#include <Parsers/ASTKillQueryQuery.h>
 
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/Interpreters/InterpreterInsertQuery.h>
-#include <DB/Interpreters/InterpreterCreateQuery.h>
-#include <DB/Interpreters/InterpreterDropQuery.h>
-#include <DB/Interpreters/InterpreterRenameQuery.h>
-#include <DB/Interpreters/InterpreterShowTablesQuery.h>
-#include <DB/Interpreters/InterpreterUseQuery.h>
-#include <DB/Interpreters/InterpreterSetQuery.h>
-#include <DB/Interpreters/InterpreterOptimizeQuery.h>
-#include <DB/Interpreters/InterpreterExistsQuery.h>
-#include <DB/Interpreters/InterpreterDescribeQuery.h>
-#include <DB/Interpreters/InterpreterShowCreateQuery.h>
-#include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/Interpreters/InterpreterShowProcesslistQuery.h>
-#include <DB/Interpreters/InterpreterCheckQuery.h>
-#include <DB/Interpreters/InterpreterKillQueryQuery.h>
-#include <DB/Interpreters/InterpreterFactory.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/InterpreterDropQuery.h>
+#include <Interpreters/InterpreterRenameQuery.h>
+#include <Interpreters/InterpreterShowTablesQuery.h>
+#include <Interpreters/InterpreterUseQuery.h>
+#include <Interpreters/InterpreterSetQuery.h>
+#include <Interpreters/InterpreterOptimizeQuery.h>
+#include <Interpreters/InterpreterExistsQuery.h>
+#include <Interpreters/InterpreterDescribeQuery.h>
+#include <Interpreters/InterpreterShowCreateQuery.h>
+#include <Interpreters/InterpreterAlterQuery.h>
+#include <Interpreters/InterpreterShowProcesslistQuery.h>
+#include <Interpreters/InterpreterCheckQuery.h>
+#include <Interpreters/InterpreterKillQueryQuery.h>
+#include <Interpreters/InterpreterFactory.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Interpreters/InterpreterFactory.h b/dbms/src/Interpreters/InterpreterFactory.h
similarity index 78%
rename from dbms/include/DB/Interpreters/InterpreterFactory.h
rename to dbms/src/Interpreters/InterpreterFactory.h
index aca6fad8c79..25bad6659d5 100644
--- a/dbms/include/DB/Interpreters/InterpreterFactory.h
+++ b/dbms/src/Interpreters/InterpreterFactory.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/QueryProcessingStage.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Core/QueryProcessingStage.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterInsertQuery.cpp b/dbms/src/Interpreters/InterpreterInsertQuery.cpp
index 1647614908e..0ee09010822 100644
--- a/dbms/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterInsertQuery.cpp
@@ -1,21 +1,21 @@
-#include <DB/IO/ConcatReadBuffer.h>
+#include <IO/ConcatReadBuffer.h>
 
-#include <DB/DataStreams/ProhibitColumnsBlockOutputStream.h>
-#include <DB/DataStreams/MaterializingBlockOutputStream.h>
-#include <DB/DataStreams/AddingDefaultBlockOutputStream.h>
-#include <DB/DataStreams/PushingToViewsBlockOutputStream.h>
-#include <DB/DataStreams/NullAndDoCopyBlockInputStream.h>
-#include <DB/DataStreams/SquashingBlockOutputStream.h>
-#include <DB/DataStreams/CountingBlockOutputStream.h>
-#include <DB/DataStreams/NullableAdapterBlockInputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/ProhibitColumnsBlockOutputStream.h>
+#include <DataStreams/MaterializingBlockOutputStream.h>
+#include <DataStreams/AddingDefaultBlockOutputStream.h>
+#include <DataStreams/PushingToViewsBlockOutputStream.h>
+#include <DataStreams/NullAndDoCopyBlockInputStream.h>
+#include <DataStreams/SquashingBlockOutputStream.h>
+#include <DataStreams/CountingBlockOutputStream.h>
+#include <DataStreams/NullableAdapterBlockInputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
 
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/InterpreterInsertQuery.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Interpreters/InterpreterInsertQuery.h b/dbms/src/Interpreters/InterpreterInsertQuery.h
similarity index 85%
rename from dbms/include/DB/Interpreters/InterpreterInsertQuery.h
rename to dbms/src/Interpreters/InterpreterInsertQuery.h
index 3d6f8ffef8f..4f2e5c465e8 100644
--- a/dbms/include/DB/Interpreters/InterpreterInsertQuery.h
+++ b/dbms/src/Interpreters/InterpreterInsertQuery.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/BlockIO.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/BlockIO.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp b/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp
index b6eaef015ba..c81af0b57d4 100644
--- a/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -1,13 +1,13 @@
-#include <DB/Interpreters/InterpreterKillQueryQuery.h>
-#include <DB/Parsers/ASTKillQueryQuery.h>
-#include <DB/Parsers/queryToString.h>
-#include <DB/Interpreters/ProcessList.h>
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
+#include <Interpreters/InterpreterKillQueryQuery.h>
+#include <Parsers/ASTKillQueryQuery.h>
+#include <Parsers/queryToString.h>
+#include <Interpreters/ProcessList.h>
+#include <Interpreters/executeQuery.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
 #include <thread>
 #include <iostream>
 #include <cstddef>
diff --git a/dbms/include/DB/Interpreters/InterpreterKillQueryQuery.h b/dbms/src/Interpreters/InterpreterKillQueryQuery.h
similarity index 82%
rename from dbms/include/DB/Interpreters/InterpreterKillQueryQuery.h
rename to dbms/src/Interpreters/InterpreterKillQueryQuery.h
index 80f29e1b71c..3616718254e 100644
--- a/dbms/include/DB/Interpreters/InterpreterKillQueryQuery.h
+++ b/dbms/src/Interpreters/InterpreterKillQueryQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterOptimizeQuery.cpp b/dbms/src/Interpreters/InterpreterOptimizeQuery.cpp
index 085453de29e..9ddfbb5af71 100644
--- a/dbms/src/Interpreters/InterpreterOptimizeQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterOptimizeQuery.cpp
@@ -1,6 +1,6 @@
-#include <DB/Storages/IStorage.h>
-#include <DB/Parsers/ASTOptimizeQuery.h>
-#include <DB/Interpreters/InterpreterOptimizeQuery.h>
+#include <Storages/IStorage.h>
+#include <Parsers/ASTOptimizeQuery.h>
+#include <Interpreters/InterpreterOptimizeQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InterpreterOptimizeQuery.h b/dbms/src/Interpreters/InterpreterOptimizeQuery.h
similarity index 83%
rename from dbms/include/DB/Interpreters/InterpreterOptimizeQuery.h
rename to dbms/src/Interpreters/InterpreterOptimizeQuery.h
index 127dd098651..c02393f8ffb 100644
--- a/dbms/include/DB/Interpreters/InterpreterOptimizeQuery.h
+++ b/dbms/src/Interpreters/InterpreterOptimizeQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterRenameQuery.cpp b/dbms/src/Interpreters/InterpreterRenameQuery.cpp
index 0eac95a7de5..dd12f0eeb4a 100644
--- a/dbms/src/Interpreters/InterpreterRenameQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterRenameQuery.cpp
@@ -1,7 +1,7 @@
-#include <DB/Parsers/ASTRenameQuery.h>
-#include <DB/Databases/IDatabase.h>
-#include <DB/Interpreters/InterpreterRenameQuery.h>
-#include <DB/Storages/IStorage.h>
+#include <Parsers/ASTRenameQuery.h>
+#include <Databases/IDatabase.h>
+#include <Interpreters/InterpreterRenameQuery.h>
+#include <Storages/IStorage.h>
 
 
 
diff --git a/dbms/include/DB/Interpreters/InterpreterRenameQuery.h b/dbms/src/Interpreters/InterpreterRenameQuery.h
similarity index 79%
rename from dbms/include/DB/Interpreters/InterpreterRenameQuery.h
rename to dbms/src/Interpreters/InterpreterRenameQuery.h
index 7a171df695b..7bdd5253455 100644
--- a/dbms/include/DB/Interpreters/InterpreterRenameQuery.h
+++ b/dbms/src/Interpreters/InterpreterRenameQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterSelectQuery.cpp b/dbms/src/Interpreters/InterpreterSelectQuery.cpp
index 9be7a92953e..0db0fb29215 100644
--- a/dbms/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterSelectQuery.cpp
@@ -1,44 +1,44 @@
 #include <experimental/optional>
 
-#include <DB/DataStreams/ExpressionBlockInputStream.h>
-#include <DB/DataStreams/FilterBlockInputStream.h>
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/LimitByBlockInputStream.h>
-#include <DB/DataStreams/PartialSortingBlockInputStream.h>
-#include <DB/DataStreams/MergeSortingBlockInputStream.h>
-#include <DB/DataStreams/MergingSortedBlockInputStream.h>
-#include <DB/DataStreams/AggregatingBlockInputStream.h>
-#include <DB/DataStreams/MergingAggregatedBlockInputStream.h>
-#include <DB/DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h>
-#include <DB/DataStreams/AsynchronousBlockInputStream.h>
-#include <DB/DataStreams/UnionBlockInputStream.h>
-#include <DB/DataStreams/ParallelAggregatingBlockInputStream.h>
-#include <DB/DataStreams/DistinctBlockInputStream.h>
-#include <DB/DataStreams/NullBlockInputStream.h>
-#include <DB/DataStreams/TotalsHavingBlockInputStream.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/DataStreams/CreatingSetsBlockInputStream.h>
-#include <DB/DataStreams/MaterializingBlockInputStream.h>
-#include <DB/DataStreams/ConcatBlockInputStream.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/FilterBlockInputStream.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/LimitByBlockInputStream.h>
+#include <DataStreams/PartialSortingBlockInputStream.h>
+#include <DataStreams/MergeSortingBlockInputStream.h>
+#include <DataStreams/MergingSortedBlockInputStream.h>
+#include <DataStreams/AggregatingBlockInputStream.h>
+#include <DataStreams/MergingAggregatedBlockInputStream.h>
+#include <DataStreams/MergingAggregatedMemoryEfficientBlockInputStream.h>
+#include <DataStreams/AsynchronousBlockInputStream.h>
+#include <DataStreams/UnionBlockInputStream.h>
+#include <DataStreams/ParallelAggregatingBlockInputStream.h>
+#include <DataStreams/DistinctBlockInputStream.h>
+#include <DataStreams/NullBlockInputStream.h>
+#include <DataStreams/TotalsHavingBlockInputStream.h>
+#include <DataStreams/copyData.h>
+#include <DataStreams/CreatingSetsBlockInputStream.h>
+#include <DataStreams/MaterializingBlockInputStream.h>
+#include <DataStreams/ConcatBlockInputStream.h>
 
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTOrderByElement.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
 
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/Interpreters/InterpreterSetQuery.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/InterpreterSetQuery.h>
+#include <Interpreters/ExpressionAnalyzer.h>
 
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
-#include <DB/TableFunctions/ITableFunction.h>
-#include <DB/TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/ITableFunction.h>
+#include <TableFunctions/TableFunctionFactory.h>
 
-#include <DB/Core/Field.h>
-#include <DB/Common/Collator.h>
+#include <Core/Field.h>
+#include <Common/Collator.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Interpreters/InterpreterSelectQuery.h b/dbms/src/Interpreters/InterpreterSelectQuery.h
similarity index 97%
rename from dbms/include/DB/Interpreters/InterpreterSelectQuery.h
rename to dbms/src/Interpreters/InterpreterSelectQuery.h
index c25c43e49e5..a9f295df494 100644
--- a/dbms/include/DB/Interpreters/InterpreterSelectQuery.h
+++ b/dbms/src/Interpreters/InterpreterSelectQuery.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Core/QueryProcessingStage.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/DataStreams/IBlockInputStream.h>
+#include <Core/QueryProcessingStage.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
+#include <Interpreters/ExpressionActions.h>
+#include <DataStreams/IBlockInputStream.h>
 
 
 namespace Poco { class Logger; }
diff --git a/dbms/src/Interpreters/InterpreterSetQuery.cpp b/dbms/src/Interpreters/InterpreterSetQuery.cpp
index 8629459d5fd..fb37ce49485 100644
--- a/dbms/src/Interpreters/InterpreterSetQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterSetQuery.cpp
@@ -1,5 +1,5 @@
-#include <DB/Parsers/ASTSetQuery.h>
-#include <DB/Interpreters/InterpreterSetQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Interpreters/InterpreterSetQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InterpreterSetQuery.h b/dbms/src/Interpreters/InterpreterSetQuery.h
similarity index 92%
rename from dbms/include/DB/Interpreters/InterpreterSetQuery.h
rename to dbms/src/Interpreters/InterpreterSetQuery.h
index 4cdbec169a5..0f6670bd31b 100644
--- a/dbms/include/DB/Interpreters/InterpreterSetQuery.h
+++ b/dbms/src/Interpreters/InterpreterSetQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterShowCreateQuery.cpp b/dbms/src/Interpreters/InterpreterShowCreateQuery.cpp
index 3da0f10d8b7..f1876ebbb88 100644
--- a/dbms/src/Interpreters/InterpreterShowCreateQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterShowCreateQuery.cpp
@@ -1,14 +1,14 @@
-#include <DB/Storages/IStorage.h>
-#include <DB/Parsers/TablePropertiesQueriesASTs.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/DataStreams/BlockIO.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Interpreters/InterpreterShowCreateQuery.h>
+#include <Storages/IStorage.h>
+#include <Parsers/TablePropertiesQueriesASTs.h>
+#include <Parsers/formatAST.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/BlockIO.h>
+#include <DataStreams/copyData.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnConst.h>
+#include <Interpreters/InterpreterShowCreateQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InterpreterShowCreateQuery.h b/dbms/src/Interpreters/InterpreterShowCreateQuery.h
similarity index 87%
rename from dbms/include/DB/Interpreters/InterpreterShowCreateQuery.h
rename to dbms/src/Interpreters/InterpreterShowCreateQuery.h
index c0dae7595b7..21f9f9826a1 100644
--- a/dbms/include/DB/Interpreters/InterpreterShowCreateQuery.h
+++ b/dbms/src/Interpreters/InterpreterShowCreateQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterShowProcesslistQuery.cpp b/dbms/src/Interpreters/InterpreterShowProcesslistQuery.cpp
index 5868c580fa6..49ff1124937 100644
--- a/dbms/src/Interpreters/InterpreterShowProcesslistQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterShowProcesslistQuery.cpp
@@ -1,10 +1,10 @@
-#include <DB/IO/ReadBufferFromString.h>
+#include <IO/ReadBufferFromString.h>
 
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/Interpreters/InterpreterShowProcesslistQuery.h>
+#include <Interpreters/executeQuery.h>
+#include <Interpreters/InterpreterShowProcesslistQuery.h>
 
-#include <DB/Parsers/ASTQueryWithOutput.h>
-#include <DB/Parsers/ASTIdentifier.h>
+#include <Parsers/ASTQueryWithOutput.h>
+#include <Parsers/ASTIdentifier.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InterpreterShowProcesslistQuery.h b/dbms/src/Interpreters/InterpreterShowProcesslistQuery.h
similarity index 85%
rename from dbms/include/DB/Interpreters/InterpreterShowProcesslistQuery.h
rename to dbms/src/Interpreters/InterpreterShowProcesslistQuery.h
index 418a70973bf..bed7e28e8c4 100644
--- a/dbms/include/DB/Interpreters/InterpreterShowProcesslistQuery.h
+++ b/dbms/src/Interpreters/InterpreterShowProcesslistQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/IInterpreter.h>
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterShowTablesQuery.cpp b/dbms/src/Interpreters/InterpreterShowTablesQuery.cpp
index 05570a9d725..31566b5e27d 100644
--- a/dbms/src/Interpreters/InterpreterShowTablesQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterShowTablesQuery.cpp
@@ -1,10 +1,10 @@
-#include <DB/IO/ReadBufferFromString.h>
+#include <IO/ReadBufferFromString.h>
 
-#include <DB/Parsers/ASTShowTablesQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
+#include <Parsers/ASTShowTablesQuery.h>
+#include <Parsers/ASTIdentifier.h>
 
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/Interpreters/InterpreterShowTablesQuery.h>
+#include <Interpreters/executeQuery.h>
+#include <Interpreters/InterpreterShowTablesQuery.h>
 
 #include <mysqlxx/Manip.h>
 
diff --git a/dbms/include/DB/Interpreters/InterpreterShowTablesQuery.h b/dbms/src/Interpreters/InterpreterShowTablesQuery.h
similarity index 87%
rename from dbms/include/DB/Interpreters/InterpreterShowTablesQuery.h
rename to dbms/src/Interpreters/InterpreterShowTablesQuery.h
index 88882c7617a..703dfe1a96a 100644
--- a/dbms/include/DB/Interpreters/InterpreterShowTablesQuery.h
+++ b/dbms/src/Interpreters/InterpreterShowTablesQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/InterpreterUseQuery.cpp b/dbms/src/Interpreters/InterpreterUseQuery.cpp
index eef3e7c9c09..f0cc2741f2d 100644
--- a/dbms/src/Interpreters/InterpreterUseQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterUseQuery.cpp
@@ -1,6 +1,6 @@
-#include <DB/Parsers/ASTUseQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/InterpreterUseQuery.h>
+#include <Parsers/ASTUseQuery.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterUseQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InterpreterUseQuery.h b/dbms/src/Interpreters/InterpreterUseQuery.h
similarity index 91%
rename from dbms/include/DB/Interpreters/InterpreterUseQuery.h
rename to dbms/src/Interpreters/InterpreterUseQuery.h
index 54baeeac732..0141426e88f 100644
--- a/dbms/include/DB/Interpreters/InterpreterUseQuery.h
+++ b/dbms/src/Interpreters/InterpreterUseQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Interpreters/IInterpreter.h>
+#include <Interpreters/IInterpreter.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/InterserverIOHandler.h b/dbms/src/Interpreters/InterserverIOHandler.h
similarity index 95%
rename from dbms/include/DB/Interpreters/InterserverIOHandler.h
rename to dbms/src/Interpreters/InterserverIOHandler.h
index 9b1de7172c5..74e0709d522 100644
--- a/dbms/include/DB/Interpreters/InterserverIOHandler.h
+++ b/dbms/src/Interpreters/InterserverIOHandler.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Core/Types.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Core/Types.h>
 #include <map>
 #include <atomic>
 #include <Poco/Net/HTMLForm.h>
diff --git a/dbms/src/Interpreters/Join.cpp b/dbms/src/Interpreters/Join.cpp
index e4204b52f49..b491d8b055f 100644
--- a/dbms/src/Interpreters/Join.cpp
+++ b/dbms/src/Interpreters/Join.cpp
@@ -1,13 +1,13 @@
 #include <common/logger_useful.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
 
-#include <DB/Interpreters/Join.h>
-#include <DB/Interpreters/NullableUtils.h>
+#include <Interpreters/Join.h>
+#include <Interpreters/NullableUtils.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Core/ColumnNumbers.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Core/ColumnNumbers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/Join.h b/dbms/src/Interpreters/Join.h
similarity index 97%
rename from dbms/include/DB/Interpreters/Join.h
rename to dbms/src/Interpreters/Join.h
index bf2dd31d8a4..032f4e73cd7 100644
--- a/dbms/include/DB/Interpreters/Join.h
+++ b/dbms/src/Interpreters/Join.h
@@ -2,19 +2,19 @@
 
 #include <Poco/RWLock.h>
 
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
 
-#include <DB/Interpreters/AggregationCommon.h>
-#include <DB/Interpreters/SettingsCommon.h>
+#include <Interpreters/AggregationCommon.h>
+#include <Interpreters/SettingsCommon.h>
 
-#include <DB/Common/Arena.h>
-#include <DB/Common/HashTable/HashMap.h>
+#include <Common/Arena.h>
+#include <Common/HashTable/HashMap.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnNullable.h>
 
-#include <DB/DataStreams/IBlockInputStream.h>
+#include <DataStreams/IBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/Limits.h b/dbms/src/Interpreters/Limits.h
similarity index 98%
rename from dbms/include/DB/Interpreters/Limits.h
rename to dbms/src/Interpreters/Limits.h
index 83b3711f772..c8192f587da 100644
--- a/dbms/include/DB/Interpreters/Limits.h
+++ b/dbms/src/Interpreters/Limits.h
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <Poco/Timespan.h>
-#include <DB/Core/Defines.h>
-#include <DB/Core/Field.h>
-#include <DB/Interpreters/SettingsCommon.h>
+#include <Core/Defines.h>
+#include <Core/Field.h>
+#include <Interpreters/SettingsCommon.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp b/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp
index f1665080f4d..da045d09448 100644
--- a/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp
+++ b/dbms/src/Interpreters/LogicalExpressionsOptimizer.cpp
@@ -1,11 +1,11 @@
-#include <DB/Interpreters/LogicalExpressionsOptimizer.h>
-#include <DB/Interpreters/Settings.h>
+#include <Interpreters/LogicalExpressionsOptimizer.h>
+#include <Interpreters/Settings.h>
 
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTLiteral.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 #include <deque>
 
diff --git a/dbms/include/DB/Interpreters/LogicalExpressionsOptimizer.h b/dbms/src/Interpreters/LogicalExpressionsOptimizer.h
similarity index 99%
rename from dbms/include/DB/Interpreters/LogicalExpressionsOptimizer.h
rename to dbms/src/Interpreters/LogicalExpressionsOptimizer.h
index 9851664f301..dfb17052e9b 100644
--- a/dbms/include/DB/Interpreters/LogicalExpressionsOptimizer.h
+++ b/dbms/src/Interpreters/LogicalExpressionsOptimizer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 #include <string>
 #include <vector>
diff --git a/dbms/src/Interpreters/NullableUtils.cpp b/dbms/src/Interpreters/NullableUtils.cpp
index c788e61d368..da8747bcd40 100644
--- a/dbms/src/Interpreters/NullableUtils.cpp
+++ b/dbms/src/Interpreters/NullableUtils.cpp
@@ -1,4 +1,4 @@
-#include <DB/Interpreters/NullableUtils.h>
+#include <Interpreters/NullableUtils.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/NullableUtils.h b/dbms/src/Interpreters/NullableUtils.h
similarity index 90%
rename from dbms/include/DB/Interpreters/NullableUtils.h
rename to dbms/src/Interpreters/NullableUtils.h
index 6c907dc084e..a5897a4495b 100644
--- a/dbms/include/DB/Interpreters/NullableUtils.h
+++ b/dbms/src/Interpreters/NullableUtils.h
@@ -1,4 +1,4 @@
-#include <DB/Columns/ColumnNullable.h>
+#include <Columns/ColumnNullable.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/PartLog.cpp b/dbms/src/Interpreters/PartLog.cpp
index 2fd8fc14669..2a4c0d30631 100644
--- a/dbms/src/Interpreters/PartLog.cpp
+++ b/dbms/src/Interpreters/PartLog.cpp
@@ -1,15 +1,15 @@
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/Interpreters/PartLog.h>
-#include <DB/Common/ClickHouseRevision.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <Interpreters/PartLog.h>
+#include <Common/ClickHouseRevision.h>
 #include <Poco/Net/IPAddress.h>
 #include <array>
 
diff --git a/dbms/include/DB/Interpreters/PartLog.h b/dbms/src/Interpreters/PartLog.h
similarity index 94%
rename from dbms/include/DB/Interpreters/PartLog.h
rename to dbms/src/Interpreters/PartLog.h
index 8365ca1a5e1..1e00137c618 100644
--- a/dbms/include/DB/Interpreters/PartLog.h
+++ b/dbms/src/Interpreters/PartLog.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Interpreters/SystemLog.h>
+#include <Interpreters/SystemLog.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/ProcessList.cpp b/dbms/src/Interpreters/ProcessList.cpp
index 7ed7bb062a6..ac20b03b48b 100644
--- a/dbms/src/Interpreters/ProcessList.cpp
+++ b/dbms/src/Interpreters/ProcessList.cpp
@@ -1,9 +1,9 @@
-#include <DB/Interpreters/ProcessList.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Parsers/ASTKillQueryQuery.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <Interpreters/ProcessList.h>
+#include <Interpreters/Settings.h>
+#include <Parsers/ASTKillQueryQuery.h>
+#include <Common/Exception.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/ProcessList.h b/dbms/src/Interpreters/ProcessList.h
similarity index 96%
rename from dbms/include/DB/Interpreters/ProcessList.h
rename to dbms/src/Interpreters/ProcessList.h
index fcec71fbdda..d63d89fec0a 100644
--- a/dbms/include/DB/Interpreters/ProcessList.h
+++ b/dbms/src/Interpreters/ProcessList.h
@@ -6,14 +6,14 @@
 #include <mutex>
 #include <unordered_map>
 #include <Poco/Condition.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Core/Defines.h>
-#include <DB/Core/Progress.h>
-#include <DB/Common/MemoryTracker.h>
-#include <DB/Interpreters/QueryPriorities.h>
-#include <DB/Interpreters/ClientInfo.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/DataStreams/BlockIO.h>
+#include <Common/Stopwatch.h>
+#include <Core/Defines.h>
+#include <Core/Progress.h>
+#include <Common/MemoryTracker.h>
+#include <Interpreters/QueryPriorities.h>
+#include <Interpreters/ClientInfo.h>
+#include <Common/CurrentMetrics.h>
+#include <DataStreams/BlockIO.h>
 
 
 namespace CurrentMetrics
diff --git a/dbms/src/Interpreters/QueryLog.cpp b/dbms/src/Interpreters/QueryLog.cpp
index 63db3201596..7a6c3075975 100644
--- a/dbms/src/Interpreters/QueryLog.cpp
+++ b/dbms/src/Interpreters/QueryLog.cpp
@@ -1,13 +1,13 @@
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnFixedString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/Interpreters/QueryLog.h>
-#include <DB/Common/ClickHouseRevision.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <Interpreters/QueryLog.h>
+#include <Common/ClickHouseRevision.h>
 #include <Poco/Net/IPAddress.h>
 #include <array>
 
diff --git a/dbms/include/DB/Interpreters/QueryLog.h b/dbms/src/Interpreters/QueryLog.h
similarity index 97%
rename from dbms/include/DB/Interpreters/QueryLog.h
rename to dbms/src/Interpreters/QueryLog.h
index 3a9f4bc6e9b..8b4c7734ebe 100644
--- a/dbms/include/DB/Interpreters/QueryLog.h
+++ b/dbms/src/Interpreters/QueryLog.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Interpreters/SystemLog.h>
+#include <Interpreters/SystemLog.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/QueryPriorities.h b/dbms/src/Interpreters/QueryPriorities.h
similarity index 98%
rename from dbms/include/DB/Interpreters/QueryPriorities.h
rename to dbms/src/Interpreters/QueryPriorities.h
index bc0a8102919..bad570b0d14 100644
--- a/dbms/include/DB/Interpreters/QueryPriorities.h
+++ b/dbms/src/Interpreters/QueryPriorities.h
@@ -5,7 +5,7 @@
 #include <condition_variable>
 #include <memory>
 #include <chrono>
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/CurrentMetrics.h>
 
 
 namespace CurrentMetrics
diff --git a/dbms/src/Interpreters/Quota.cpp b/dbms/src/Interpreters/Quota.cpp
index b3095450b4f..2ff4f1dd4c8 100644
--- a/dbms/src/Interpreters/Quota.cpp
+++ b/dbms/src/Interpreters/Quota.cpp
@@ -2,10 +2,10 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Common/SipHash.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Interpreters/Quota.h>
+#include <Common/SipHash.h>
+#include <Common/StringUtils.h>
+#include <IO/ReadHelpers.h>
+#include <Interpreters/Quota.h>
 
 #include <set>
 
diff --git a/dbms/include/DB/Interpreters/Quota.h b/dbms/src/Interpreters/Quota.h
similarity index 98%
rename from dbms/include/DB/Interpreters/Quota.h
rename to dbms/src/Interpreters/Quota.h
index 6000294e7d5..429a8056d13 100644
--- a/dbms/include/DB/Interpreters/Quota.h
+++ b/dbms/src/Interpreters/Quota.h
@@ -14,9 +14,9 @@
 
 #include <common/Common.h>
 
-#include <DB/Core/Types.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Core/Types.h>
+#include <Common/Exception.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/Set.cpp b/dbms/src/Interpreters/Set.cpp
index ab5cbd19b19..f08defc63db 100644
--- a/dbms/src/Interpreters/Set.cpp
+++ b/dbms/src/Interpreters/Set.cpp
@@ -1,26 +1,26 @@
-#include <DB/Core/Field.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Core/Row.h>
+#include <Core/Field.h>
+#include <Core/FieldVisitors.h>
+#include <Core/Row.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnTuple.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/OneBlockInputStream.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Functions/DataTypeTraits.h>
 
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTLiteral.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
 
-#include <DB/Interpreters/Set.h>
-#include <DB/Interpreters/convertFieldToType.h>
-#include <DB/Interpreters/evaluateConstantExpression.h>
-#include <DB/Interpreters/NullableUtils.h>
+#include <Interpreters/Set.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/NullableUtils.h>
 
-#include <DB/Storages/MergeTree/PKCondition.h>
+#include <Storages/MergeTree/PKCondition.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/Set.h b/dbms/src/Interpreters/Set.h
similarity index 95%
rename from dbms/include/DB/Interpreters/Set.h
rename to dbms/src/Interpreters/Set.h
index c564a7b248a..1c16fb27e31 100644
--- a/dbms/include/DB/Interpreters/Set.h
+++ b/dbms/src/Interpreters/Set.h
@@ -1,14 +1,14 @@
 #pragma once
 
 #include <Poco/RWLock.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/DataStreams/IBlockInputStream.h>
-#include <DB/Interpreters/Limits.h>
-#include <DB/Interpreters/SetVariants.h>
-#include <DB/Parsers/IAST.h>
-#include <DB/Storages/MergeTree/BoolMask.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnNullable.h>
+#include <DataStreams/IBlockInputStream.h>
+#include <Interpreters/Limits.h>
+#include <Interpreters/SetVariants.h>
+#include <Parsers/IAST.h>
+#include <Storages/MergeTree/BoolMask.h>
 
 #include <common/logger_useful.h>
 
diff --git a/dbms/src/Interpreters/SetVariants.cpp b/dbms/src/Interpreters/SetVariants.cpp
index ad0d807aab3..3f960620958 100644
--- a/dbms/src/Interpreters/SetVariants.cpp
+++ b/dbms/src/Interpreters/SetVariants.cpp
@@ -1,5 +1,5 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/Interpreters/SetVariants.h>
+#include <Columns/ColumnString.h>
+#include <Interpreters/SetVariants.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Interpreters/SetVariants.h b/dbms/src/Interpreters/SetVariants.h
similarity index 98%
rename from dbms/include/DB/Interpreters/SetVariants.h
rename to dbms/src/Interpreters/SetVariants.h
index 24df6a30f72..ac088457983 100644
--- a/dbms/include/DB/Interpreters/SetVariants.h
+++ b/dbms/src/Interpreters/SetVariants.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnString.h>
+#include <Interpreters/AggregationCommon.h>
 
-#include <DB/Common/Arena.h>
-#include <DB/Common/HashTable/HashSet.h>
-#include <DB/Common/UInt128.h>
+#include <Common/Arena.h>
+#include <Common/HashTable/HashSet.h>
+#include <Common/UInt128.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/Settings.cpp b/dbms/src/Interpreters/Settings.cpp
index a535b491e6b..bce3fd16935 100644
--- a/dbms/src/Interpreters/Settings.cpp
+++ b/dbms/src/Interpreters/Settings.cpp
@@ -1,4 +1,4 @@
-#include <DB/Interpreters/Settings.h>
+#include <Interpreters/Settings.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/Settings.h b/dbms/src/Interpreters/Settings.h
similarity index 99%
rename from dbms/include/DB/Interpreters/Settings.h
rename to dbms/src/Interpreters/Settings.h
index f0a9441a1c7..7e626654c2e 100644
--- a/dbms/include/DB/Interpreters/Settings.h
+++ b/dbms/src/Interpreters/Settings.h
@@ -2,11 +2,11 @@
 
 #include <Poco/Timespan.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <DB/Core/Defines.h>
-#include <DB/Core/Field.h>
+#include <Core/Defines.h>
+#include <Core/Field.h>
 
-#include <DB/Interpreters/Limits.h>
-#include <DB/Interpreters/SettingsCommon.h>
+#include <Interpreters/Limits.h>
+#include <Interpreters/SettingsCommon.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/SettingsCommon.h b/dbms/src/Interpreters/SettingsCommon.h
similarity index 99%
rename from dbms/include/DB/Interpreters/SettingsCommon.h
rename to dbms/src/Interpreters/SettingsCommon.h
index 14e2cc5f25a..95e388a475e 100644
--- a/dbms/include/DB/Interpreters/SettingsCommon.h
+++ b/dbms/src/Interpreters/SettingsCommon.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <DB/Core/Field.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Core/Field.h>
+#include <IO/WriteHelpers.h>
 #include <Poco/Timespan.h>
 
-#include <DB/Common/getNumberOfPhysicalCPUCores.h>
+#include <Common/getNumberOfPhysicalCPUCores.h>
 
-#include <DB/IO/CompressedStream.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/CompressedStream.h>
+#include <IO/ReadHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/SpecializedAggregator.h b/dbms/src/Interpreters/SpecializedAggregator.h
similarity index 92%
rename from dbms/include/DB/Interpreters/SpecializedAggregator.h
rename to dbms/src/Interpreters/SpecializedAggregator.h
index f206280986e..eea3a69708a 100644
--- a/dbms/include/DB/Interpreters/SpecializedAggregator.h
+++ b/dbms/src/Interpreters/SpecializedAggregator.h
@@ -1,21 +1,21 @@
-#include <DB/Interpreters/Aggregator.h>
+#include <Interpreters/Aggregator.h>
 
-#include <DB/AggregateFunctions/AggregateFunctionCount.h>
-#include <DB/AggregateFunctions/AggregateFunctionSum.h>
-#include <DB/AggregateFunctions/AggregateFunctionAvg.h>
-#include <DB/AggregateFunctions/AggregateFunctionsMinMaxAny.h>
-#include <DB/AggregateFunctions/AggregateFunctionsArgMinMax.h>
-#include <DB/AggregateFunctions/AggregateFunctionUniq.h>
-#include <DB/AggregateFunctions/AggregateFunctionUniqUpTo.h>
-#include <DB/AggregateFunctions/AggregateFunctionGroupArray.h>
-#include <DB/AggregateFunctions/AggregateFunctionGroupUniqArray.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantile.h>
-#include <DB/AggregateFunctions/AggregateFunctionQuantileTiming.h>
-#include <DB/AggregateFunctions/AggregateFunctionIf.h>
-#include <DB/AggregateFunctions/AggregateFunctionArray.h>
-#include <DB/AggregateFunctions/AggregateFunctionState.h>
-#include <DB/AggregateFunctions/AggregateFunctionMerge.h>
-#include <DB/AggregateFunctions/AggregateFunctionNull.h>
+#include <AggregateFunctions/AggregateFunctionCount.h>
+#include <AggregateFunctions/AggregateFunctionSum.h>
+#include <AggregateFunctions/AggregateFunctionAvg.h>
+#include <AggregateFunctions/AggregateFunctionsMinMaxAny.h>
+#include <AggregateFunctions/AggregateFunctionsArgMinMax.h>
+#include <AggregateFunctions/AggregateFunctionUniq.h>
+#include <AggregateFunctions/AggregateFunctionUniqUpTo.h>
+#include <AggregateFunctions/AggregateFunctionGroupArray.h>
+#include <AggregateFunctions/AggregateFunctionGroupUniqArray.h>
+#include <AggregateFunctions/AggregateFunctionQuantile.h>
+#include <AggregateFunctions/AggregateFunctionQuantileTiming.h>
+#include <AggregateFunctions/AggregateFunctionIf.h>
+#include <AggregateFunctions/AggregateFunctionArray.h>
+#include <AggregateFunctions/AggregateFunctionState.h>
+#include <AggregateFunctions/AggregateFunctionMerge.h>
+#include <AggregateFunctions/AggregateFunctionNull.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/SystemLog.h b/dbms/src/Interpreters/SystemLog.h
similarity index 93%
rename from dbms/include/DB/Interpreters/SystemLog.h
rename to dbms/src/Interpreters/SystemLog.h
index 157bf46e964..ede68910638 100644
--- a/dbms/include/DB/Interpreters/SystemLog.h
+++ b/dbms/src/Interpreters/SystemLog.h
@@ -3,21 +3,21 @@
 #include <thread>
 #include <boost/noncopyable.hpp>
 #include <common/logger_useful.h>
-#include <DB/Core/Types.h>
-#include <DB/Common/ConcurrentBoundedQueue.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ASTRenameQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Interpreters/InterpreterCreateQuery.h>
-#include <DB/Interpreters/InterpreterRenameQuery.h>
-#include <DB/Interpreters/InterpreterInsertQuery.h>
-#include <DB/Common/setThreadName.h>
+#include <Core/Types.h>
+#include <Common/ConcurrentBoundedQueue.h>
+#include <Storages/IStorage.h>
+#include <Interpreters/Context.h>
+#include <Common/Stopwatch.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ASTRenameQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/InterpreterRenameQuery.h>
+#include <Interpreters/InterpreterInsertQuery.h>
+#include <Common/setThreadName.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/Users.cpp b/dbms/src/Interpreters/Users.cpp
index a69cec9afd2..8ba9b3d4e30 100644
--- a/dbms/src/Interpreters/Users.cpp
+++ b/dbms/src/Interpreters/Users.cpp
@@ -8,14 +8,14 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/String.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/HexWriteBuffer.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/SimpleCache.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Interpreters/Users.h>
+#include <Common/Exception.h>
+#include <IO/ReadHelpers.h>
+#include <IO/HexWriteBuffer.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Common/SimpleCache.h>
+#include <Common/StringUtils.h>
+#include <Interpreters/Users.h>
 
 #include <openssl/sha.h>
 
diff --git a/dbms/include/DB/Interpreters/Users.h b/dbms/src/Interpreters/Users.h
similarity index 98%
rename from dbms/include/DB/Interpreters/Users.h
rename to dbms/src/Interpreters/Users.h
index 2cd558502ed..ead1ef9b788 100644
--- a/dbms/include/DB/Interpreters/Users.h
+++ b/dbms/src/Interpreters/Users.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 #include <map>
 #include <vector>
diff --git a/dbms/include/DB/Interpreters/config_compile.h.in b/dbms/src/Interpreters/config_compile.h.in
similarity index 100%
rename from dbms/include/DB/Interpreters/config_compile.h.in
rename to dbms/src/Interpreters/config_compile.h.in
diff --git a/dbms/src/Interpreters/convertFieldToType.cpp b/dbms/src/Interpreters/convertFieldToType.cpp
index cb5964d63ca..05610c7c310 100644
--- a/dbms/src/Interpreters/convertFieldToType.cpp
+++ b/dbms/src/Interpreters/convertFieldToType.cpp
@@ -1,19 +1,19 @@
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeEnum.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Functions/DataTypeTraits.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Functions/DataTypeTraits.h>
 
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
-#include <DB/Interpreters/convertFieldToType.h>
+#include <Interpreters/convertFieldToType.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/convertFieldToType.h b/dbms/src/Interpreters/convertFieldToType.h
similarity index 97%
rename from dbms/include/DB/Interpreters/convertFieldToType.h
rename to dbms/src/Interpreters/convertFieldToType.h
index 2a41201d428..1461ee72e3e 100644
--- a/dbms/include/DB/Interpreters/convertFieldToType.h
+++ b/dbms/src/Interpreters/convertFieldToType.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Field.h>
+#include <Core/Field.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/createBlockSelector.cpp b/dbms/src/Interpreters/createBlockSelector.cpp
index 4c8a45f187c..74a6a7fd205 100644
--- a/dbms/src/Interpreters/createBlockSelector.cpp
+++ b/dbms/src/Interpreters/createBlockSelector.cpp
@@ -1,5 +1,5 @@
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnVector.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnVector.h>
 
 #include <type_traits>
 
diff --git a/dbms/include/DB/Interpreters/createBlockSelector.h b/dbms/src/Interpreters/createBlockSelector.h
similarity index 95%
rename from dbms/include/DB/Interpreters/createBlockSelector.h
rename to dbms/src/Interpreters/createBlockSelector.h
index bb8ba878d7b..065a440913c 100644
--- a/dbms/include/DB/Interpreters/createBlockSelector.h
+++ b/dbms/src/Interpreters/createBlockSelector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Columns/IColumn.h>
+#include <Columns/IColumn.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/evaluateConstantExpression.cpp b/dbms/src/Interpreters/evaluateConstantExpression.cpp
index 232a946ab0c..7c21ac20009 100644
--- a/dbms/src/Interpreters/evaluateConstantExpression.cpp
+++ b/dbms/src/Interpreters/evaluateConstantExpression.cpp
@@ -1,14 +1,14 @@
-#include <DB/Core/Block.h>
-#include <DB/Columns/ColumnConst.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Parsers/IAST.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/evaluateConstantExpression.h>
+#include <Core/Block.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnsNumber.h>
+#include <Parsers/IAST.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/evaluateConstantExpression.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/evaluateConstantExpression.h b/dbms/src/Interpreters/evaluateConstantExpression.h
similarity index 97%
rename from dbms/include/DB/Interpreters/evaluateConstantExpression.h
rename to dbms/src/Interpreters/evaluateConstantExpression.h
index 548f8461431..52dbed9f83d 100644
--- a/dbms/include/DB/Interpreters/evaluateConstantExpression.h
+++ b/dbms/src/Interpreters/evaluateConstantExpression.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include <DB/Core/Field.h>
+#include <Core/Field.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/evaluateMissingDefaults.cpp b/dbms/src/Interpreters/evaluateMissingDefaults.cpp
index 631b666678d..8b84b9ecf43 100644
--- a/dbms/src/Interpreters/evaluateMissingDefaults.cpp
+++ b/dbms/src/Interpreters/evaluateMissingDefaults.cpp
@@ -1,10 +1,10 @@
-#include <DB/Core/Block.h>
-#include <DB/Storages/ColumnDefault.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/evaluateMissingDefaults.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTWithAlias.h>
+#include <Core/Block.h>
+#include <Storages/ColumnDefault.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/evaluateMissingDefaults.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTWithAlias.h>
 #include <utility>
 
 
diff --git a/dbms/include/DB/Interpreters/evaluateMissingDefaults.h b/dbms/src/Interpreters/evaluateMissingDefaults.h
similarity index 100%
rename from dbms/include/DB/Interpreters/evaluateMissingDefaults.h
rename to dbms/src/Interpreters/evaluateMissingDefaults.h
diff --git a/dbms/src/Interpreters/executeQuery.cpp b/dbms/src/Interpreters/executeQuery.cpp
index 856adac6588..4ab1bb5612b 100644
--- a/dbms/src/Interpreters/executeQuery.cpp
+++ b/dbms/src/Interpreters/executeQuery.cpp
@@ -1,27 +1,27 @@
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/formatReadable.h>
+#include <Common/ProfileEvents.h>
+#include <Common/formatReadable.h>
 
-#include <DB/IO/ConcatReadBuffer.h>
-#include <DB/IO/WriteBufferFromFile.h>
+#include <IO/ConcatReadBuffer.h>
+#include <IO/WriteBufferFromFile.h>
 
-#include <DB/DataStreams/BlockIO.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/InputStreamFromASTInsertQuery.h>
-#include <DB/DataStreams/CountingBlockOutputStream.h>
+#include <DataStreams/BlockIO.h>
+#include <DataStreams/copyData.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/InputStreamFromASTInsertQuery.h>
+#include <DataStreams/CountingBlockOutputStream.h>
 
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Parsers/ASTShowProcesslistQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ParserQuery.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTShowProcesslistQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ParserQuery.h>
+#include <Parsers/parseQuery.h>
 
-#include <DB/Interpreters/Quota.h>
-#include <DB/Interpreters/InterpreterFactory.h>
-#include <DB/Interpreters/ProcessList.h>
-#include <DB/Interpreters/QueryLog.h>
-#include <DB/Interpreters/executeQuery.h>
+#include <Interpreters/Quota.h>
+#include <Interpreters/InterpreterFactory.h>
+#include <Interpreters/ProcessList.h>
+#include <Interpreters/QueryLog.h>
+#include <Interpreters/executeQuery.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Interpreters/executeQuery.h b/dbms/src/Interpreters/executeQuery.h
similarity index 95%
rename from dbms/include/DB/Interpreters/executeQuery.h
rename to dbms/src/Interpreters/executeQuery.h
index 0fd5ca9dd9d..809e9393b67 100644
--- a/dbms/include/DB/Interpreters/executeQuery.h
+++ b/dbms/src/Interpreters/executeQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/QueryProcessingStage.h>
-#include <DB/DataStreams/BlockIO.h>
+#include <Core/QueryProcessingStage.h>
+#include <DataStreams/BlockIO.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/getClusterName.cpp b/dbms/src/Interpreters/getClusterName.cpp
index 4360114ebde..4312da3e1a6 100644
--- a/dbms/src/Interpreters/getClusterName.cpp
+++ b/dbms/src/Interpreters/getClusterName.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/IAST.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Common/typeid_cast.h>
+#include <Parsers/IAST.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Common/typeid_cast.h>
 
-#include <DB/Interpreters/getClusterName.h>
+#include <Interpreters/getClusterName.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/getClusterName.h b/dbms/src/Interpreters/getClusterName.h
similarity index 100%
rename from dbms/include/DB/Interpreters/getClusterName.h
rename to dbms/src/Interpreters/getClusterName.h
diff --git a/dbms/src/Interpreters/loadMetadata.cpp b/dbms/src/Interpreters/loadMetadata.cpp
index 549adc112aa..b51522ba879 100644
--- a/dbms/src/Interpreters/loadMetadata.cpp
+++ b/dbms/src/Interpreters/loadMetadata.cpp
@@ -2,22 +2,22 @@
 #include <thread>
 #include <future>
 
-#include <DB/Common/ThreadPool.h>
+#include <Common/ThreadPool.h>
 
 #include <Poco/DirectoryIterator.h>
 #include <Poco/FileStream.h>
 
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/parseQuery.h>
 
-#include <DB/Interpreters/InterpreterCreateQuery.h>
-#include <DB/Interpreters/loadMetadata.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/loadMetadata.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/Common/escapeForFileName.h>
+#include <IO/ReadBufferFromFile.h>
+#include <Common/escapeForFileName.h>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/loadMetadata.h b/dbms/src/Interpreters/loadMetadata.h
similarity index 84%
rename from dbms/include/DB/Interpreters/loadMetadata.h
rename to dbms/src/Interpreters/loadMetadata.h
index 76e7e18d1be..a9a29b99876 100644
--- a/dbms/include/DB/Interpreters/loadMetadata.h
+++ b/dbms/src/Interpreters/loadMetadata.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/sortBlock.cpp b/dbms/src/Interpreters/sortBlock.cpp
index 42135c4f50a..7e7e5973ae0 100644
--- a/dbms/src/Interpreters/sortBlock.cpp
+++ b/dbms/src/Interpreters/sortBlock.cpp
@@ -1,6 +1,6 @@
-#include <DB/Interpreters/sortBlock.h>
+#include <Interpreters/sortBlock.h>
 
-#include <DB/Columns/ColumnString.h>
+#include <Columns/ColumnString.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Interpreters/sortBlock.h b/dbms/src/Interpreters/sortBlock.h
similarity index 96%
rename from dbms/include/DB/Interpreters/sortBlock.h
rename to dbms/src/Interpreters/sortBlock.h
index 341cc076bef..e9a83ea4ddc 100644
--- a/dbms/include/DB/Interpreters/sortBlock.h
+++ b/dbms/src/Interpreters/sortBlock.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/Block.h>
-#include <DB/Core/SortDescription.h>
+#include <Core/Block.h>
+#include <Core/SortDescription.h>
 
 
 namespace DB
diff --git a/dbms/src/Interpreters/tests/aggregate.cpp b/dbms/src/Interpreters/tests/aggregate.cpp
index 0faf364c30e..fc54e3c8a86 100644
--- a/dbms/src/Interpreters/tests/aggregate.cpp
+++ b/dbms/src/Interpreters/tests/aggregate.cpp
@@ -1,17 +1,17 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
 
-#include <DB/DataStreams/OneBlockInputStream.h>
+#include <DataStreams/OneBlockInputStream.h>
 
-#include <DB/Interpreters/Aggregator.h>
+#include <Interpreters/Aggregator.h>
 
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Interpreters/tests/compiler_test.cpp b/dbms/src/Interpreters/tests/compiler_test.cpp
index ebe995a46c7..f1cb2753bdb 100644
--- a/dbms/src/Interpreters/tests/compiler_test.cpp
+++ b/dbms/src/Interpreters/tests/compiler_test.cpp
@@ -1,7 +1,7 @@
 #include <Poco/ConsoleChannel.h>
 #include <Poco/AutoPtr.h>
 
-#include <DB/Interpreters/Compiler.h>
+#include <Interpreters/Compiler.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Interpreters/tests/create_query.cpp b/dbms/src/Interpreters/tests/create_query.cpp
index 23f8663c0f2..3e26fed8473 100644
--- a/dbms/src/Interpreters/tests/create_query.cpp
+++ b/dbms/src/Interpreters/tests/create_query.cpp
@@ -1,13 +1,13 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
 
-#include <DB/Databases/DatabaseOrdinary.h>
+#include <Databases/DatabaseOrdinary.h>
 
-#include <DB/Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/InterpreterCreateQuery.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Interpreters/tests/expression.cpp b/dbms/src/Interpreters/tests/expression.cpp
index e32742f5894..ee55adc9903 100644
--- a/dbms/src/Interpreters/tests/expression.cpp
+++ b/dbms/src/Interpreters/tests/expression.cpp
@@ -1,28 +1,28 @@
 #include <iostream>
 #include <iomanip>
 
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
 
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
 
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/Context.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Interpreters/tests/expression_analyzer.cpp b/dbms/src/Interpreters/tests/expression_analyzer.cpp
index 3d40c18a7ec..8bb0cb54c05 100644
--- a/dbms/src/Interpreters/tests/expression_analyzer.cpp
+++ b/dbms/src/Interpreters/tests/expression_analyzer.cpp
@@ -1,12 +1,12 @@
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/DataTypes/DataTypeFactory.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/Context.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <DataTypes/DataTypeFactory.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Interpreters/tests/hash_map.cpp b/dbms/src/Interpreters/tests/hash_map.cpp
index 28821dd7540..e70eba67467 100644
--- a/dbms/src/Interpreters/tests/hash_map.cpp
+++ b/dbms/src/Interpreters/tests/hash_map.cpp
@@ -7,17 +7,17 @@
 #include <sparsehash/dense_hash_map>
 #include <sparsehash/sparse_hash_map>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 /*
 #define DBMS_HASH_MAP_COUNT_COLLISIONS
 */
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/AggregateFunctions/IAggregateFunction.h>
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <Core/Types.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
+#include <Common/HashTable/HashMap.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <DataTypes/DataTypesNumber.h>
 
 
 /** Тест проверяет скорость работы хэш-таблиц, имитируя их использование для агрегации.
diff --git a/dbms/src/Interpreters/tests/hash_map2.cpp b/dbms/src/Interpreters/tests/hash_map2.cpp
index 48255acbb28..4973c8c9427 100644
--- a/dbms/src/Interpreters/tests/hash_map2.cpp
+++ b/dbms/src/Interpreters/tests/hash_map2.cpp
@@ -7,15 +7,15 @@
 #include <sparsehash/dense_hash_map>
 #include <sparsehash/sparse_hash_map>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/Common/HashTable/HashMap.h>
+#include <Core/Types.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
+#include <Common/HashTable/HashMap.h>
 
 
 using Key = UInt64;
diff --git a/dbms/src/Interpreters/tests/hash_map3.cpp b/dbms/src/Interpreters/tests/hash_map3.cpp
index 07a6ea769ba..f3e3e4e235d 100644
--- a/dbms/src/Interpreters/tests/hash_map3.cpp
+++ b/dbms/src/Interpreters/tests/hash_map3.cpp
@@ -10,14 +10,14 @@
 
 #include <utility>
 
-#include <DB/Core/Types.h>
-#include <DB/Common/Exception.h>
+#include <Core/Types.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/ReadHelpers.h>
+#include <IO/ReadHelpers.h>
 
-#include <DB/Core/StringRef.h>
+#include <Core/StringRef.h>
 
-#include <DB/Common/HashTable/HashMap.h>
+#include <Common/HashTable/HashMap.h>
 
 
 template
diff --git a/dbms/src/Interpreters/tests/hash_map_string.cpp b/dbms/src/Interpreters/tests/hash_map_string.cpp
index 346bb5f365f..bca9b97d3e0 100644
--- a/dbms/src/Interpreters/tests/hash_map_string.cpp
+++ b/dbms/src/Interpreters/tests/hash_map_string.cpp
@@ -7,18 +7,18 @@
 #include <sparsehash/dense_hash_map>
 #include <sparsehash/sparse_hash_map>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/Core/StringRef.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Core/Types.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/CompressedReadBuffer.h>
+#include <Core/StringRef.h>
+#include <Common/HashTable/HashMap.h>
+#include <Interpreters/AggregationCommon.h>
 
 
 struct CompactStringRef
diff --git a/dbms/src/Interpreters/tests/hash_map_string_2.cpp b/dbms/src/Interpreters/tests/hash_map_string_2.cpp
index 7f2eca2bed4..5d2c6622893 100644
--- a/dbms/src/Interpreters/tests/hash_map_string_2.cpp
+++ b/dbms/src/Interpreters/tests/hash_map_string_2.cpp
@@ -2,18 +2,18 @@
 #include <iomanip>
 #include <vector>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/Core/StringRef.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Core/Types.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/CompressedReadBuffer.h>
+#include <Core/StringRef.h>
+#include <Common/HashTable/HashMap.h>
+#include <Interpreters/AggregationCommon.h>
 
 #if __SSE4_1__
     #include <smmintrin.h>
diff --git a/dbms/src/Interpreters/tests/hash_map_string_3.cpp b/dbms/src/Interpreters/tests/hash_map_string_3.cpp
index acb89fa9300..3e8252bb480 100644
--- a/dbms/src/Interpreters/tests/hash_map_string_3.cpp
+++ b/dbms/src/Interpreters/tests/hash_map_string_3.cpp
@@ -2,7 +2,7 @@
 #include <iomanip>
 #include <vector>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 #include <farmhash.h>
 #include <metrohash.h>
@@ -10,13 +10,13 @@
 #define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/Core/StringRef.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Core/Types.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/CompressedReadBuffer.h>
+#include <Core/StringRef.h>
+#include <Common/HashTable/HashMap.h>
+#include <Interpreters/AggregationCommon.h>
 
 #if __SSE4_1__
     #include <smmintrin.h>
diff --git a/dbms/src/Interpreters/tests/hash_map_string_small.cpp b/dbms/src/Interpreters/tests/hash_map_string_small.cpp
index 82c456b2569..32a191e9561 100644
--- a/dbms/src/Interpreters/tests/hash_map_string_small.cpp
+++ b/dbms/src/Interpreters/tests/hash_map_string_small.cpp
@@ -7,18 +7,18 @@
 #include <sparsehash/dense_hash_map>
 #include <sparsehash/sparse_hash_map>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
 //#define DBMS_HASH_MAP_COUNT_COLLISIONS
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/Core/StringRef.h>
-#include <DB/Common/HashTable/HashMap.h>
-#include <DB/Interpreters/AggregationCommon.h>
+#include <Core/Types.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/CompressedReadBuffer.h>
+#include <Core/StringRef.h>
+#include <Common/HashTable/HashMap.h>
+#include <Interpreters/AggregationCommon.h>
 
 
 struct SmallStringRef
diff --git a/dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp b/dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp
index 46fd85ac7e2..9a6b0a8c2ae 100644
--- a/dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp
+++ b/dbms/src/Interpreters/tests/in_join_subqueries_preprocessor.cpp
@@ -1,15 +1,15 @@
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/queryToString.h>
-#include <DB/Interpreters/InJoinSubqueriesPreprocessor.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/Databases/IDatabase.h>
-#include <DB/Databases/DatabaseOrdinary.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/queryToString.h>
+#include <Interpreters/InJoinSubqueriesPreprocessor.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/Settings.h>
+#include <Storages/IStorage.h>
+#include <Databases/IDatabase.h>
+#include <Databases/DatabaseOrdinary.h>
 
 #include <iostream>
 #include <vector>
diff --git a/dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp b/dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp
index 5a93daeae70..fb339ba05fc 100644
--- a/dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp
+++ b/dbms/src/Interpreters/tests/logical_expressions_optimizer.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/queryToString.h>
-#include <DB/Interpreters/LogicalExpressionsOptimizer.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Common/typeid_cast.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/queryToString.h>
+#include <Interpreters/LogicalExpressionsOptimizer.h>
+#include <Interpreters/Settings.h>
+#include <Common/typeid_cast.h>
 
 #include <iostream>
 #include <vector>
diff --git a/dbms/src/Interpreters/tests/select_query.cpp b/dbms/src/Interpreters/tests/select_query.cpp
index c0993c3325e..3a87eba6e49 100644
--- a/dbms/src/Interpreters/tests/select_query.cpp
+++ b/dbms/src/Interpreters/tests/select_query.cpp
@@ -3,17 +3,17 @@
 
 #include <Poco/ConsoleChannel.h>
 
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/Storages/StorageLog.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Storages/System/StorageSystemOne.h>
+#include <Storages/StorageLog.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Storages/System/StorageSystemOne.h>
 
-#include <DB/Interpreters/loadMetadata.h>
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/Databases/IDatabase.h>
-#include <DB/Databases/DatabaseOrdinary.h>
+#include <Interpreters/loadMetadata.h>
+#include <Interpreters/executeQuery.h>
+#include <Databases/IDatabase.h>
+#include <Databases/DatabaseOrdinary.h>
 
 
 using namespace DB;
diff --git a/dbms/src/Interpreters/tests/two_level_hash_map.cpp b/dbms/src/Interpreters/tests/two_level_hash_map.cpp
index 62e572fe848..6c3b85a7626 100644
--- a/dbms/src/Interpreters/tests/two_level_hash_map.cpp
+++ b/dbms/src/Interpreters/tests/two_level_hash_map.cpp
@@ -9,14 +9,14 @@
 
 //#define DBMS_HASH_MAP_DEBUG_RESIZES
 
-#include <DB/Common/Stopwatch.h>
-#include <DB/AggregateFunctions/UniquesHashSet.h>
+#include <Common/Stopwatch.h>
+#include <AggregateFunctions/UniquesHashSet.h>
 
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/Common/HashTable/TwoLevelHashTable.h>
-#include <DB/Common/HashTable/HashMap.h>
+#include <Core/Types.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
+#include <Common/HashTable/TwoLevelHashTable.h>
+#include <Common/HashTable/HashMap.h>
 
 
 using Key = UInt64;
diff --git a/dbms/src/Interpreters/tests/users.cpp b/dbms/src/Interpreters/tests/users.cpp
index 8d111f91305..ad22b4bc2b0 100644
--- a/dbms/src/Interpreters/tests/users.cpp
+++ b/dbms/src/Interpreters/tests/users.cpp
@@ -1,5 +1,5 @@
-#include <DB/Common/ConfigProcessor.h>
-#include <DB/Interpreters/Users.h>
+#include <Common/ConfigProcessor.h>
+#include <Interpreters/Users.h>
 
 #include <boost/filesystem.hpp>
 
diff --git a/dbms/src/Parsers/ASTAlterQuery.cpp b/dbms/src/Parsers/ASTAlterQuery.cpp
index 7f0df8c628a..0788243e9e4 100644
--- a/dbms/src/Parsers/ASTAlterQuery.cpp
+++ b/dbms/src/Parsers/ASTAlterQuery.cpp
@@ -1,4 +1,4 @@
-#include <DB/Parsers/ASTAlterQuery.h>
+#include <Parsers/ASTAlterQuery.h>
 #include <mysqlxx/Manip.h>
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTAlterQuery.h b/dbms/src/Parsers/ASTAlterQuery.h
similarity index 99%
rename from dbms/include/DB/Parsers/ASTAlterQuery.h
rename to dbms/src/Parsers/ASTAlterQuery.h
index e4200e4f02b..84df3a5f189 100644
--- a/dbms/include/DB/Parsers/ASTAlterQuery.h
+++ b/dbms/src/Parsers/ASTAlterQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTAsterisk.h b/dbms/src/Parsers/ASTAsterisk.h
similarity index 94%
rename from dbms/include/DB/Parsers/ASTAsterisk.h
rename to dbms/src/Parsers/ASTAsterisk.h
index b6ca4103bd2..50c39ce2ef5 100644
--- a/dbms/include/DB/Parsers/ASTAsterisk.h
+++ b/dbms/src/Parsers/ASTAsterisk.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTCheckQuery.h b/dbms/src/Parsers/ASTCheckQuery.h
similarity index 97%
rename from dbms/include/DB/Parsers/ASTCheckQuery.h
rename to dbms/src/Parsers/ASTCheckQuery.h
index d12cc87b06a..b6c2bc71070 100644
--- a/dbms/include/DB/Parsers/ASTCheckQuery.h
+++ b/dbms/src/Parsers/ASTCheckQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/ASTQueryWithOutput.h>
+#include <Parsers/ASTQueryWithOutput.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Parsers/ASTColumnDeclaration.h b/dbms/src/Parsers/ASTColumnDeclaration.h
similarity index 98%
rename from dbms/include/DB/Parsers/ASTColumnDeclaration.h
rename to dbms/src/Parsers/ASTColumnDeclaration.h
index 45d24785013..42d5d8621aa 100644
--- a/dbms/include/DB/Parsers/ASTColumnDeclaration.h
+++ b/dbms/src/Parsers/ASTColumnDeclaration.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Parsers/ASTCreateQuery.h b/dbms/src/Parsers/ASTCreateQuery.h
similarity index 98%
rename from dbms/include/DB/Parsers/ASTCreateQuery.h
rename to dbms/src/Parsers/ASTCreateQuery.h
index d3111062b59..b7cd1599235 100644
--- a/dbms/include/DB/Parsers/ASTCreateQuery.h
+++ b/dbms/src/Parsers/ASTCreateQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTFunction.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTDropQuery.h b/dbms/src/Parsers/ASTDropQuery.h
similarity index 98%
rename from dbms/include/DB/Parsers/ASTDropQuery.h
rename to dbms/src/Parsers/ASTDropQuery.h
index 31a1ba8256c..3348041db06 100644
--- a/dbms/include/DB/Parsers/ASTDropQuery.h
+++ b/dbms/src/Parsers/ASTDropQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTEnumElement.h b/dbms/src/Parsers/ASTEnumElement.h
similarity index 92%
rename from dbms/include/DB/Parsers/ASTEnumElement.h
rename to dbms/src/Parsers/ASTEnumElement.h
index 08c56497527..1898c5d9172 100644
--- a/dbms/include/DB/Parsers/ASTEnumElement.h
+++ b/dbms/src/Parsers/ASTEnumElement.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Parsers/ASTLiteral.h>
+#include <Parsers/IAST.h>
+#include <Parsers/ASTLiteral.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTExpressionList.h b/dbms/src/Parsers/ASTExpressionList.h
similarity index 98%
rename from dbms/include/DB/Parsers/ASTExpressionList.h
rename to dbms/src/Parsers/ASTExpressionList.h
index 01329b7cde6..ef87fc0ba77 100644
--- a/dbms/include/DB/Parsers/ASTExpressionList.h
+++ b/dbms/src/Parsers/ASTExpressionList.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTFunction.cpp b/dbms/src/Parsers/ASTFunction.cpp
index ddcea4374ea..a84f7aad735 100644
--- a/dbms/src/Parsers/ASTFunction.cpp
+++ b/dbms/src/Parsers/ASTFunction.cpp
@@ -1,8 +1,8 @@
-#include <DB/Common/typeid_cast.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/WriteBufferFromString.h>
+#include <Common/typeid_cast.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferFromString.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTFunction.h b/dbms/src/Parsers/ASTFunction.h
similarity index 96%
rename from dbms/include/DB/Parsers/ASTFunction.h
rename to dbms/src/Parsers/ASTFunction.h
index 6279a1c0df0..6f35cde657b 100644
--- a/dbms/include/DB/Parsers/ASTFunction.h
+++ b/dbms/src/Parsers/ASTFunction.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/ASTWithAlias.h>
-#include <DB/Parsers/ASTExpressionList.h>
+#include <Parsers/ASTWithAlias.h>
+#include <Parsers/ASTExpressionList.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTIdentifier.cpp b/dbms/src/Parsers/ASTIdentifier.cpp
index 3ae7ac39a09..a73d9aefc46 100644
--- a/dbms/src/Parsers/ASTIdentifier.cpp
+++ b/dbms/src/Parsers/ASTIdentifier.cpp
@@ -1,6 +1,6 @@
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/IO/WriteBufferFromOStream.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Parsers/ASTIdentifier.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTIdentifier.h b/dbms/src/Parsers/ASTIdentifier.h
similarity index 97%
rename from dbms/include/DB/Parsers/ASTIdentifier.h
rename to dbms/src/Parsers/ASTIdentifier.h
index 634914f58f4..e0d9e97a9a1 100644
--- a/dbms/include/DB/Parsers/ASTIdentifier.h
+++ b/dbms/src/Parsers/ASTIdentifier.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/ASTWithAlias.h>
+#include <Parsers/ASTWithAlias.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTInsertQuery.cpp b/dbms/src/Parsers/ASTInsertQuery.cpp
index 5d4aa811712..337424a8cfd 100644
--- a/dbms/src/Parsers/ASTInsertQuery.cpp
+++ b/dbms/src/Parsers/ASTInsertQuery.cpp
@@ -1,5 +1,5 @@
 #include <mysqlxx/Manip.h>
-#include <DB/Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTInsertQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTInsertQuery.h b/dbms/src/Parsers/ASTInsertQuery.h
similarity index 97%
rename from dbms/include/DB/Parsers/ASTInsertQuery.h
rename to dbms/src/Parsers/ASTInsertQuery.h
index 398a2e7867a..3d5b115d74e 100644
--- a/dbms/include/DB/Parsers/ASTInsertQuery.h
+++ b/dbms/src/Parsers/ASTInsertQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTKillQueryQuery.cpp b/dbms/src/Parsers/ASTKillQueryQuery.cpp
index 9e4dac342c8..77844be9833 100644
--- a/dbms/src/Parsers/ASTKillQueryQuery.cpp
+++ b/dbms/src/Parsers/ASTKillQueryQuery.cpp
@@ -1,4 +1,4 @@
-#include <DB/Parsers/ASTKillQueryQuery.h>
+#include <Parsers/ASTKillQueryQuery.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Parsers/ASTKillQueryQuery.h b/dbms/src/Parsers/ASTKillQueryQuery.h
similarity index 90%
rename from dbms/include/DB/Parsers/ASTKillQueryQuery.h
rename to dbms/src/Parsers/ASTKillQueryQuery.h
index 4e8dc8cd61d..5aca8e07588 100644
--- a/dbms/include/DB/Parsers/ASTKillQueryQuery.h
+++ b/dbms/src/Parsers/ASTKillQueryQuery.h
@@ -1,5 +1,5 @@
-#include <DB/Parsers/IAST.h>
-#include <DB/Parsers/ASTQueryWithOutput.h>
+#include <Parsers/IAST.h>
+#include <Parsers/ASTQueryWithOutput.h>
 
 namespace DB
 {
diff --git a/dbms/src/Parsers/ASTLiteral.cpp b/dbms/src/Parsers/ASTLiteral.cpp
index 5a3283a3694..fe7d0367b97 100644
--- a/dbms/src/Parsers/ASTLiteral.cpp
+++ b/dbms/src/Parsers/ASTLiteral.cpp
@@ -1,7 +1,7 @@
-#include <DB/Common/SipHash.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/SipHash.h>
+#include <Core/FieldVisitors.h>
+#include <Parsers/ASTLiteral.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTLiteral.h b/dbms/src/Parsers/ASTLiteral.h
similarity index 89%
rename from dbms/include/DB/Parsers/ASTLiteral.h
rename to dbms/src/Parsers/ASTLiteral.h
index 33c5c6ea0e5..6d69f83e041 100644
--- a/dbms/include/DB/Parsers/ASTLiteral.h
+++ b/dbms/src/Parsers/ASTLiteral.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Field.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Parsers/ASTWithAlias.h>
+#include <Core/Field.h>
+#include <Core/FieldVisitors.h>
+#include <Parsers/ASTWithAlias.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTNameTypePair.h b/dbms/src/Parsers/ASTNameTypePair.h
similarity index 97%
rename from dbms/include/DB/Parsers/ASTNameTypePair.h
rename to dbms/src/Parsers/ASTNameTypePair.h
index 764a77851d5..97273f6280b 100644
--- a/dbms/include/DB/Parsers/ASTNameTypePair.h
+++ b/dbms/src/Parsers/ASTNameTypePair.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTOptimizeQuery.h b/dbms/src/Parsers/ASTOptimizeQuery.h
similarity index 98%
rename from dbms/include/DB/Parsers/ASTOptimizeQuery.h
rename to dbms/src/Parsers/ASTOptimizeQuery.h
index 979122cbf73..38500873f54 100644
--- a/dbms/include/DB/Parsers/ASTOptimizeQuery.h
+++ b/dbms/src/Parsers/ASTOptimizeQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTOrderByElement.cpp b/dbms/src/Parsers/ASTOrderByElement.cpp
index bba9b6d5f91..ba61ed3bcd2 100644
--- a/dbms/src/Parsers/ASTOrderByElement.cpp
+++ b/dbms/src/Parsers/ASTOrderByElement.cpp
@@ -1,5 +1,5 @@
-#include <DB/Common/Collator.h>
-#include <DB/Parsers/ASTOrderByElement.h>
+#include <Common/Collator.h>
+#include <Parsers/ASTOrderByElement.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTOrderByElement.h b/dbms/src/Parsers/ASTOrderByElement.h
similarity index 97%
rename from dbms/include/DB/Parsers/ASTOrderByElement.h
rename to dbms/src/Parsers/ASTOrderByElement.h
index 861d21ba748..bd3d2c5eb06 100644
--- a/dbms/include/DB/Parsers/ASTOrderByElement.h
+++ b/dbms/src/Parsers/ASTOrderByElement.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTQualifiedAsterisk.cpp b/dbms/src/Parsers/ASTQualifiedAsterisk.cpp
index f65a8de52d1..b5c83b6554f 100644
--- a/dbms/src/Parsers/ASTQualifiedAsterisk.cpp
+++ b/dbms/src/Parsers/ASTQualifiedAsterisk.cpp
@@ -1,4 +1,4 @@
-#include <DB/Parsers/ASTQualifiedAsterisk.h>
+#include <Parsers/ASTQualifiedAsterisk.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Parsers/ASTQualifiedAsterisk.h b/dbms/src/Parsers/ASTQualifiedAsterisk.h
similarity index 95%
rename from dbms/include/DB/Parsers/ASTQualifiedAsterisk.h
rename to dbms/src/Parsers/ASTQualifiedAsterisk.h
index 9a4f387c7f4..52d9e8b39c6 100644
--- a/dbms/include/DB/Parsers/ASTQualifiedAsterisk.h
+++ b/dbms/src/Parsers/ASTQualifiedAsterisk.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTQueryWithOutput.cpp b/dbms/src/Parsers/ASTQueryWithOutput.cpp
index 5aecec8757b..5589702ac77 100644
--- a/dbms/src/Parsers/ASTQueryWithOutput.cpp
+++ b/dbms/src/Parsers/ASTQueryWithOutput.cpp
@@ -1,4 +1,4 @@
-#include <DB/Parsers/ASTQueryWithOutput.h>
+#include <Parsers/ASTQueryWithOutput.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Parsers/ASTQueryWithOutput.h b/dbms/src/Parsers/ASTQueryWithOutput.h
similarity index 98%
rename from dbms/include/DB/Parsers/ASTQueryWithOutput.h
rename to dbms/src/Parsers/ASTQueryWithOutput.h
index 93323c93c81..be9a0836d5a 100644
--- a/dbms/include/DB/Parsers/ASTQueryWithOutput.h
+++ b/dbms/src/Parsers/ASTQueryWithOutput.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTQueryWithTableAndOutput.h b/dbms/src/Parsers/ASTQueryWithTableAndOutput.h
similarity index 96%
rename from dbms/include/DB/Parsers/ASTQueryWithTableAndOutput.h
rename to dbms/src/Parsers/ASTQueryWithTableAndOutput.h
index b30561fafbb..f2b682b3973 100644
--- a/dbms/include/DB/Parsers/ASTQueryWithTableAndOutput.h
+++ b/dbms/src/Parsers/ASTQueryWithTableAndOutput.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Parsers/ASTQueryWithOutput.h>
+#include <Parsers/IAST.h>
+#include <Parsers/ASTQueryWithOutput.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTRenameQuery.h b/dbms/src/Parsers/ASTRenameQuery.h
similarity index 98%
rename from dbms/include/DB/Parsers/ASTRenameQuery.h
rename to dbms/src/Parsers/ASTRenameQuery.h
index 755a084079b..411c2209ce8 100644
--- a/dbms/include/DB/Parsers/ASTRenameQuery.h
+++ b/dbms/src/Parsers/ASTRenameQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTSampleRatio.cpp b/dbms/src/Parsers/ASTSampleRatio.cpp
index c4805994793..abb961ddb59 100644
--- a/dbms/src/Parsers/ASTSampleRatio.cpp
+++ b/dbms/src/Parsers/ASTSampleRatio.cpp
@@ -1,4 +1,4 @@
-#include <DB/Parsers/ASTSampleRatio.h>
+#include <Parsers/ASTSampleRatio.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Parsers/ASTSampleRatio.h b/dbms/src/Parsers/ASTSampleRatio.h
similarity index 97%
rename from dbms/include/DB/Parsers/ASTSampleRatio.h
rename to dbms/src/Parsers/ASTSampleRatio.h
index 0e6c86f2242..f2c6cc1f593 100644
--- a/dbms/include/DB/Parsers/ASTSampleRatio.h
+++ b/dbms/src/Parsers/ASTSampleRatio.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTSelectQuery.cpp b/dbms/src/Parsers/ASTSelectQuery.cpp
index 8043c1c9fef..dd9ae8ca3b6 100644
--- a/dbms/src/Parsers/ASTSelectQuery.cpp
+++ b/dbms/src/Parsers/ASTSelectQuery.cpp
@@ -1,12 +1,12 @@
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Parsers/ASTSetQuery.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTAsterisk.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTSubquery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Common/typeid_cast.h>
+#include <Core/FieldVisitors.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTAsterisk.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTSelectQuery.h b/dbms/src/Parsers/ASTSelectQuery.h
similarity index 96%
rename from dbms/include/DB/Parsers/ASTSelectQuery.h
rename to dbms/src/Parsers/ASTSelectQuery.h
index 63c13697de6..d76f6ec854b 100644
--- a/dbms/include/DB/Parsers/ASTSelectQuery.h
+++ b/dbms/src/Parsers/ASTSelectQuery.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Parsers/ASTQueryWithOutput.h>
-#include <DB/Core/Names.h>
+#include <Parsers/IAST.h>
+#include <Parsers/ASTQueryWithOutput.h>
+#include <Core/Names.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTSet.h b/dbms/src/Parsers/ASTSet.h
similarity index 98%
rename from dbms/include/DB/Parsers/ASTSet.h
rename to dbms/src/Parsers/ASTSet.h
index 1b550d083a8..a79f7d13b59 100644
--- a/dbms/include/DB/Parsers/ASTSet.h
+++ b/dbms/src/Parsers/ASTSet.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTSetQuery.h b/dbms/src/Parsers/ASTSetQuery.h
similarity index 93%
rename from dbms/include/DB/Parsers/ASTSetQuery.h
rename to dbms/src/Parsers/ASTSetQuery.h
index b4dd427dfb2..00f5a12a9a9 100644
--- a/dbms/include/DB/Parsers/ASTSetQuery.h
+++ b/dbms/src/Parsers/ASTSetQuery.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Field.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Parsers/IAST.h>
+#include <Core/Field.h>
+#include <Core/FieldVisitors.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTShowProcesslistQuery.h b/dbms/src/Parsers/ASTShowProcesslistQuery.h
similarity index 75%
rename from dbms/include/DB/Parsers/ASTShowProcesslistQuery.h
rename to dbms/src/Parsers/ASTShowProcesslistQuery.h
index c1bd4f35eb3..ac436ac6ec3 100644
--- a/dbms/include/DB/Parsers/ASTShowProcesslistQuery.h
+++ b/dbms/src/Parsers/ASTShowProcesslistQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/ASTQueryWithOutput.h>
+#include <Parsers/ASTQueryWithOutput.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTShowTablesQuery.h b/dbms/src/Parsers/ASTShowTablesQuery.h
similarity index 95%
rename from dbms/include/DB/Parsers/ASTShowTablesQuery.h
rename to dbms/src/Parsers/ASTShowTablesQuery.h
index 404db1e0da9..95607c82d5a 100644
--- a/dbms/include/DB/Parsers/ASTShowTablesQuery.h
+++ b/dbms/src/Parsers/ASTShowTablesQuery.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <mysqlxx/Manip.h>
-#include <DB/Parsers/IAST.h>
-#include <DB/Parsers/ASTQueryWithOutput.h>
+#include <Parsers/IAST.h>
+#include <Parsers/ASTQueryWithOutput.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTSubquery.h b/dbms/src/Parsers/ASTSubquery.h
similarity index 97%
rename from dbms/include/DB/Parsers/ASTSubquery.h
rename to dbms/src/Parsers/ASTSubquery.h
index dfbbe4d8620..2d26ad6e0cd 100644
--- a/dbms/include/DB/Parsers/ASTSubquery.h
+++ b/dbms/src/Parsers/ASTSubquery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/ASTWithAlias.h>
+#include <Parsers/ASTWithAlias.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ASTTablesInSelectQuery.cpp b/dbms/src/Parsers/ASTTablesInSelectQuery.cpp
index a249d04f466..1ea2c2cf8a3 100644
--- a/dbms/src/Parsers/ASTTablesInSelectQuery.cpp
+++ b/dbms/src/Parsers/ASTTablesInSelectQuery.cpp
@@ -1,6 +1,6 @@
-#include <DB/Common/typeid_cast.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
+#include <Common/typeid_cast.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTTablesInSelectQuery.h b/dbms/src/Parsers/ASTTablesInSelectQuery.h
similarity index 99%
rename from dbms/include/DB/Parsers/ASTTablesInSelectQuery.h
rename to dbms/src/Parsers/ASTTablesInSelectQuery.h
index 1b69d4a2b6c..872c610cdbe 100644
--- a/dbms/include/DB/Parsers/ASTTablesInSelectQuery.h
+++ b/dbms/src/Parsers/ASTTablesInSelectQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTUseQuery.h b/dbms/src/Parsers/ASTUseQuery.h
similarity index 96%
rename from dbms/include/DB/Parsers/ASTUseQuery.h
rename to dbms/src/Parsers/ASTUseQuery.h
index 1ddb648c30b..fe3881787b5 100644
--- a/dbms/include/DB/Parsers/ASTUseQuery.h
+++ b/dbms/src/Parsers/ASTUseQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTWeightedZooKeeperPath.h b/dbms/src/Parsers/ASTWeightedZooKeeperPath.h
similarity index 93%
rename from dbms/include/DB/Parsers/ASTWeightedZooKeeperPath.h
rename to dbms/src/Parsers/ASTWeightedZooKeeperPath.h
index f15e8f30b8b..fa6b1887d6b 100644
--- a/dbms/include/DB/Parsers/ASTWeightedZooKeeperPath.h
+++ b/dbms/src/Parsers/ASTWeightedZooKeeperPath.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Core/Types.h>
+#include <Parsers/IAST.h>
+#include <Core/Types.h>
 #include <mysqlxx/Manip.h>
 
 
diff --git a/dbms/src/Parsers/ASTWithAlias.cpp b/dbms/src/Parsers/ASTWithAlias.cpp
index 070e9e9a122..2dd6ce70c96 100644
--- a/dbms/src/Parsers/ASTWithAlias.cpp
+++ b/dbms/src/Parsers/ASTWithAlias.cpp
@@ -1,6 +1,6 @@
-#include <DB/Parsers/ASTWithAlias.h>
-#include <DB/IO/WriteBufferFromOStream.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Parsers/ASTWithAlias.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <IO/WriteHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ASTWithAlias.h b/dbms/src/Parsers/ASTWithAlias.h
similarity index 97%
rename from dbms/include/DB/Parsers/ASTWithAlias.h
rename to dbms/src/Parsers/ASTWithAlias.h
index 15780d76be7..e461c302b36 100644
--- a/dbms/include/DB/Parsers/ASTWithAlias.h
+++ b/dbms/src/Parsers/ASTWithAlias.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/CommonParsers.cpp b/dbms/src/Parsers/CommonParsers.cpp
index 2684c5e4470..a7b206fbc9c 100644
--- a/dbms/src/Parsers/CommonParsers.cpp
+++ b/dbms/src/Parsers/CommonParsers.cpp
@@ -1,5 +1,5 @@
-#include <DB/Common/StringUtils.h>
-#include <DB/Parsers/CommonParsers.h>
+#include <Common/StringUtils.h>
+#include <Parsers/CommonParsers.h>
 
 #include <string.h>        /// strncmp, strncasecmp
 
diff --git a/dbms/include/DB/Parsers/CommonParsers.h b/dbms/src/Parsers/CommonParsers.h
similarity index 98%
rename from dbms/include/DB/Parsers/CommonParsers.h
rename to dbms/src/Parsers/CommonParsers.h
index 9e4ba9e0256..0227b66176a 100644
--- a/dbms/include/DB/Parsers/CommonParsers.h
+++ b/dbms/src/Parsers/CommonParsers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
+#include <Parsers/IParserBase.h>
 
 namespace DB
 {
diff --git a/dbms/src/Parsers/ExpressionElementParsers.cpp b/dbms/src/Parsers/ExpressionElementParsers.cpp
index 79bc3007ca4..47752d17db6 100644
--- a/dbms/src/Parsers/ExpressionElementParsers.cpp
+++ b/dbms/src/Parsers/ExpressionElementParsers.cpp
@@ -1,28 +1,28 @@
 #include <errno.h>
 #include <cstdlib>
 
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/ReadBufferFromMemory.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromMemory.h>
 
-#include <DB/Parsers/IAST.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTAsterisk.h>
-#include <DB/Parsers/ASTQualifiedAsterisk.h>
-#include <DB/Parsers/ASTOrderByElement.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTSubquery.h>
-#include <DB/Parsers/ASTWeightedZooKeeperPath.h>
+#include <Parsers/IAST.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTAsterisk.h>
+#include <Parsers/ASTQualifiedAsterisk.h>
+#include <Parsers/ASTOrderByElement.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTWeightedZooKeeperPath.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/ParserCase.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/ParserCase.h>
 
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ParserCreateQuery.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ParserCreateQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ExpressionElementParsers.h b/dbms/src/Parsers/ExpressionElementParsers.h
similarity index 99%
rename from dbms/include/DB/Parsers/ExpressionElementParsers.h
rename to dbms/src/Parsers/ExpressionElementParsers.h
index f82f96334a6..d62d4d76fce 100644
--- a/dbms/include/DB/Parsers/ExpressionElementParsers.h
+++ b/dbms/src/Parsers/ExpressionElementParsers.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
+#include <Parsers/IParserBase.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ExpressionListParsers.cpp b/dbms/src/Parsers/ExpressionListParsers.cpp
index 6da3f02316b..90fc99070a1 100644
--- a/dbms/src/Parsers/ExpressionListParsers.cpp
+++ b/dbms/src/Parsers/ExpressionListParsers.cpp
@@ -1,12 +1,12 @@
-#include <DB/Parsers/IAST.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTFunction.h>
+#include <Parsers/IAST.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
 
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ParserCreateQuery.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserCreateQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ExpressionListParsers.h b/dbms/src/Parsers/ExpressionListParsers.h
similarity index 99%
rename from dbms/include/DB/Parsers/ExpressionListParsers.h
rename to dbms/src/Parsers/ExpressionListParsers.h
index f13cf70c355..8e233df1806 100644
--- a/dbms/include/DB/Parsers/ExpressionListParsers.h
+++ b/dbms/src/Parsers/ExpressionListParsers.h
@@ -2,8 +2,8 @@
 
 #include <list>
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/CommonParsers.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/CommonParsers.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/IAST.cpp b/dbms/src/Parsers/IAST.cpp
index 8fb4509df3c..09fb80e6ff2 100644
--- a/dbms/src/Parsers/IAST.cpp
+++ b/dbms/src/Parsers/IAST.cpp
@@ -1,9 +1,9 @@
-#include <DB/IO/WriteBufferFromOStream.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/Operators.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Parsers/IAST.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
+#include <Common/SipHash.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/IAST.h b/dbms/src/Parsers/IAST.h
similarity index 98%
rename from dbms/include/DB/Parsers/IAST.h
rename to dbms/src/Parsers/IAST.h
index 0c4f6f9c7b2..a56bcf557da 100644
--- a/dbms/include/DB/Parsers/IAST.h
+++ b/dbms/src/Parsers/IAST.h
@@ -4,9 +4,9 @@
 #include <memory>
 #include <ostream>
 
-#include <DB/Core/Types.h>
-#include <DB/Common/Exception.h>
-#include <DB/Parsers/StringRange.h>
+#include <Core/Types.h>
+#include <Common/Exception.h>
+#include <Parsers/StringRange.h>
 
 
 class SipHash;
diff --git a/dbms/include/DB/Parsers/IParser.h b/dbms/src/Parsers/IParser.h
similarity index 96%
rename from dbms/include/DB/Parsers/IParser.h
rename to dbms/src/Parsers/IParser.h
index 095d9f8cc27..ee6cc06b523 100644
--- a/dbms/include/DB/Parsers/IParser.h
+++ b/dbms/src/Parsers/IParser.h
@@ -3,9 +3,9 @@
 #include <list>
 #include <memory>
 
-#include <DB/Core/Defines.h>
-#include <DB/Core/Types.h>
-#include <DB/Parsers/IAST.h>
+#include <Core/Defines.h>
+#include <Core/Types.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/IParserBase.cpp b/dbms/src/Parsers/IParserBase.cpp
index aeb6773c593..7995b29bbd2 100644
--- a/dbms/src/Parsers/IParserBase.cpp
+++ b/dbms/src/Parsers/IParserBase.cpp
@@ -1,4 +1,4 @@
-#include <DB/Parsers/IParserBase.h>
+#include <Parsers/IParserBase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/IParserBase.h b/dbms/src/Parsers/IParserBase.h
similarity index 92%
rename from dbms/include/DB/Parsers/IParserBase.h
rename to dbms/src/Parsers/IParserBase.h
index 3167ee6632c..45c103ef925 100644
--- a/dbms/include/DB/Parsers/IParserBase.h
+++ b/dbms/src/Parsers/IParserBase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParser.h>
+#include <Parsers/IParser.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserAlterQuery.cpp b/dbms/src/Parsers/ParserAlterQuery.cpp
index 6b1bd6437fb..eb472f9b022 100644
--- a/dbms/src/Parsers/ParserAlterQuery.cpp
+++ b/dbms/src/Parsers/ParserAlterQuery.cpp
@@ -1,11 +1,11 @@
-#include <DB/Parsers/ParserAlterQuery.h>
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ASTAlterQuery.h>
-#include <DB/Parsers/ASTLiteral.h>
+#include <Parsers/ParserAlterQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ASTAlterQuery.h>
+#include <Parsers/ASTLiteral.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Parsers/ParserAlterQuery.h b/dbms/src/Parsers/ParserAlterQuery.h
similarity index 90%
rename from dbms/include/DB/Parsers/ParserAlterQuery.h
rename to dbms/src/Parsers/ParserAlterQuery.h
index 14ad55d1204..86bc2ccf0f4 100644
--- a/dbms/include/DB/Parsers/ParserAlterQuery.h
+++ b/dbms/src/Parsers/ParserAlterQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ExpressionElementParsers.h>
 
 namespace DB
 {
diff --git a/dbms/src/Parsers/ParserCase.cpp b/dbms/src/Parsers/ParserCase.cpp
index 8dbd649e5f9..b86f6f22ea2 100644
--- a/dbms/src/Parsers/ParserCase.cpp
+++ b/dbms/src/Parsers/ParserCase.cpp
@@ -1,9 +1,9 @@
-#include <DB/Parsers/ParserCase.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Core/Field.h>
+#include <Parsers/ParserCase.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Core/Field.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Parsers/ParserCase.h b/dbms/src/Parsers/ParserCase.h
similarity index 91%
rename from dbms/include/DB/Parsers/ParserCase.h
rename to dbms/src/Parsers/ParserCase.h
index db1d79e2686..fb5272f9beb 100644
--- a/dbms/include/DB/Parsers/ParserCase.h
+++ b/dbms/src/Parsers/ParserCase.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/ParserQueryWithOutput.h>
+#include <Parsers/ParserQueryWithOutput.h>
 
 namespace DB
 {
diff --git a/dbms/src/Parsers/ParserCheckQuery.cpp b/dbms/src/Parsers/ParserCheckQuery.cpp
index 4cc17a8d7f9..e89c51d0efa 100644
--- a/dbms/src/Parsers/ParserCheckQuery.cpp
+++ b/dbms/src/Parsers/ParserCheckQuery.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/ParserCheckQuery.h>
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ASTCheckQuery.h>
+#include <Parsers/ParserCheckQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ASTCheckQuery.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserCheckQuery.h b/dbms/src/Parsers/ParserCheckQuery.h
similarity index 87%
rename from dbms/include/DB/Parsers/ParserCheckQuery.h
rename to dbms/src/Parsers/ParserCheckQuery.h
index 03e8976d751..859f486d568 100644
--- a/dbms/include/DB/Parsers/ParserCheckQuery.h
+++ b/dbms/src/Parsers/ParserCheckQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/ParserQueryWithOutput.h>
+#include <Parsers/ParserQueryWithOutput.h>
 
 namespace DB
 {
diff --git a/dbms/src/Parsers/ParserCreateQuery.cpp b/dbms/src/Parsers/ParserCreateQuery.cpp
index b2f60b35291..53b1fc2ef68 100644
--- a/dbms/src/Parsers/ParserCreateQuery.cpp
+++ b/dbms/src/Parsers/ParserCreateQuery.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/ParserSelectQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserCreateQuery.h b/dbms/src/Parsers/ParserCreateQuery.h
similarity index 95%
rename from dbms/include/DB/Parsers/ParserCreateQuery.h
rename to dbms/src/Parsers/ParserCreateQuery.h
index 9a89dbe5b6e..2b0e127f60b 100644
--- a/dbms/include/DB/Parsers/ParserCreateQuery.h
+++ b/dbms/src/Parsers/ParserCreateQuery.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ASTNameTypePair.h>
-#include <DB/Parsers/ASTColumnDeclaration.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Common/typeid_cast.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ASTNameTypePair.h>
+#include <Parsers/ASTColumnDeclaration.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/CommonParsers.h>
+#include <Common/typeid_cast.h>
 #include <Poco/String.h>
 
 
diff --git a/dbms/src/Parsers/ParserDropQuery.cpp b/dbms/src/Parsers/ParserDropQuery.cpp
index 822a3ee354d..9325e82aaec 100644
--- a/dbms/src/Parsers/ParserDropQuery.cpp
+++ b/dbms/src/Parsers/ParserDropQuery.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTDropQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTDropQuery.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ParserDropQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ParserDropQuery.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserDropQuery.h b/dbms/src/Parsers/ParserDropQuery.h
similarity index 82%
rename from dbms/include/DB/Parsers/ParserDropQuery.h
rename to dbms/src/Parsers/ParserDropQuery.h
index efe2f02a814..a75c53eb253 100644
--- a/dbms/include/DB/Parsers/ParserDropQuery.h
+++ b/dbms/src/Parsers/ParserDropQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ExpressionElementParsers.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserEnumElement.cpp b/dbms/src/Parsers/ParserEnumElement.cpp
index b874bbb59da..833aac357a0 100644
--- a/dbms/src/Parsers/ParserEnumElement.cpp
+++ b/dbms/src/Parsers/ParserEnumElement.cpp
@@ -1,7 +1,7 @@
-#include <DB/Parsers/ParserEnumElement.h>
+#include <Parsers/ParserEnumElement.h>
 
-#include <DB/Parsers/ASTEnumElement.h>
-#include <DB/Parsers/CommonParsers.h>
+#include <Parsers/ASTEnumElement.h>
+#include <Parsers/CommonParsers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserEnumElement.h b/dbms/src/Parsers/ParserEnumElement.h
similarity index 80%
rename from dbms/include/DB/Parsers/ParserEnumElement.h
rename to dbms/src/Parsers/ParserEnumElement.h
index 974a1eaf967..4698d24734c 100644
--- a/dbms/include/DB/Parsers/ParserEnumElement.h
+++ b/dbms/src/Parsers/ParserEnumElement.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ExpressionElementParsers.h>
 
 namespace DB
 {
diff --git a/dbms/src/Parsers/ParserInsertQuery.cpp b/dbms/src/Parsers/ParserInsertQuery.cpp
index a38a6e807ca..77cc3165842 100644
--- a/dbms/src/Parsers/ParserInsertQuery.cpp
+++ b/dbms/src/Parsers/ParserInsertQuery.cpp
@@ -1,15 +1,15 @@
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTInsertQuery.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/ParserInsertQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/ParserInsertQuery.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserInsertQuery.h b/dbms/src/Parsers/ParserInsertQuery.h
similarity index 96%
rename from dbms/include/DB/Parsers/ParserInsertQuery.h
rename to dbms/src/Parsers/ParserInsertQuery.h
index 1fb3f84ef5f..8b91b57a396 100644
--- a/dbms/include/DB/Parsers/ParserInsertQuery.h
+++ b/dbms/src/Parsers/ParserInsertQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
+#include <Parsers/IParserBase.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserKillQueryQuery.cpp b/dbms/src/Parsers/ParserKillQueryQuery.cpp
index 019a7e5f66a..119bdd30fd3 100644
--- a/dbms/src/Parsers/ParserKillQueryQuery.cpp
+++ b/dbms/src/Parsers/ParserKillQueryQuery.cpp
@@ -1,16 +1,16 @@
-#include <DB/Parsers/ParserKillQueryQuery.h>
-#include <DB/Parsers/ASTKillQueryQuery.h>
+#include <Parsers/ParserKillQueryQuery.h>
+#include <Parsers/ASTKillQueryQuery.h>
 
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ExpressionListParsers.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Parsers/ParserKillQueryQuery.h b/dbms/src/Parsers/ParserKillQueryQuery.h
similarity index 91%
rename from dbms/include/DB/Parsers/ParserKillQueryQuery.h
rename to dbms/src/Parsers/ParserKillQueryQuery.h
index cbba144695d..2fb8fd2f29e 100644
--- a/dbms/include/DB/Parsers/ParserKillQueryQuery.h
+++ b/dbms/src/Parsers/ParserKillQueryQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
+#include <Parsers/IParserBase.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserOptimizeQuery.cpp b/dbms/src/Parsers/ParserOptimizeQuery.cpp
index ab6ac9ccf75..1c1a5fc205b 100644
--- a/dbms/src/Parsers/ParserOptimizeQuery.cpp
+++ b/dbms/src/Parsers/ParserOptimizeQuery.cpp
@@ -1,11 +1,11 @@
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTOptimizeQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTOptimizeQuery.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ParserOptimizeQuery.h>
-#include <DB/Parsers/ASTLiteral.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ParserOptimizeQuery.h>
+#include <Parsers/ASTLiteral.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserOptimizeQuery.h b/dbms/src/Parsers/ParserOptimizeQuery.h
similarity index 79%
rename from dbms/include/DB/Parsers/ParserOptimizeQuery.h
rename to dbms/src/Parsers/ParserOptimizeQuery.h
index e8d4da0611d..2a9a25d728b 100644
--- a/dbms/include/DB/Parsers/ParserOptimizeQuery.h
+++ b/dbms/src/Parsers/ParserOptimizeQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ExpressionElementParsers.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserQuery.cpp b/dbms/src/Parsers/ParserQuery.cpp
index 3894bfb7733..cfcb512d267 100644
--- a/dbms/src/Parsers/ParserQuery.cpp
+++ b/dbms/src/Parsers/ParserQuery.cpp
@@ -1,14 +1,14 @@
-#include <DB/Parsers/ParserQuery.h>
-#include <DB/Parsers/ParserQueryWithOutput.h>
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/ParserInsertQuery.h>
-#include <DB/Parsers/ParserDropQuery.h>
-#include <DB/Parsers/ParserRenameQuery.h>
-#include <DB/Parsers/ParserOptimizeQuery.h>
-#include <DB/Parsers/ParserUseQuery.h>
-#include <DB/Parsers/ParserSetQuery.h>
-#include <DB/Parsers/ParserAlterQuery.h>
-//#include <DB/Parsers/ParserMultiQuery.h>
+#include <Parsers/ParserQuery.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/ParserInsertQuery.h>
+#include <Parsers/ParserDropQuery.h>
+#include <Parsers/ParserRenameQuery.h>
+#include <Parsers/ParserOptimizeQuery.h>
+#include <Parsers/ParserUseQuery.h>
+#include <Parsers/ParserSetQuery.h>
+#include <Parsers/ParserAlterQuery.h>
+//#include <Parsers/ParserMultiQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserQuery.h b/dbms/src/Parsers/ParserQuery.h
similarity index 87%
rename from dbms/include/DB/Parsers/ParserQuery.h
rename to dbms/src/Parsers/ParserQuery.h
index bebecf2d5fb..9700d654207 100644
--- a/dbms/include/DB/Parsers/ParserQuery.h
+++ b/dbms/src/Parsers/ParserQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
+#include <Parsers/IParserBase.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserQueryWithOutput.cpp b/dbms/src/Parsers/ParserQueryWithOutput.cpp
index 3241f4526dc..dd576049249 100644
--- a/dbms/src/Parsers/ParserQueryWithOutput.cpp
+++ b/dbms/src/Parsers/ParserQueryWithOutput.cpp
@@ -1,13 +1,13 @@
-#include <DB/Parsers/ParserQueryWithOutput.h>
-#include <DB/Parsers/ParserShowTablesQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/ParserTablePropertiesQuery.h>
-#include <DB/Parsers/ParserShowProcesslistQuery.h>
-#include <DB/Parsers/ParserCheckQuery.h>
-#include <DB/Parsers/ParserKillQueryQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Common/typeid_cast.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/ParserShowTablesQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/ParserTablePropertiesQuery.h>
+#include <Parsers/ParserShowProcesslistQuery.h>
+#include <Parsers/ParserCheckQuery.h>
+#include <Parsers/ParserKillQueryQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserQueryWithOutput.h b/dbms/src/Parsers/ParserQueryWithOutput.h
similarity index 77%
rename from dbms/include/DB/Parsers/ParserQueryWithOutput.h
rename to dbms/src/Parsers/ParserQueryWithOutput.h
index f41f94965c6..fdd1c6eba68 100644
--- a/dbms/include/DB/Parsers/ParserQueryWithOutput.h
+++ b/dbms/src/Parsers/ParserQueryWithOutput.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ASTQueryWithOutput.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ASTQueryWithOutput.h>
 
 namespace DB
 {
diff --git a/dbms/src/Parsers/ParserRenameQuery.cpp b/dbms/src/Parsers/ParserRenameQuery.cpp
index 95099a7859d..7bdeb919818 100644
--- a/dbms/src/Parsers/ParserRenameQuery.cpp
+++ b/dbms/src/Parsers/ParserRenameQuery.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTRenameQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTRenameQuery.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ParserRenameQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ParserRenameQuery.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserRenameQuery.h b/dbms/src/Parsers/ParserRenameQuery.h
similarity index 84%
rename from dbms/include/DB/Parsers/ParserRenameQuery.h
rename to dbms/src/Parsers/ParserRenameQuery.h
index a4cd9ff1d9e..af0918baf51 100644
--- a/dbms/include/DB/Parsers/ParserRenameQuery.h
+++ b/dbms/src/Parsers/ParserRenameQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ExpressionElementParsers.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserSampleRatio.cpp b/dbms/src/Parsers/ParserSampleRatio.cpp
index 7dc98784292..caa8842c916 100644
--- a/dbms/src/Parsers/ParserSampleRatio.cpp
+++ b/dbms/src/Parsers/ParserSampleRatio.cpp
@@ -1,9 +1,9 @@
 #include <common/exp10.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ParserSampleRatio.h>
-#include <DB/Parsers/ASTSampleRatio.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ParserSampleRatio.h>
+#include <Parsers/ASTSampleRatio.h>
+#include <IO/ReadHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserSampleRatio.h b/dbms/src/Parsers/ParserSampleRatio.h
similarity index 92%
rename from dbms/include/DB/Parsers/ParserSampleRatio.h
rename to dbms/src/Parsers/ParserSampleRatio.h
index 5a889bf7ed7..6c05972cc2a 100644
--- a/dbms/include/DB/Parsers/ParserSampleRatio.h
+++ b/dbms/src/Parsers/ParserSampleRatio.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
+#include <Parsers/IParserBase.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserSelectQuery.cpp b/dbms/src/Parsers/ParserSelectQuery.cpp
index 2a7afa71c4b..e41fcdfc51a 100644
--- a/dbms/src/Parsers/ParserSelectQuery.cpp
+++ b/dbms/src/Parsers/ParserSelectQuery.cpp
@@ -1,14 +1,14 @@
 #include <memory>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ParserSetQuery.h>
-#include <DB/Parsers/ParserSampleRatio.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/ParserTablesInSelectQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserSetQuery.h>
+#include <Parsers/ParserSampleRatio.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/ParserTablesInSelectQuery.h>
 
 #include <iostream>
 
diff --git a/dbms/include/DB/Parsers/ParserSelectQuery.h b/dbms/src/Parsers/ParserSelectQuery.h
similarity index 85%
rename from dbms/include/DB/Parsers/ParserSelectQuery.h
rename to dbms/src/Parsers/ParserSelectQuery.h
index c985fab7466..e4da94dd04d 100644
--- a/dbms/include/DB/Parsers/ParserSelectQuery.h
+++ b/dbms/src/Parsers/ParserSelectQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/ParserQueryWithOutput.h>
+#include <Parsers/ParserQueryWithOutput.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserSetQuery.cpp b/dbms/src/Parsers/ParserSetQuery.cpp
index d2874aca634..9738ed1074a 100644
--- a/dbms/src/Parsers/ParserSetQuery.cpp
+++ b/dbms/src/Parsers/ParserSetQuery.cpp
@@ -1,11 +1,11 @@
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTSetQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTSetQuery.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ParserSetQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ParserSetQuery.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserSetQuery.h b/dbms/src/Parsers/ParserSetQuery.h
similarity index 87%
rename from dbms/include/DB/Parsers/ParserSetQuery.h
rename to dbms/src/Parsers/ParserSetQuery.h
index 02ac2df7d80..608c99c443b 100644
--- a/dbms/include/DB/Parsers/ParserSetQuery.h
+++ b/dbms/src/Parsers/ParserSetQuery.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ExpressionElementParsers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserShowProcesslistQuery.h b/dbms/src/Parsers/ParserShowProcesslistQuery.h
similarity index 81%
rename from dbms/include/DB/Parsers/ParserShowProcesslistQuery.h
rename to dbms/src/Parsers/ParserShowProcesslistQuery.h
index 2ee6fe62b12..79c80804eed 100644
--- a/dbms/include/DB/Parsers/ParserShowProcesslistQuery.h
+++ b/dbms/src/Parsers/ParserShowProcesslistQuery.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/ParserQueryWithOutput.h>
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ASTShowProcesslistQuery.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ASTShowProcesslistQuery.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserShowTablesQuery.cpp b/dbms/src/Parsers/ParserShowTablesQuery.cpp
index 03313a4d9ab..bcb42067aab 100644
--- a/dbms/src/Parsers/ParserShowTablesQuery.cpp
+++ b/dbms/src/Parsers/ParserShowTablesQuery.cpp
@@ -1,12 +1,12 @@
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTShowTablesQuery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTShowTablesQuery.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ParserShowTablesQuery.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ParserShowTablesQuery.h>
+#include <Parsers/ExpressionElementParsers.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserShowTablesQuery.h b/dbms/src/Parsers/ParserShowTablesQuery.h
similarity index 89%
rename from dbms/include/DB/Parsers/ParserShowTablesQuery.h
rename to dbms/src/Parsers/ParserShowTablesQuery.h
index cc49722ab7f..3b1e9ee91b4 100644
--- a/dbms/include/DB/Parsers/ParserShowTablesQuery.h
+++ b/dbms/src/Parsers/ParserShowTablesQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/ParserQueryWithOutput.h>
+#include <Parsers/ParserQueryWithOutput.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserTablePropertiesQuery.cpp b/dbms/src/Parsers/ParserTablePropertiesQuery.cpp
index 93cfea2858f..38ec7b73328 100644
--- a/dbms/src/Parsers/ParserTablePropertiesQuery.cpp
+++ b/dbms/src/Parsers/ParserTablePropertiesQuery.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/TablePropertiesQueriesASTs.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/TablePropertiesQueriesASTs.h>
 
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ParserTablePropertiesQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ParserTablePropertiesQuery.h>
 
-#include <DB/Common/typeid_cast.h>
+#include <Common/typeid_cast.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserTablePropertiesQuery.h b/dbms/src/Parsers/ParserTablePropertiesQuery.h
similarity index 74%
rename from dbms/include/DB/Parsers/ParserTablePropertiesQuery.h
rename to dbms/src/Parsers/ParserTablePropertiesQuery.h
index fd3e64bc686..3bd8d22dbdd 100644
--- a/dbms/include/DB/Parsers/ParserTablePropertiesQuery.h
+++ b/dbms/src/Parsers/ParserTablePropertiesQuery.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
-#include <DB/Parsers/ParserQueryWithOutput.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
+#include <Parsers/IParserBase.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/ExpressionElementParsers.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserTablesInSelectQuery.cpp b/dbms/src/Parsers/ParserTablesInSelectQuery.cpp
index 160c5e8d981..e826f0e94eb 100644
--- a/dbms/src/Parsers/ParserTablesInSelectQuery.cpp
+++ b/dbms/src/Parsers/ParserTablesInSelectQuery.cpp
@@ -1,12 +1,12 @@
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/ParserSampleRatio.h>
-#include <DB/Parsers/ParserTablesInSelectQuery.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/ParserSampleRatio.h>
+#include <Parsers/ParserTablesInSelectQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserTablesInSelectQuery.h b/dbms/src/Parsers/ParserTablesInSelectQuery.h
similarity index 97%
rename from dbms/include/DB/Parsers/ParserTablesInSelectQuery.h
rename to dbms/src/Parsers/ParserTablesInSelectQuery.h
index 7661b51f46a..d7874bd2188 100644
--- a/dbms/include/DB/Parsers/ParserTablesInSelectQuery.h
+++ b/dbms/src/Parsers/ParserTablesInSelectQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
+#include <Parsers/IParserBase.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/ParserUseQuery.cpp b/dbms/src/Parsers/ParserUseQuery.cpp
index 27fd42e92aa..980d4ca0f51 100644
--- a/dbms/src/Parsers/ParserUseQuery.cpp
+++ b/dbms/src/Parsers/ParserUseQuery.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/ParserUseQuery.h>
+#include <Parsers/ParserUseQuery.h>
 
-#include <DB/Common/typeid_cast.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ExpressionElementParsers.h>
-#include <DB/Parsers/CommonParsers.h>
-#include <DB/Parsers/ASTUseQuery.h>
+#include <Common/typeid_cast.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/CommonParsers.h>
+#include <Parsers/ASTUseQuery.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/ParserUseQuery.h b/dbms/src/Parsers/ParserUseQuery.h
similarity index 88%
rename from dbms/include/DB/Parsers/ParserUseQuery.h
rename to dbms/src/Parsers/ParserUseQuery.h
index 56f97ff95b0..29d24227f18 100644
--- a/dbms/include/DB/Parsers/ParserUseQuery.h
+++ b/dbms/src/Parsers/ParserUseQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParserBase.h>
+#include <Parsers/IParserBase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/StringRange.h b/dbms/src/Parsers/StringRange.h
similarity index 90%
rename from dbms/include/DB/Parsers/StringRange.h
rename to dbms/src/Parsers/StringRange.h
index 25b2f3c5081..1051a43a91e 100644
--- a/dbms/include/DB/Parsers/StringRange.h
+++ b/dbms/src/Parsers/StringRange.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 #include <map>
 #include <memory>
 
diff --git a/dbms/include/DB/Parsers/TablePropertiesQueriesASTs.h b/dbms/src/Parsers/TablePropertiesQueriesASTs.h
similarity index 85%
rename from dbms/include/DB/Parsers/TablePropertiesQueriesASTs.h
rename to dbms/src/Parsers/TablePropertiesQueriesASTs.h
index 793ee655b7d..883d7b9e1e2 100644
--- a/dbms/include/DB/Parsers/TablePropertiesQueriesASTs.h
+++ b/dbms/src/Parsers/TablePropertiesQueriesASTs.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/ASTQueryWithTableAndOutput.h>
+#include <Parsers/ASTQueryWithTableAndOutput.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/formatAST.cpp b/dbms/src/Parsers/formatAST.cpp
index 75e7971f1ed..83f01f310d5 100644
--- a/dbms/src/Parsers/formatAST.cpp
+++ b/dbms/src/Parsers/formatAST.cpp
@@ -1,4 +1,4 @@
-#include <DB/Parsers/formatAST.h>
+#include <Parsers/formatAST.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/formatAST.h b/dbms/src/Parsers/formatAST.h
similarity index 92%
rename from dbms/include/DB/Parsers/formatAST.h
rename to dbms/src/Parsers/formatAST.h
index d1ce3c8d4f1..0482fedfa7d 100644
--- a/dbms/include/DB/Parsers/formatAST.h
+++ b/dbms/src/Parsers/formatAST.h
@@ -2,8 +2,8 @@
 
 #include <ostream>
 
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Parsers/IAST.h>
+#include <Core/NamesAndTypes.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/parseQuery.cpp b/dbms/src/Parsers/parseQuery.cpp
index 3f9396ac2af..ef34fbfbb60 100644
--- a/dbms/src/Parsers/parseQuery.cpp
+++ b/dbms/src/Parsers/parseQuery.cpp
@@ -1,10 +1,10 @@
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ParserQuery.h>
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Common/typeid_cast.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/Operators.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ParserQuery.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Common/StringUtils.h>
+#include <Common/typeid_cast.h>
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/parseQuery.h b/dbms/src/Parsers/parseQuery.h
similarity index 97%
rename from dbms/include/DB/Parsers/parseQuery.h
rename to dbms/src/Parsers/parseQuery.h
index 770521ca4bd..3a646a75cf6 100644
--- a/dbms/include/DB/Parsers/parseQuery.h
+++ b/dbms/src/Parsers/parseQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IParser.h>
+#include <Parsers/IParser.h>
 
 
 namespace DB
diff --git a/dbms/src/Parsers/queryToString.cpp b/dbms/src/Parsers/queryToString.cpp
index 16ff5c699a0..4cfc9ee3bae 100644
--- a/dbms/src/Parsers/queryToString.cpp
+++ b/dbms/src/Parsers/queryToString.cpp
@@ -1,5 +1,5 @@
-#include <DB/Parsers/queryToString.h>
-#include <DB/Parsers/formatAST.h>
+#include <Parsers/queryToString.h>
+#include <Parsers/formatAST.h>
 #include <sstream>
 
 namespace DB
diff --git a/dbms/include/DB/Parsers/queryToString.h b/dbms/src/Parsers/queryToString.h
similarity index 73%
rename from dbms/include/DB/Parsers/queryToString.h
rename to dbms/src/Parsers/queryToString.h
index 4c79c1c1548..b2ae10d281b 100644
--- a/dbms/include/DB/Parsers/queryToString.h
+++ b/dbms/src/Parsers/queryToString.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 namespace DB
 {
diff --git a/dbms/src/Parsers/tests/create_parser.cpp b/dbms/src/Parsers/tests/create_parser.cpp
index 1ea8a475911..8a126eb9086 100644
--- a/dbms/src/Parsers/tests/create_parser.cpp
+++ b/dbms/src/Parsers/tests/create_parser.cpp
@@ -1,9 +1,9 @@
 #include <iostream>
 
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/ParserCreateQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Parsers/tests/select_parser.cpp b/dbms/src/Parsers/tests/select_parser.cpp
index 1fac71f49c6..eda030ca2ed 100644
--- a/dbms/src/Parsers/tests/select_parser.cpp
+++ b/dbms/src/Parsers/tests/select_parser.cpp
@@ -1,9 +1,9 @@
 #include <iostream>
 
-#include <DB/Parsers/ParserQueryWithOutput.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/parseQuery.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Server/ConfigReloader.cpp b/dbms/src/Server/ConfigReloader.cpp
index c3968ed162b..09115a3bd8c 100644
--- a/dbms/src/Server/ConfigReloader.cpp
+++ b/dbms/src/Server/ConfigReloader.cpp
@@ -5,9 +5,9 @@
 
 #include <common/logger_useful.h>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/ConfigProcessor.h>
+#include <Interpreters/Context.h>
+#include <Common/setThreadName.h>
+#include <Common/ConfigProcessor.h>
 
 
 namespace DB
diff --git a/dbms/src/Server/ConfigReloader.h b/dbms/src/Server/ConfigReloader.h
index 16b4ef7968c..158373e6115 100644
--- a/dbms/src/Server/ConfigReloader.h
+++ b/dbms/src/Server/ConfigReloader.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/ConfigProcessor.h>
+#include <Common/ConfigProcessor.h>
 #include <zkutil/Common.h>
 #include <zkutil/ZooKeeperNodeCache.h>
 
diff --git a/dbms/src/Server/ExtractFromConfig.cpp b/dbms/src/Server/ExtractFromConfig.cpp
index 44f9922c807..1f033696b81 100644
--- a/dbms/src/Server/ExtractFromConfig.cpp
+++ b/dbms/src/Server/ExtractFromConfig.cpp
@@ -4,8 +4,8 @@
 #include <Poco/Util/XMLConfiguration.h>
 
 #include <zkutil/ZooKeeperNodeCache.h>
-#include <DB/Common/ConfigProcessor.h>
-#include <DB/Common/Exception.h>
+#include <Common/ConfigProcessor.h>
+#include <Common/Exception.h>
 
 
 static std::string extractFromConfig(
diff --git a/dbms/src/Server/HTTPHandler.cpp b/dbms/src/Server/HTTPHandler.cpp
index d86ca8cb424..8ddcda34928 100644
--- a/dbms/src/Server/HTTPHandler.cpp
+++ b/dbms/src/Server/HTTPHandler.cpp
@@ -3,30 +3,30 @@
 #include <Poco/Net/HTTPBasicCredentials.h>
 #include <Poco/File.h>
 
-#include <DB/Common/ExternalTable.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Common/escapeForFileName.h>
+#include <Common/ExternalTable.h>
+#include <Common/StringUtils.h>
+#include <Common/escapeForFileName.h>
 
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/ZlibInflatingReadBuffer.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/ConcatReadBuffer.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteBufferFromHTTPServerResponse.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/copyData.h>
-#include <DB/IO/ConcatReadBuffer.h>
-#include <DB/IO/CascadeWriteBuffer.h>
-#include <DB/IO/MemoryReadWriteBuffer.h>
-#include <DB/IO/WriteBufferFromTemporaryFile.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/ZlibInflatingReadBuffer.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ConcatReadBuffer.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteBufferFromHTTPServerResponse.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteHelpers.h>
+#include <IO/copyData.h>
+#include <IO/ConcatReadBuffer.h>
+#include <IO/CascadeWriteBuffer.h>
+#include <IO/MemoryReadWriteBuffer.h>
+#include <IO/WriteBufferFromTemporaryFile.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/Interpreters/Quota.h>
+#include <Interpreters/executeQuery.h>
+#include <Interpreters/Quota.h>
 
 #include "HTTPHandler.h"
 
diff --git a/dbms/src/Server/HTTPHandler.h b/dbms/src/Server/HTTPHandler.h
index a5922604573..3474a6393b6 100644
--- a/dbms/src/Server/HTTPHandler.h
+++ b/dbms/src/Server/HTTPHandler.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/CurrentMetrics.h>
 #include "Server.h"
 
 
diff --git a/dbms/src/Server/InterserverIOHTTPHandler.cpp b/dbms/src/Server/InterserverIOHTTPHandler.cpp
index fed4a362e85..d45431467da 100644
--- a/dbms/src/Server/InterserverIOHTTPHandler.cpp
+++ b/dbms/src/Server/InterserverIOHTTPHandler.cpp
@@ -1,8 +1,8 @@
 #include "InterserverIOHTTPHandler.h"
-#include <DB/Interpreters/InterserverIOHandler.h>
-#include <DB/IO/WriteBufferFromHTTPServerResponse.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/ReadBufferFromIStream.h>
+#include <Interpreters/InterserverIOHandler.h>
+#include <IO/WriteBufferFromHTTPServerResponse.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/ReadBufferFromIStream.h>
 
 
 namespace DB
diff --git a/dbms/src/Server/InterserverIOHTTPHandler.h b/dbms/src/Server/InterserverIOHTTPHandler.h
index 4e7d4973a8b..b1a7d4585d7 100644
--- a/dbms/src/Server/InterserverIOHTTPHandler.h
+++ b/dbms/src/Server/InterserverIOHTTPHandler.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Server.h"
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/CurrentMetrics.h>
 
 
 namespace CurrentMetrics
diff --git a/dbms/src/Server/LocalServer.cpp b/dbms/src/Server/LocalServer.cpp
index dd30d342c38..ee41ed0bd29 100644
--- a/dbms/src/Server/LocalServer.cpp
+++ b/dbms/src/Server/LocalServer.cpp
@@ -4,20 +4,20 @@
 #include <Poco/Util/HelpFormatter.h>
 #include <Poco/Util/OptionCallback.h>
 #include <Poco/String.h>
-#include <DB/Databases/DatabaseOrdinary.h>
-#include <DB/Storages/System/attachSystemTables.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/ProcessList.h>
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/Interpreters/loadMetadata.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/Macros.h>
-#include <DB/Common/ConfigProcessor.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/IAST.h>
+#include <Databases/DatabaseOrdinary.h>
+#include <Storages/System/attachSystemTables.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ProcessList.h>
+#include <Interpreters/executeQuery.h>
+#include <Interpreters/loadMetadata.h>
+#include <Common/Exception.h>
+#include <Common/Macros.h>
+#include <Common/ConfigProcessor.h>
+#include <Common/escapeForFileName.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/IAST.h>
 #include <common/ErrorHandlers.h>
 #include <common/ApplicationServerExt.h>
 #include "StatusFile.h"
diff --git a/dbms/src/Server/MetricsTransmitter.cpp b/dbms/src/Server/MetricsTransmitter.cpp
index c3a96f98a9e..8b65fc72f1c 100644
--- a/dbms/src/Server/MetricsTransmitter.cpp
+++ b/dbms/src/Server/MetricsTransmitter.cpp
@@ -3,10 +3,10 @@
 #include <Poco/Util/Application.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <daemon/BaseDaemon.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Interpreters/AsynchronousMetrics.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/Exception.h>
+#include <Common/setThreadName.h>
+#include <Interpreters/AsynchronousMetrics.h>
 
 namespace DB
 {
diff --git a/dbms/src/Server/MetricsTransmitter.h b/dbms/src/Server/MetricsTransmitter.h
index 18a42705453..4bee6ad0c7d 100644
--- a/dbms/src/Server/MetricsTransmitter.h
+++ b/dbms/src/Server/MetricsTransmitter.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <thread>
 #include <vector>
-#include <DB/Common/ProfileEvents.h>
+#include <Common/ProfileEvents.h>
 
 
 namespace DB
diff --git a/dbms/src/Server/ReplicasStatusHandler.cpp b/dbms/src/Server/ReplicasStatusHandler.cpp
index ba3f40c26b7..89dcd31f44f 100644
--- a/dbms/src/Server/ReplicasStatusHandler.cpp
+++ b/dbms/src/Server/ReplicasStatusHandler.cpp
@@ -1,10 +1,10 @@
 #include "ReplicasStatusHandler.h"
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Common/HTMLForm.h>
-#include <DB/Databases/IDatabase.h>
-#include <DB/IO/HTTPCommon.h>
+#include <Interpreters/Context.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Common/HTMLForm.h>
+#include <Databases/IDatabase.h>
+#include <IO/HTTPCommon.h>
 
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
diff --git a/dbms/src/Server/Server.cpp b/dbms/src/Server/Server.cpp
index def22dd373d..76f7d197683 100644
--- a/dbms/src/Server/Server.cpp
+++ b/dbms/src/Server/Server.cpp
@@ -12,18 +12,18 @@
 #include <ext/scope_guard.hpp>
 #include <zkutil/ZooKeeper.h>
 #include <zkutil/ZooKeeperNodeCache.h>
-#include <DB/Common/Macros.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Common/getFQDNOrHostName.h>
-#include <DB/Common/getMultipleKeysFromConfig.h>
-#include <DB/Databases/DatabaseOrdinary.h>
-#include <DB/IO/HTTPCommon.h>
-#include <DB/Interpreters/AsynchronousMetrics.h>
-#include <DB/Interpreters/ProcessList.h>
-#include <DB/Interpreters/loadMetadata.h>
-#include <DB/Storages/MergeTree/ReshardingWorker.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Storages/System/attachSystemTables.h>
+#include <Common/Macros.h>
+#include <Common/StringUtils.h>
+#include <Common/getFQDNOrHostName.h>
+#include <Common/getMultipleKeysFromConfig.h>
+#include <Databases/DatabaseOrdinary.h>
+#include <IO/HTTPCommon.h>
+#include <Interpreters/AsynchronousMetrics.h>
+#include <Interpreters/ProcessList.h>
+#include <Interpreters/loadMetadata.h>
+#include <Storages/MergeTree/ReshardingWorker.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/System/attachSystemTables.h>
 #include "ConfigReloader.h"
 #include "HTTPHandler.h"
 #include "InterserverIOHTTPHandler.h"
@@ -32,7 +32,7 @@
 #include "StatusFile.h"
 #include "TCPHandler.h"
 
-#include <DB/Common/config.h>
+#include <Common/config.h>
 #if Poco_NetSSL_FOUND
 #include <Poco/Net/Context.h>
 #include <Poco/Net/SecureServerSocket.h>
diff --git a/dbms/src/Server/Server.h b/dbms/src/Server/Server.h
index 37ca26358c9..68c3c0e3b49 100644
--- a/dbms/src/Server/Server.h
+++ b/dbms/src/Server/Server.h
@@ -19,9 +19,9 @@
 
 #include <common/logger_useful.h>
 #include <daemon/BaseDaemon.h>
-#include <DB/Common/HTMLForm.h>
+#include <Common/HTMLForm.h>
 
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/Context.h>
 
 /** Server provides three interfaces:
   * 1. HTTP - simple interface for any applications.
diff --git a/dbms/src/Server/StatusFile.cpp b/dbms/src/Server/StatusFile.cpp
index b8c126262c9..db11e8d7c98 100644
--- a/dbms/src/Server/StatusFile.cpp
+++ b/dbms/src/Server/StatusFile.cpp
@@ -7,13 +7,13 @@
 
 #include <Poco/File.h>
 #include <common/logger_useful.h>
-#include <DB/Common/ClickHouseRevision.h>
+#include <Common/ClickHouseRevision.h>
 #include <common/LocalDateTime.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/LimitReadBuffer.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/Operators.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/LimitReadBuffer.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/Operators.h>
 
 
 namespace DB
diff --git a/dbms/src/Server/TCPHandler.cpp b/dbms/src/Server/TCPHandler.cpp
index d3e62036e4f..6af14755269 100644
--- a/dbms/src/Server/TCPHandler.cpp
+++ b/dbms/src/Server/TCPHandler.cpp
@@ -2,32 +2,32 @@
 
 #include <Poco/Net/NetException.h>
 
-#include <DB/Common/ClickHouseRevision.h>
+#include <Common/ClickHouseRevision.h>
 
-#include <DB/Common/Stopwatch.h>
+#include <Common/Stopwatch.h>
 
-#include <DB/Core/Progress.h>
+#include <Core/Progress.h>
 
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/ReadBufferFromPocoSocket.h>
-#include <DB/IO/WriteBufferFromPocoSocket.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/ReadBufferFromPocoSocket.h>
+#include <IO/WriteBufferFromPocoSocket.h>
 
-#include <DB/IO/copyData.h>
+#include <IO/copyData.h>
 
-#include <DB/DataStreams/AsynchronousBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/Interpreters/Quota.h>
+#include <DataStreams/AsynchronousBlockInputStream.h>
+#include <DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/NativeBlockOutputStream.h>
+#include <Interpreters/executeQuery.h>
+#include <Interpreters/Quota.h>
 
-#include <DB/Storages/StorageMemory.h>
+#include <Storages/StorageMemory.h>
 
-#include <DB/Common/ExternalTable.h>
+#include <Common/ExternalTable.h>
 
 #include "TCPHandler.h"
 
-#include <DB/Common/NetException.h>
+#include <Common/NetException.h>
 
 namespace DB
 {
diff --git a/dbms/src/Server/TCPHandler.h b/dbms/src/Server/TCPHandler.h
index 4d3eb9fd933..ccdd56244c6 100644
--- a/dbms/src/Server/TCPHandler.h
+++ b/dbms/src/Server/TCPHandler.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <DB/Core/Protocol.h>
-#include <DB/Core/QueryProcessingStage.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/BlockIO.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Core/Progress.h>
+#include <Core/Protocol.h>
+#include <Core/QueryProcessingStage.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/BlockIO.h>
+#include <Common/Stopwatch.h>
+#include <Common/CurrentMetrics.h>
+#include <Core/Progress.h>
 #include "Server.h"
 
 
diff --git a/dbms/src/Server/main.cpp b/dbms/src/Server/main.cpp
index 1fbda669f20..24b728dcec5 100644
--- a/dbms/src/Server/main.cpp
+++ b/dbms/src/Server/main.cpp
@@ -4,7 +4,7 @@
 #endif
 #include "Server.h"
 #include "LocalServer.h"
-#include <DB/Common/StringUtils.h>
+#include <Common/StringUtils.h>
 
 /// Universal executable for various clickhouse applications
 int mainEntryClickHouseServer(int argc, char ** argv);
diff --git a/dbms/src/Storages/AlterCommands.cpp b/dbms/src/Storages/AlterCommands.cpp
index 112e43e86f2..713039a34b7 100644
--- a/dbms/src/Storages/AlterCommands.cpp
+++ b/dbms/src/Storages/AlterCommands.cpp
@@ -1,14 +1,14 @@
-#include <DB/Storages/AlterCommands.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
+#include <Storages/AlterCommands.h>
+#include <Storages/IStorage.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNested.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/AlterCommands.h b/dbms/src/Storages/AlterCommands.h
similarity index 97%
rename from dbms/include/DB/Storages/AlterCommands.h
rename to dbms/src/Storages/AlterCommands.h
index 36c5e42d2f3..aad49cb3341 100644
--- a/dbms/include/DB/Storages/AlterCommands.h
+++ b/dbms/src/Storages/AlterCommands.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Storages/ColumnDefault.h>
+#include <Core/NamesAndTypes.h>
+#include <Storages/ColumnDefault.h>
 
 namespace DB
 {
diff --git a/dbms/src/Storages/ColumnDefault.cpp b/dbms/src/Storages/ColumnDefault.cpp
index 12cbfda044e..dcdfe2a6e51 100644
--- a/dbms/src/Storages/ColumnDefault.cpp
+++ b/dbms/src/Storages/ColumnDefault.cpp
@@ -1,5 +1,5 @@
-#include <DB/Parsers/queryToString.h>
-#include <DB/Storages/ColumnDefault.h>
+#include <Parsers/queryToString.h>
+#include <Storages/ColumnDefault.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/ColumnDefault.h b/dbms/src/Storages/ColumnDefault.h
similarity index 96%
rename from dbms/include/DB/Storages/ColumnDefault.h
rename to dbms/src/Storages/ColumnDefault.h
index 74e474c432f..299955a80e8 100644
--- a/dbms/include/DB/Storages/ColumnDefault.h
+++ b/dbms/src/Storages/ColumnDefault.h
@@ -3,7 +3,7 @@
 #include <string>
 #include <unordered_map>
 
-#include <DB/Parsers/IAST.h>
+#include <Parsers/IAST.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/ColumnsDescription.cpp b/dbms/src/Storages/ColumnsDescription.cpp
index f7e2c85af65..207f4f4cddc 100644
--- a/dbms/src/Storages/ColumnsDescription.cpp
+++ b/dbms/src/Storages/ColumnsDescription.cpp
@@ -1,13 +1,13 @@
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/queryToString.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/Storages/ColumnsDescription.h>
-#include <DB/DataTypes/DataTypeFactory.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/queryToString.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromString.h>
+#include <Storages/ColumnsDescription.h>
+#include <DataTypes/DataTypeFactory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/ColumnsDescription.h b/dbms/src/Storages/ColumnsDescription.h
similarity index 86%
rename from dbms/include/DB/Storages/ColumnsDescription.h
rename to dbms/src/Storages/ColumnsDescription.h
index 2974317fecc..a60b65bbc5c 100644
--- a/dbms/include/DB/Storages/ColumnsDescription.h
+++ b/dbms/src/Storages/ColumnsDescription.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Storages/ColumnDefault.h>
-#include <DB/Core/NamesAndTypes.h>
+#include <Storages/ColumnDefault.h>
+#include <Core/NamesAndTypes.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/CompressionMethodSelector.h b/dbms/src/Storages/CompressionMethodSelector.h
similarity index 96%
rename from dbms/include/DB/Storages/CompressionMethodSelector.h
rename to dbms/src/Storages/CompressionMethodSelector.h
index 398bb1c5a05..a4879807319 100644
--- a/dbms/include/DB/Storages/CompressionMethodSelector.h
+++ b/dbms/src/Storages/CompressionMethodSelector.h
@@ -1,7 +1,7 @@
-#include <DB/IO/CompressedStream.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/StringUtils.h>
+#include <IO/CompressedStream.h>
+#include <IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <Common/StringUtils.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
 
diff --git a/dbms/src/Storages/Distributed/DirectoryMonitor.cpp b/dbms/src/Storages/Distributed/DirectoryMonitor.cpp
index 21cd5a5c60d..fdea4f1f3f2 100644
--- a/dbms/src/Storages/Distributed/DirectoryMonitor.cpp
+++ b/dbms/src/Storages/Distributed/DirectoryMonitor.cpp
@@ -1,11 +1,11 @@
-#include <DB/DataStreams/RemoteBlockOutputStream.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/Distributed/DirectoryMonitor.h>
-#include <DB/IO/ReadBufferFromFile.h>
+#include <DataStreams/RemoteBlockOutputStream.h>
+#include <Common/escapeForFileName.h>
+#include <Common/setThreadName.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/StringUtils.h>
+#include <Interpreters/Context.h>
+#include <Storages/Distributed/DirectoryMonitor.h>
+#include <IO/ReadBufferFromFile.h>
 
 #include <boost/algorithm/string/find_iterator.hpp>
 #include <boost/algorithm/string/finder.hpp>
diff --git a/dbms/include/DB/Storages/Distributed/DirectoryMonitor.h b/dbms/src/Storages/Distributed/DirectoryMonitor.h
similarity index 96%
rename from dbms/include/DB/Storages/Distributed/DirectoryMonitor.h
rename to dbms/src/Storages/Distributed/DirectoryMonitor.h
index 6c0807a4f5a..b3cc1ab728d 100644
--- a/dbms/include/DB/Storages/Distributed/DirectoryMonitor.h
+++ b/dbms/src/Storages/Distributed/DirectoryMonitor.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Storages/StorageDistributed.h>
+#include <Storages/StorageDistributed.h>
 
 #include <thread>
 #include <mutex>
diff --git a/dbms/src/Storages/Distributed/DistributedBlockOutputStream.cpp b/dbms/src/Storages/Distributed/DistributedBlockOutputStream.cpp
index f66da024068..2e1f4e8b2bc 100644
--- a/dbms/src/Storages/Distributed/DistributedBlockOutputStream.cpp
+++ b/dbms/src/Storages/Distributed/DistributedBlockOutputStream.cpp
@@ -1,20 +1,20 @@
-#include <DB/Storages/Distributed/DistributedBlockOutputStream.h>
-#include <DB/Storages/StorageDistributed.h>
+#include <Storages/Distributed/DistributedBlockOutputStream.h>
+#include <Storages/StorageDistributed.h>
 
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/queryToString.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/queryToString.h>
 
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
-#include <DB/Interpreters/InterpreterInsertQuery.h>
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Interpreters/createBlockSelector.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <DataStreams/NativeBlockOutputStream.h>
+#include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/Cluster.h>
+#include <Interpreters/createBlockSelector.h>
 
-#include <DB/Common/Increment.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <Common/Increment.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <memory>
-#include <DB/Common/ClickHouseRevision.h>
+#include <Common/ClickHouseRevision.h>
 
 #include <iostream>
 
diff --git a/dbms/include/DB/Storages/Distributed/DistributedBlockOutputStream.h b/dbms/src/Storages/Distributed/DistributedBlockOutputStream.h
similarity index 93%
rename from dbms/include/DB/Storages/Distributed/DistributedBlockOutputStream.h
rename to dbms/src/Storages/Distributed/DistributedBlockOutputStream.h
index abaca16fda3..6ff0c31f89e 100644
--- a/dbms/include/DB/Storages/Distributed/DistributedBlockOutputStream.h
+++ b/dbms/src/Storages/Distributed/DistributedBlockOutputStream.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Parsers/formatAST.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/Core/Block.h>
-#include <DB/Interpreters/Cluster.h>
+#include <Parsers/formatAST.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <Core/Block.h>
+#include <Interpreters/Cluster.h>
 
 namespace DB
 {
diff --git a/dbms/src/Storages/IStorage.cpp b/dbms/src/Storages/IStorage.cpp
index 97e738d87d3..73d3b8be643 100644
--- a/dbms/src/Storages/IStorage.cpp
+++ b/dbms/src/Storages/IStorage.cpp
@@ -1,4 +1,4 @@
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/IStorage.h b/dbms/src/Storages/IStorage.h
similarity index 99%
rename from dbms/include/DB/Storages/IStorage.h
rename to dbms/src/Storages/IStorage.h
index 6b9e49e910e..fedfaf8f74e 100644
--- a/dbms/include/DB/Storages/IStorage.h
+++ b/dbms/src/Storages/IStorage.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Core/Names.h>
-#include <DB/Common/Exception.h>
-#include <DB/Core/QueryProcessingStage.h>
-#include <DB/Storages/ITableDeclaration.h>
+#include <Core/Names.h>
+#include <Common/Exception.h>
+#include <Core/QueryProcessingStage.h>
+#include <Storages/ITableDeclaration.h>
 #include <Poco/RWLock.h>
 #include <memory>
 #include <experimental/optional>
diff --git a/dbms/src/Storages/ITableDeclaration.cpp b/dbms/src/Storages/ITableDeclaration.cpp
index 84ba9dd9e56..134e2df788c 100644
--- a/dbms/src/Storages/ITableDeclaration.cpp
+++ b/dbms/src/Storages/ITableDeclaration.cpp
@@ -1,10 +1,10 @@
 #include <unordered_set>
 #include <sparsehash/dense_hash_map>
 #include <sparsehash/dense_hash_set>
-#include <DB/Storages/ITableDeclaration.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTNameTypePair.h>
-#include <DB/Interpreters/Context.h>
+#include <Storages/ITableDeclaration.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTNameTypePair.h>
+#include <Interpreters/Context.h>
 #include <ext/map.hpp>
 #include <ext/identity.hpp>
 #include <ext/collection_cast.hpp>
diff --git a/dbms/include/DB/Storages/ITableDeclaration.h b/dbms/src/Storages/ITableDeclaration.h
similarity index 96%
rename from dbms/include/DB/Storages/ITableDeclaration.h
rename to dbms/src/Storages/ITableDeclaration.h
index 7b0c7af2d0a..e8daf195cf2 100644
--- a/dbms/include/DB/Storages/ITableDeclaration.h
+++ b/dbms/src/Storages/ITableDeclaration.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Core/Names.h>
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Common/Exception.h>
-#include <DB/Core/Block.h>
-#include <DB/Storages/ColumnDefault.h>
+#include <Core/Names.h>
+#include <Core/NamesAndTypes.h>
+#include <Common/Exception.h>
+#include <Core/Block.h>
+#include <Storages/ColumnDefault.h>
 
 #include <boost/range/iterator_range.hpp>
 #include <boost/range/join.hpp>
diff --git a/dbms/include/DB/Storages/MarkCache.h b/dbms/src/Storages/MarkCache.h
similarity index 89%
rename from dbms/include/DB/Storages/MarkCache.h
rename to dbms/src/Storages/MarkCache.h
index dd3ba5ab6eb..c35bdd14ba7 100644
--- a/dbms/include/DB/Storages/MarkCache.h
+++ b/dbms/src/Storages/MarkCache.h
@@ -2,11 +2,11 @@
 
 #include <memory>
 
-#include <DB/Common/LRUCache.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Interpreters/AggregationCommon.h>
-#include <DB/DataStreams/MarkInCompressedFile.h>
+#include <Common/LRUCache.h>
+#include <Common/ProfileEvents.h>
+#include <Common/SipHash.h>
+#include <Interpreters/AggregationCommon.h>
+#include <DataStreams/MarkInCompressedFile.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Storages/MergeTree/AbandonableLockInZooKeeper.h b/dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/AbandonableLockInZooKeeper.h
rename to dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h
index e0b05f5da22..dc2350123a7 100644
--- a/dbms/include/DB/Storages/MergeTree/AbandonableLockInZooKeeper.h
+++ b/dbms/src/Storages/MergeTree/AbandonableLockInZooKeeper.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <zkutil/ZooKeeper.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Common/Exception.h>
+#include <IO/ReadHelpers.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp b/dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp
index d1893abddfb..cb99c30d883 100644
--- a/dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp
+++ b/dbms/src/Storages/MergeTree/ActiveDataPartSet.cpp
@@ -1,6 +1,6 @@
-#include <DB/Storages/MergeTree/ActiveDataPartSet.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Storages/MergeTree/ActiveDataPartSet.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/ActiveDataPartSet.h b/dbms/src/Storages/MergeTree/ActiveDataPartSet.h
similarity index 99%
rename from dbms/include/DB/Storages/MergeTree/ActiveDataPartSet.h
rename to dbms/src/Storages/MergeTree/ActiveDataPartSet.h
index 0ddf782b07f..9be54d7ce78 100644
--- a/dbms/include/DB/Storages/MergeTree/ActiveDataPartSet.h
+++ b/dbms/src/Storages/MergeTree/ActiveDataPartSet.h
@@ -2,7 +2,7 @@
 #include <mutex>
 #include <Poco/RegularExpression.h>
 #include <common/DateLUT.h>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 #include <set>
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/AllMergeSelector.cpp b/dbms/src/Storages/MergeTree/AllMergeSelector.cpp
index 533384df6a0..9f988309048 100644
--- a/dbms/src/Storages/MergeTree/AllMergeSelector.cpp
+++ b/dbms/src/Storages/MergeTree/AllMergeSelector.cpp
@@ -1,4 +1,4 @@
-#include <DB/Storages/MergeTree/AllMergeSelector.h>
+#include <Storages/MergeTree/AllMergeSelector.h>
 
 #include <cmath>
 
diff --git a/dbms/include/DB/Storages/MergeTree/AllMergeSelector.h b/dbms/src/Storages/MergeTree/AllMergeSelector.h
similarity index 88%
rename from dbms/include/DB/Storages/MergeTree/AllMergeSelector.h
rename to dbms/src/Storages/MergeTree/AllMergeSelector.h
index 2aef0d3fba0..50df9b601d4 100644
--- a/dbms/include/DB/Storages/MergeTree/AllMergeSelector.h
+++ b/dbms/src/Storages/MergeTree/AllMergeSelector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Storages/MergeTree/MergeSelector.h>
+#include <Storages/MergeTree/MergeSelector.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/BackgroundProcessingPool.cpp b/dbms/src/Storages/MergeTree/BackgroundProcessingPool.cpp
index b52f324cbae..0139cc25e87 100644
--- a/dbms/src/Storages/MergeTree/BackgroundProcessingPool.cpp
+++ b/dbms/src/Storages/MergeTree/BackgroundProcessingPool.cpp
@@ -1,10 +1,10 @@
-#include <DB/Common/Exception.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Common/MemoryTracker.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/Exception.h>
+#include <Common/setThreadName.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/MemoryTracker.h>
+#include <IO/WriteHelpers.h>
 #include <common/logger_useful.h>
-#include <DB/Storages/MergeTree/BackgroundProcessingPool.h>
+#include <Storages/MergeTree/BackgroundProcessingPool.h>
 
 #include <random>
 
diff --git a/dbms/include/DB/Storages/MergeTree/BackgroundProcessingPool.h b/dbms/src/Storages/MergeTree/BackgroundProcessingPool.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/BackgroundProcessingPool.h
rename to dbms/src/Storages/MergeTree/BackgroundProcessingPool.h
index 81041d00aeb..35492882d1e 100644
--- a/dbms/include/DB/Storages/MergeTree/BackgroundProcessingPool.h
+++ b/dbms/src/Storages/MergeTree/BackgroundProcessingPool.h
@@ -10,7 +10,7 @@
 #include <Poco/RWLock.h>
 #include <Poco/Event.h>
 #include <Poco/Timestamp.h>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Storages/MergeTree/BoolMask.h b/dbms/src/Storages/MergeTree/BoolMask.h
similarity index 100%
rename from dbms/include/DB/Storages/MergeTree/BoolMask.h
rename to dbms/src/Storages/MergeTree/BoolMask.h
diff --git a/dbms/src/Storages/MergeTree/DataPartsExchange.cpp b/dbms/src/Storages/MergeTree/DataPartsExchange.cpp
index 8728a8427d3..bd253693cdb 100644
--- a/dbms/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/dbms/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -1,8 +1,8 @@
-#include <DB/Storages/MergeTree/DataPartsExchange.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Common/NetException.h>
-#include <DB/IO/ReadBufferFromHTTP.h>
+#include <Storages/MergeTree/DataPartsExchange.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/NetException.h>
+#include <IO/ReadBufferFromHTTP.h>
 #include <Poco/File.h>
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/DataPartsExchange.h b/dbms/src/Storages/MergeTree/DataPartsExchange.h
similarity index 93%
rename from dbms/include/DB/Storages/MergeTree/DataPartsExchange.h
rename to dbms/src/Storages/MergeTree/DataPartsExchange.h
index 467b71921d7..f8e59b2b386 100644
--- a/dbms/include/DB/Storages/MergeTree/DataPartsExchange.h
+++ b/dbms/src/Storages/MergeTree/DataPartsExchange.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Interpreters/InterserverIOHandler.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/IO/HashingWriteBuffer.h>
-#include <DB/IO/copyData.h>
+#include <Interpreters/InterserverIOHandler.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <IO/HashingWriteBuffer.h>
+#include <IO/copyData.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp b/dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp
index 49ed329bff9..5d426c4e4fc 100644
--- a/dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp
+++ b/dbms/src/Storages/MergeTree/DiskSpaceMonitor.cpp
@@ -1,4 +1,4 @@
-#include <DB/Storages/MergeTree/DiskSpaceMonitor.h>
+#include <Storages/MergeTree/DiskSpaceMonitor.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Storages/MergeTree/DiskSpaceMonitor.h b/dbms/src/Storages/MergeTree/DiskSpaceMonitor.h
similarity index 96%
rename from dbms/include/DB/Storages/MergeTree/DiskSpaceMonitor.h
rename to dbms/src/Storages/MergeTree/DiskSpaceMonitor.h
index c92a0043ff7..2ed9c96e68b 100644
--- a/dbms/include/DB/Storages/MergeTree/DiskSpaceMonitor.h
+++ b/dbms/src/Storages/MergeTree/DiskSpaceMonitor.h
@@ -5,10 +5,10 @@
 #include <memory>
 #include <boost/noncopyable.hpp>
 #include <common/logger_useful.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/formatReadable.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/Exception.h>
+#include <IO/WriteHelpers.h>
+#include <Common/formatReadable.h>
+#include <Common/CurrentMetrics.h>
 
 
 namespace CurrentMetrics
diff --git a/dbms/src/Storages/MergeTree/LevelMergeSelector.cpp b/dbms/src/Storages/MergeTree/LevelMergeSelector.cpp
index a15fb1c3091..c9a058d0aa5 100644
--- a/dbms/src/Storages/MergeTree/LevelMergeSelector.cpp
+++ b/dbms/src/Storages/MergeTree/LevelMergeSelector.cpp
@@ -1,4 +1,4 @@
-#include <DB/Storages/MergeTree/LevelMergeSelector.h>
+#include <Storages/MergeTree/LevelMergeSelector.h>
 
 #include <cmath>
 
diff --git a/dbms/include/DB/Storages/MergeTree/LevelMergeSelector.h b/dbms/src/Storages/MergeTree/LevelMergeSelector.h
similarity index 91%
rename from dbms/include/DB/Storages/MergeTree/LevelMergeSelector.h
rename to dbms/src/Storages/MergeTree/LevelMergeSelector.h
index a8b8f59a811..d524ac6d5f2 100644
--- a/dbms/include/DB/Storages/MergeTree/LevelMergeSelector.h
+++ b/dbms/src/Storages/MergeTree/LevelMergeSelector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Storages/MergeTree/MergeSelector.h>
+#include <Storages/MergeTree/MergeSelector.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/MarkRange.h b/dbms/src/Storages/MergeTree/MarkRange.h
similarity index 100%
rename from dbms/include/DB/Storages/MergeTree/MarkRange.h
rename to dbms/src/Storages/MergeTree/MarkRange.h
diff --git a/dbms/src/Storages/MergeTree/MergeList.cpp b/dbms/src/Storages/MergeTree/MergeList.cpp
index e98a866ad71..eaca961fd88 100644
--- a/dbms/src/Storages/MergeTree/MergeList.cpp
+++ b/dbms/src/Storages/MergeTree/MergeList.cpp
@@ -1,5 +1,5 @@
-#include <DB/Storages/MergeTree/MergeList.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Storages/MergeTree/MergeList.h>
+#include <Common/CurrentMetrics.h>
 #include <Poco/Ext/ThreadNumber.h>
 
 namespace CurrentMetrics
diff --git a/dbms/include/DB/Storages/MergeTree/MergeList.h b/dbms/src/Storages/MergeTree/MergeList.h
similarity index 94%
rename from dbms/include/DB/Storages/MergeTree/MergeList.h
rename to dbms/src/Storages/MergeTree/MergeList.h
index 6e3308289b9..783ddb90b21 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeList.h
+++ b/dbms/src/Storages/MergeTree/MergeList.h
@@ -1,10 +1,10 @@
 #pragma once
 
-#include <DB/Common/Stopwatch.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Common/MemoryTracker.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
+#include <Common/Stopwatch.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/MemoryTracker.h>
+#include <Interpreters/Context.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 #include <memory>
 #include <list>
 #include <mutex>
diff --git a/dbms/include/DB/Storages/MergeTree/MergeSelector.h b/dbms/src/Storages/MergeTree/MergeSelector.h
similarity index 100%
rename from dbms/include/DB/Storages/MergeTree/MergeSelector.h
rename to dbms/src/Storages/MergeTree/MergeSelector.h
diff --git a/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.cpp b/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.cpp
index daeba75a04f..9e7c2b10846 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.cpp
@@ -1,6 +1,6 @@
-#include <DB/Storages/MergeTree/MergeTreeReader.h>
-#include <DB/Storages/MergeTree/MergeTreeBlockInputStream.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Storages/MergeTree/MergeTreeReader.h>
+#include <Storages/MergeTree/MergeTreeBlockInputStream.h>
+#include <Columns/ColumnNullable.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h b/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.h
similarity index 95%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
rename to dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.h
index 2520daa2104..76d8dc9062a 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeBlockInputStream.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeBlockInputStream.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Storages/MergeTree/MarkRange.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MarkRange.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeBlockOutputStream.h b/dbms/src/Storages/MergeTree/MergeTreeBlockOutputStream.h
similarity index 91%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeBlockOutputStream.h
rename to dbms/src/Storages/MergeTree/MergeTreeBlockOutputStream.h
index 2a195ce548b..54e8b7f9195 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeBlockOutputStream.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Storages/StorageMergeTree.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <Storages/StorageMergeTree.h>
+#include <DataStreams/IBlockOutputStream.h>
 #include <iomanip>
 
 
diff --git a/dbms/src/Storages/MergeTree/MergeTreeData.cpp b/dbms/src/Storages/MergeTree/MergeTreeData.cpp
index 5229d424a8a..3574b06b2bc 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeData.cpp
@@ -1,32 +1,32 @@
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Storages/MergeTree/MergeTreeBlockInputStream.h>
-#include <DB/Storages/MergeTree/MergedBlockOutputStream.h>
-#include <DB/Storages/MergeTree/MergeTreePartChecker.h>
-#include <DB/Storages/AlterCommands.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTNameTypePair.h>
-#include <DB/DataStreams/ExpressionBlockInputStream.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/HexWriteBuffer.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeEnum.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Common/localBackup.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/IFunction.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Storages/MergeTree/MergeTreeBlockInputStream.h>
+#include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <Storages/MergeTree/MergeTreePartChecker.h>
+#include <Storages/AlterCommands.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTNameTypePair.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/copyData.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/HexWriteBuffer.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Common/localBackup.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
 #include <Poco/DirectoryIterator.h>
-#include <DB/Common/Increment.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/IO/Operators.h>
+#include <Common/Increment.h>
+#include <Common/escapeForFileName.h>
+#include <Common/StringUtils.h>
+#include <Common/Stopwatch.h>
+#include <IO/Operators.h>
 
 #include <algorithm>
 #include <iomanip>
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeData.h b/dbms/src/Storages/MergeTree/MergeTreeData.h
similarity index 97%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeData.h
rename to dbms/src/Storages/MergeTree/MergeTreeData.h
index f71302fc807..f97ff2843b9 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeData.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeData.h
@@ -1,18 +1,18 @@
 #pragma once
 
-#include <DB/Core/SortDescription.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/Storages/MergeTree/ActiveDataPartSet.h>
-#include <DB/Storages/MergeTree/MergeTreeSettings.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/GraphiteRollupSortedBlockInputStream.h>
-#include <DB/Storages/MergeTree/MergeTreeDataPart.h>
+#include <Core/SortDescription.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Storages/IStorage.h>
+#include <Storages/MergeTree/ActiveDataPartSet.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/ReadBufferFromFile.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/GraphiteRollupSortedBlockInputStream.h>
+#include <Storages/MergeTree/MergeTreeDataPart.h>
 
 
 struct SimpleIncrement;
diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
index 1abc950473f..6f366c63127 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp
@@ -1,27 +1,27 @@
-#include <DB/Storages/MergeTree/MergeTreeDataMerger.h>
-#include <DB/Storages/MergeTree/MergeTreeBlockInputStream.h>
-#include <DB/Storages/MergeTree/MergedBlockOutputStream.h>
-#include <DB/Storages/MergeTree/DiskSpaceMonitor.h>
-#include <DB/Storages/MergeTree/MergeTreeSharder.h>
-#include <DB/Storages/MergeTree/ReshardingJob.h>
-#include <DB/Storages/MergeTree/SimpleMergeSelector.h>
-#include <DB/Storages/MergeTree/AllMergeSelector.h>
-#include <DB/Storages/MergeTree/MergeList.h>
-#include <DB/DataStreams/ExpressionBlockInputStream.h>
-#include <DB/DataStreams/MergingSortedBlockInputStream.h>
-#include <DB/DataStreams/CollapsingSortedBlockInputStream.h>
-#include <DB/DataStreams/SummingSortedBlockInputStream.h>
-#include <DB/DataStreams/ReplacingSortedBlockInputStream.h>
-#include <DB/DataStreams/GraphiteRollupSortedBlockInputStream.h>
-#include <DB/DataStreams/AggregatingSortedBlockInputStream.h>
-#include <DB/DataStreams/MaterializingBlockInputStream.h>
-#include <DB/DataStreams/ConcatBlockInputStream.h>
-#include <DB/DataStreams/ColumnGathererStream.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Storages/MergeTree/BackgroundProcessingPool.h>
-#include <DB/Common/Increment.h>
-#include <DB/Common/interpolate.h>
+#include <Storages/MergeTree/MergeTreeDataMerger.h>
+#include <Storages/MergeTree/MergeTreeBlockInputStream.h>
+#include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <Storages/MergeTree/DiskSpaceMonitor.h>
+#include <Storages/MergeTree/MergeTreeSharder.h>
+#include <Storages/MergeTree/ReshardingJob.h>
+#include <Storages/MergeTree/SimpleMergeSelector.h>
+#include <Storages/MergeTree/AllMergeSelector.h>
+#include <Storages/MergeTree/MergeList.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/MergingSortedBlockInputStream.h>
+#include <DataStreams/CollapsingSortedBlockInputStream.h>
+#include <DataStreams/SummingSortedBlockInputStream.h>
+#include <DataStreams/ReplacingSortedBlockInputStream.h>
+#include <DataStreams/GraphiteRollupSortedBlockInputStream.h>
+#include <DataStreams/AggregatingSortedBlockInputStream.h>
+#include <DataStreams/MaterializingBlockInputStream.h>
+#include <DataStreams/ConcatBlockInputStream.h>
+#include <DataStreams/ColumnGathererStream.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Storages/MergeTree/BackgroundProcessingPool.h>
+#include <Common/Increment.h>
+#include <Common/interpolate.h>
 
 #include <cmath>
 #include <numeric>
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeDataMerger.h b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeDataMerger.h
rename to dbms/src/Storages/MergeTree/MergeTreeDataMerger.h
index 650f636f459..32abf3e9628 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeDataMerger.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Storages/MergeTree/DiskSpaceMonitor.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/DiskSpaceMonitor.h>
 #include <atomic>
 #include <functional>
 
diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
index faf00196d52..3a92f1f1f7a 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataPart.cpp
@@ -1,17 +1,17 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/CompressedStream.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/Core/Defines.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Storages/MergeTree/MergeTreeDataPart.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/CompressedStream.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadBufferFromFile.h>
+#include <Core/Defines.h>
+#include <Common/SipHash.h>
+#include <Common/escapeForFileName.h>
+#include <Common/StringUtils.h>
+#include <Storages/MergeTree/MergeTreeDataPart.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 
 #include <Poco/File.h>
 
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeDataPart.h b/dbms/src/Storages/MergeTree/MergeTreeDataPart.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeDataPart.h
rename to dbms/src/Storages/MergeTree/MergeTreeDataPart.h
index 9b5876ab2b0..9739c4d3631 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeDataPart.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataPart.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Field.h>
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Storages/MergeTree/ActiveDataPartSet.h>
+#include <Core/Field.h>
+#include <Core/NamesAndTypes.h>
+#include <Storages/MergeTree/ActiveDataPartSet.h>
 #include <Poco/RWLock.h>
 
 
diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 04199b3fc3e..1d9fb014370 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -15,28 +15,28 @@
 
 #include <boost/rational.hpp>   /// For calculations related to sampling coefficients.
 
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Storages/MergeTree/MergeTreeDataSelectExecutor.h>
-#include <DB/Storages/MergeTree/MergeTreeBlockInputStream.h>
-#include <DB/Storages/MergeTree/MergeTreeReadPool.h>
-#include <DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h>
-#include <DB/Storages/MergeTree/PKCondition.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTSampleRatio.h>
-#include <DB/DataStreams/ExpressionBlockInputStream.h>
-#include <DB/DataStreams/FilterBlockInputStream.h>
-#include <DB/DataStreams/CollapsingFinalBlockInputStream.h>
-#include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
-#include <DB/DataStreams/CreatingSetsBlockInputStream.h>
-#include <DB/DataStreams/NullBlockInputStream.h>
-#include <DB/DataStreams/SummingSortedBlockInputStream.h>
-#include <DB/DataStreams/ReplacingSortedBlockInputStream.h>
-#include <DB/DataStreams/AggregatingSortedBlockInputStream.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeEnum.h>
-#include <DB/Common/VirtualColumnUtils.h>
+#include <Core/FieldVisitors.h>
+#include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+#include <Storages/MergeTree/MergeTreeBlockInputStream.h>
+#include <Storages/MergeTree/MergeTreeReadPool.h>
+#include <Storages/MergeTree/MergeTreeThreadBlockInputStream.h>
+#include <Storages/MergeTree/PKCondition.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSampleRatio.h>
+#include <DataStreams/ExpressionBlockInputStream.h>
+#include <DataStreams/FilterBlockInputStream.h>
+#include <DataStreams/CollapsingFinalBlockInputStream.h>
+#include <DataStreams/AddingConstColumnBlockInputStream.h>
+#include <DataStreams/CreatingSetsBlockInputStream.h>
+#include <DataStreams/NullBlockInputStream.h>
+#include <DataStreams/SummingSortedBlockInputStream.h>
+#include <DataStreams/ReplacingSortedBlockInputStream.h>
+#include <DataStreams/AggregatingSortedBlockInputStream.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <Common/VirtualColumnUtils.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
similarity index 96%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeDataSelectExecutor.h
rename to dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index 23ec84813cb..5ccafdd2501 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Storages/MergeTree/RangesInDataPart.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/RangesInDataPart.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 55c93876f8a..a5e7e403818 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -1,11 +1,11 @@
-#include <DB/Storages/MergeTree/MergeTreeDataWriter.h>
-#include <DB/Storages/MergeTree/MergedBlockOutputStream.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/IO/HashingWriteBuffer.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/Interpreters/PartLog.h>
-#include <DB/Interpreters/Context.h>
+#include <Storages/MergeTree/MergeTreeDataWriter.h>
+#include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <Common/escapeForFileName.h>
+#include <DataTypes/DataTypeArray.h>
+#include <IO/HashingWriteBuffer.h>
+#include <Common/Stopwatch.h>
+#include <Interpreters/PartLog.h>
+#include <Interpreters/Context.h>
 #include <Poco/File.h>
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeDataWriter.h b/dbms/src/Storages/MergeTree/MergeTreeDataWriter.h
similarity index 87%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeDataWriter.h
rename to dbms/src/Storages/MergeTree/MergeTreeDataWriter.h
index dd4c2015131..f0aedb0b046 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeDataWriter.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeDataWriter.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedWriteBuffer.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
 
-#include <DB/Columns/ColumnsNumber.h>
+#include <Columns/ColumnsNumber.h>
 
-#include <DB/Interpreters/sortBlock.h>
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/sortBlock.h>
+#include <Interpreters/Context.h>
 
-#include <DB/Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/MergeTreePartChecker.cpp b/dbms/src/Storages/MergeTree/MergeTreePartChecker.cpp
index 15d916935c0..4bbf8fbc78c 100644
--- a/dbms/src/Storages/MergeTree/MergeTreePartChecker.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreePartChecker.cpp
@@ -1,19 +1,19 @@
-#include <DB/Storages/MergeTree/MergeTreePartChecker.h>
-#include <DB/DataStreams/MarkInCompressedFile.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeAggregateFunction.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/HashingReadBuffer.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Common/escapeForFileName.h>
+#include <Storages/MergeTree/MergeTreePartChecker.h>
+#include <DataStreams/MarkInCompressedFile.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeNested.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/HashingReadBuffer.h>
+#include <Columns/ColumnsNumber.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/escapeForFileName.h>
 #include <Poco/File.h>
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreePartChecker.h b/dbms/src/Storages/MergeTree/MergeTreePartChecker.h
similarity index 97%
rename from dbms/include/DB/Storages/MergeTree/MergeTreePartChecker.h
rename to dbms/src/Storages/MergeTree/MergeTreePartChecker.h
index 30e63646a92..cf7adf1ec8c 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreePartChecker.h
+++ b/dbms/src/Storages/MergeTree/MergeTreePartChecker.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/MergeTreeReadPool.cpp b/dbms/src/Storages/MergeTree/MergeTreeReadPool.cpp
index 393fe69e39e..d4dfacd960d 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeReadPool.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeReadPool.cpp
@@ -1,5 +1,5 @@
-#include <DB/Storages/MergeTree/RangesInDataPart.h>
-#include <DB/Storages/MergeTree/MergeTreeReadPool.h>
+#include <Storages/MergeTree/RangesInDataPart.h>
+#include <Storages/MergeTree/MergeTreeReadPool.h>
 #include <ext/range.hpp>
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeReadPool.h b/dbms/src/Storages/MergeTree/MergeTreeReadPool.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeReadPool.h
rename to dbms/src/Storages/MergeTree/MergeTreeReadPool.h
index b8f8017471a..9fb47e07fcb 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeReadPool.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Storages/MergeTree/RangesInDataPart.h>
+#include <Core/NamesAndTypes.h>
+#include <Storages/MergeTree/RangesInDataPart.h>
 #include <mutex>
 
 
diff --git a/dbms/src/Storages/MergeTree/MergeTreeReader.cpp b/dbms/src/Storages/MergeTree/MergeTreeReader.cpp
index aa0a1cf3bbc..b50e7d80b94 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeReader.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeReader.cpp
@@ -1,14 +1,14 @@
-#include <DB/DataTypes/IDataType.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/IO/CachedCompressedReadBuffer.h>
-#include <DB/IO/CompressedReadBufferFromFile.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Interpreters/evaluateMissingDefaults.h>
-#include <DB/Storages/MergeTree/MergeTreeReader.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Common/escapeForFileName.h>
+#include <IO/CachedCompressedReadBuffer.h>
+#include <IO/CompressedReadBufferFromFile.h>
+#include <Columns/ColumnArray.h>
+#include <Interpreters/evaluateMissingDefaults.h>
+#include <Storages/MergeTree/MergeTreeReader.h>
+#include <Columns/ColumnNullable.h>
 #include <Poco/File.h>
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeReader.h b/dbms/src/Storages/MergeTree/MergeTreeReader.h
similarity index 96%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
rename to dbms/src/Storages/MergeTree/MergeTreeReader.h
index f52e1ea66b3..6d5d24ef9d2 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeReader.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeReader.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Storages/MarkCache.h>
-#include <DB/Storages/MergeTree/MarkRange.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Core/NamesAndTypes.h>
+#include <Storages/MarkCache.h>
+#include <Storages/MergeTree/MarkRange.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Core/NamesAndTypes.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeSettings.h b/dbms/src/Storages/MergeTree/MergeTreeSettings.h
similarity index 99%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeSettings.h
rename to dbms/src/Storages/MergeTree/MergeTreeSettings.h
index c3fa627ce91..65cb3342528 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeSettings.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeSettings.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <Poco/Util/AbstractConfiguration.h>
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Core/Types.h>
+#include <IO/ReadHelpers.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/MergeTreeSharder.cpp b/dbms/src/Storages/MergeTree/MergeTreeSharder.cpp
index a584960f79a..da88585446f 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeSharder.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeSharder.cpp
@@ -1,11 +1,11 @@
-#include <DB/Storages/MergeTree/MergeTreeSharder.h>
-#include <DB/Storages/MergeTree/ReshardingJob.h>
-#include <DB/Storages/MergeTree/MergedBlockOutputStream.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/IO/HashingWriteBuffer.h>
-#include <DB/Interpreters/createBlockSelector.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
+#include <Storages/MergeTree/MergeTreeSharder.h>
+#include <Storages/MergeTree/ReshardingJob.h>
+#include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <Common/escapeForFileName.h>
+#include <DataTypes/DataTypeArray.h>
+#include <IO/HashingWriteBuffer.h>
+#include <Interpreters/createBlockSelector.h>
+#include <Interpreters/ExpressionAnalyzer.h>
 
 #include <ctime>
 
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeSharder.h b/dbms/src/Storages/MergeTree/MergeTreeSharder.h
similarity index 87%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeSharder.h
rename to dbms/src/Storages/MergeTree/MergeTreeSharder.h
index 8d032ebe81b..115a991da8d 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeSharder.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeSharder.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Interpreters/sortBlock.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Core/Block.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <Columns/ColumnsNumber.h>
+#include <Interpreters/sortBlock.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Core/Block.h>
 
 namespace DB
 {
diff --git a/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp b/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp
index bbcaa152b12..b592abded3d 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.cpp
@@ -1,7 +1,7 @@
-#include <DB/Storages/MergeTree/MergeTreeReader.h>
-#include <DB/Storages/MergeTree/MergeTreeReadPool.h>
-#include <DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Storages/MergeTree/MergeTreeReader.h>
+#include <Storages/MergeTree/MergeTreeReadPool.h>
+#include <Storages/MergeTree/MergeTreeThreadBlockInputStream.h>
+#include <Columns/ColumnNullable.h>
 #include <ext/range.hpp>
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h b/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
similarity index 95%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
rename to dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
index 3f420eb1179..53f729fa9c7 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeThreadBlockInputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/dbms/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index d690b85d622..17cbd510260 100644
--- a/dbms/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/dbms/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -1,16 +1,16 @@
-#include <DB/Storages/MergeTree/MergeTreeWhereOptimizer.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Storages/MergeTree/PKCondition.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTSubquery.h>
-#include <DB/Parsers/ASTSet.h>
-#include <DB/Parsers/formatAST.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/DataTypes/DataTypeNested.h>
+#include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/PKCondition.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/ASTSet.h>
+#include <Parsers/formatAST.h>
+#include <Common/escapeForFileName.h>
+#include <DataTypes/DataTypeNested.h>
 #include <ext/scope_guard.hpp>
 #include <ext/map.hpp>
 #include <memory>
diff --git a/dbms/include/DB/Storages/MergeTree/MergeTreeWhereOptimizer.h b/dbms/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
similarity index 99%
rename from dbms/include/DB/Storages/MergeTree/MergeTreeWhereOptimizer.h
rename to dbms/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
index 66fb1781246..9c61bd97885 100644
--- a/dbms/include/DB/Storages/MergeTree/MergeTreeWhereOptimizer.h
+++ b/dbms/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <unordered_map>
 #include <set>
-#include <DB/Core/Block.h>
+#include <Core/Block.h>
 
 
 namespace Poco { class Logger; }
diff --git a/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 31e4b46a87a..0bed96f7881 100644
--- a/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/dbms/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -1,12 +1,12 @@
-#include <DB/Storages/MergeTree/MergedBlockOutputStream.h>
-#include <DB/IO/createWriteBufferFromFileBase.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnNullable.h>
-#include <DB/Common/StringUtils.h>
+#include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <IO/createWriteBufferFromFileBase.h>
+#include <Common/escapeForFileName.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnNullable.h>
+#include <Common/StringUtils.h>
 #include <Poco/File.h>
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h b/dbms/src/Storages/MergeTree/MergedBlockOutputStream.h
similarity index 95%
rename from dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
rename to dbms/src/Storages/MergeTree/MergedBlockOutputStream.h
index bf4954ec991..f63cffc190c 100644
--- a/dbms/include/DB/Storages/MergeTree/MergedBlockOutputStream.h
+++ b/dbms/src/Storages/MergeTree/MergedBlockOutputStream.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/HashingWriteBuffer.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/HashingWriteBuffer.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <DataStreams/IBlockOutputStream.h>
 
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnArray.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/PKCondition.cpp b/dbms/src/Storages/MergeTree/PKCondition.cpp
index 7e2a2b5b444..ed62262f6ce 100644
--- a/dbms/src/Storages/MergeTree/PKCondition.cpp
+++ b/dbms/src/Storages/MergeTree/PKCondition.cpp
@@ -1,20 +1,20 @@
-#include <DB/Storages/MergeTree/PKCondition.h>
-#include <DB/Storages/MergeTree/BoolMask.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/DataTypes/DataTypeEnum.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Columns/ColumnSet.h>
-#include <DB/Columns/ColumnTuple.h>
-#include <DB/Parsers/ASTSet.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Interpreters/convertFieldToType.h>
-#include <DB/Interpreters/Set.h>
+#include <Storages/MergeTree/PKCondition.h>
+#include <Storages/MergeTree/BoolMask.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ExpressionActions.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnSet.h>
+#include <Columns/ColumnTuple.h>
+#include <Parsers/ASTSet.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Core/FieldVisitors.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Interpreters/Set.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/PKCondition.h b/dbms/src/Storages/MergeTree/PKCondition.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/PKCondition.h
rename to dbms/src/Storages/MergeTree/PKCondition.h
index 7db416408a6..93362ebd165 100644
--- a/dbms/include/DB/Storages/MergeTree/PKCondition.h
+++ b/dbms/src/Storages/MergeTree/PKCondition.h
@@ -2,12 +2,12 @@
 
 #include <sstream>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Core/SortDescription.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTLiteral.h>
+#include <Interpreters/Context.h>
+#include <Core/SortDescription.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/RangesInDataPart.h b/dbms/src/Storages/MergeTree/RangesInDataPart.h
similarity index 84%
rename from dbms/include/DB/Storages/MergeTree/RangesInDataPart.h
rename to dbms/src/Storages/MergeTree/RangesInDataPart.h
index 597efd2e258..5234245f3a5 100644
--- a/dbms/include/DB/Storages/MergeTree/RangesInDataPart.h
+++ b/dbms/src/Storages/MergeTree/RangesInDataPart.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Storages/MergeTree/MarkRange.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MarkRange.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/RemoteDiskSpaceMonitor.cpp b/dbms/src/Storages/MergeTree/RemoteDiskSpaceMonitor.cpp
index 44d51d5941e..0b26b42d240 100644
--- a/dbms/src/Storages/MergeTree/RemoteDiskSpaceMonitor.cpp
+++ b/dbms/src/Storages/MergeTree/RemoteDiskSpaceMonitor.cpp
@@ -1,9 +1,9 @@
-#include <DB/Storages/MergeTree/RemoteDiskSpaceMonitor.h>
-#include <DB/Storages/MergeTree/DiskSpaceMonitor.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/IO/ReadBufferFromHTTP.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadHelpers.h>
+#include <Storages/MergeTree/RemoteDiskSpaceMonitor.h>
+#include <Storages/MergeTree/DiskSpaceMonitor.h>
+#include <Interpreters/Context.h>
+#include <IO/ReadBufferFromHTTP.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Storages/MergeTree/RemoteDiskSpaceMonitor.h b/dbms/src/Storages/MergeTree/RemoteDiskSpaceMonitor.h
similarity index 90%
rename from dbms/include/DB/Storages/MergeTree/RemoteDiskSpaceMonitor.h
rename to dbms/src/Storages/MergeTree/RemoteDiskSpaceMonitor.h
index 6638723af19..3b1404c9c96 100644
--- a/dbms/include/DB/Storages/MergeTree/RemoteDiskSpaceMonitor.h
+++ b/dbms/src/Storages/MergeTree/RemoteDiskSpaceMonitor.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Core/Types.h>
-#include <DB/Interpreters/InterserverIOHandler.h>
-#include <DB/IO/WriteBuffer.h>
+#include <Core/Types.h>
+#include <Interpreters/InterserverIOHandler.h>
+#include <IO/WriteBuffer.h>
 
 namespace DB
 {
diff --git a/dbms/src/Storages/MergeTree/RemotePartChecker.cpp b/dbms/src/Storages/MergeTree/RemotePartChecker.cpp
index 5eb07b93cbf..38b86e219ac 100644
--- a/dbms/src/Storages/MergeTree/RemotePartChecker.cpp
+++ b/dbms/src/Storages/MergeTree/RemotePartChecker.cpp
@@ -1,9 +1,9 @@
-#include <DB/Storages/MergeTree/RemotePartChecker.h>
-#include <DB/Storages/MergeTree/ReshardingWorker.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/IO/ReadBufferFromHTTP.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Storages/MergeTree/RemotePartChecker.h>
+#include <Storages/MergeTree/ReshardingWorker.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <IO/ReadBufferFromHTTP.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 #include <Poco/File.h>
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/RemotePartChecker.h b/dbms/src/Storages/MergeTree/RemotePartChecker.h
similarity index 86%
rename from dbms/include/DB/Storages/MergeTree/RemotePartChecker.h
rename to dbms/src/Storages/MergeTree/RemotePartChecker.h
index 4d006bd92d7..be868c229bf 100644
--- a/dbms/include/DB/Storages/MergeTree/RemotePartChecker.h
+++ b/dbms/src/Storages/MergeTree/RemotePartChecker.h
@@ -1,9 +1,9 @@
 #pragma once
 
-#include <DB/Interpreters/InterserverIOHandler.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/Core/Types.h>
+#include <Interpreters/InterserverIOHandler.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <IO/WriteBuffer.h>
+#include <Core/Types.h>
 #include <common/logger_useful.h>
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/RemoteQueryExecutor.cpp b/dbms/src/Storages/MergeTree/RemoteQueryExecutor.cpp
index 306c03a3eb4..c26325779e4 100644
--- a/dbms/src/Storages/MergeTree/RemoteQueryExecutor.cpp
+++ b/dbms/src/Storages/MergeTree/RemoteQueryExecutor.cpp
@@ -1,8 +1,8 @@
-#include <DB/Storages/MergeTree/RemoteQueryExecutor.h>
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/IO/ReadBufferFromHTTP.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Storages/MergeTree/RemoteQueryExecutor.h>
+#include <Interpreters/executeQuery.h>
+#include <IO/ReadBufferFromHTTP.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Storages/MergeTree/RemoteQueryExecutor.h b/dbms/src/Storages/MergeTree/RemoteQueryExecutor.h
similarity index 92%
rename from dbms/include/DB/Storages/MergeTree/RemoteQueryExecutor.h
rename to dbms/src/Storages/MergeTree/RemoteQueryExecutor.h
index 78c4ec4502e..2cff097670a 100644
--- a/dbms/include/DB/Storages/MergeTree/RemoteQueryExecutor.h
+++ b/dbms/src/Storages/MergeTree/RemoteQueryExecutor.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Interpreters/InterserverIOHandler.h>
-#include <DB/IO/WriteBuffer.h>
+#include <Interpreters/InterserverIOHandler.h>
+#include <IO/WriteBuffer.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeAddress.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h
similarity index 88%
rename from dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeAddress.h
rename to dbms/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h
index 7bea4b6a419..32c1219f822 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeAddress.h
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAddress.h
@@ -1,8 +1,8 @@
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/Operators.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp
index 7d449f1a244..ec623d644eb 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.cpp
@@ -1,10 +1,10 @@
 #include <memory>
-#include <DB/Common/setThreadName.h>
-#include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/Storages/ColumnsDescription.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h>
-#include <DB/Databases/IDatabase.h>
+#include <Common/setThreadName.h>
+#include <Interpreters/InterpreterAlterQuery.h>
+#include <Storages/ColumnsDescription.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeAlterThread.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h
similarity index 97%
rename from dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h
rename to dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h
index cb6bbdaa206..10ef0121e12 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h
@@ -2,7 +2,7 @@
 
 #include <thread>
 #include <zkutil/Types.h>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 #include <common/logger_useful.h>
 
 
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
index 10e0d89054b..6ea311318fe 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.cpp
@@ -1,10 +1,10 @@
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Storages/MergeTree/AbandonableLockInZooKeeper.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/Common/SipHash.h>
-#include <DB/IO/Operators.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/MergeTree/AbandonableLockInZooKeeper.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <Common/SipHash.h>
+#include <IO/Operators.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
similarity index 88%
rename from dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
rename to dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
index 1ae96e9699b..46f286f6ea1 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/Core/Types.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <Core/Types.h>
 
 namespace Poco { class Logger; }
 
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
index 0af20a1c524..c753e32a374 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
@@ -1,6 +1,6 @@
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Common/setThreadName.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Common/setThreadName.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
similarity index 100%
rename from dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
rename to dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
index 3a4f57b2724..c1a0f6d8666 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.cpp
@@ -1,8 +1,8 @@
 #include <zkutil/Types.h>
 
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
-#include <DB/IO/Operators.h>
-#include <DB/IO/ReadBufferFromString.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
+#include <IO/Operators.h>
+#include <IO/ReadBufferFromString.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
rename to dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index c530fe5daea..1a185ef9eb6 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Common/Exception.h>
-#include <DB/Core/Types.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/Exception.h>
+#include <Core/Types.h>
+#include <IO/WriteHelpers.h>
 
 #include <mutex>
 #include <condition_variable>
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
index 21a997901c7..d404cda8732 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -1,7 +1,7 @@
-#include <DB/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h>
-#include <DB/Storages/MergeTree/MergeTreePartChecker.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Common/setThreadName.h>
+#include <Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h>
+#include <Storages/MergeTree/MergeTreePartChecker.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Common/setThreadName.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
similarity index 99%
rename from dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
rename to dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
index fbd871a4829..7a3a2259038 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
@@ -8,7 +8,7 @@
 #include <atomic>
 #include <boost/noncopyable.hpp>
 #include <Poco/Event.h>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 #include <common/logger_useful.h>
 
 
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index a2f54bdfcc9..5ba585a6178 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -1,8 +1,8 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeQueue.h>
-#include <DB/Storages/MergeTree/MergeTreeDataMerger.h>
-#include <DB/Common/StringUtils.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+#include <Storages/MergeTree/MergeTreeDataMerger.h>
+#include <Common/StringUtils.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQueue.h
rename to dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index d8349e69c5e..128b743e83f 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -1,6 +1,6 @@
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
-#include <DB/Storages/MergeTree/ActiveDataPartSet.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
+#include <Storages/MergeTree/ActiveDataPartSet.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 
 #include <zkutil/ZooKeeper.h>
 
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
similarity index 90%
rename from dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
rename to dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
index 33ab4ccc144..0270a73d420 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h
@@ -1,12 +1,12 @@
 #pragma once
 
 #include <set>
-#include <DB/Core/Types.h>
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/Operators.h>
+#include <Core/Types.h>
+#include <IO/ReadBuffer.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
 #include <zkutil/ZooKeeper.h>
 
 
diff --git a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index fcba2e7218e..a144d323633 100644
--- a/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -1,10 +1,10 @@
-#include <DB/IO/Operators.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeAddress.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/randomSeed.h>
+#include <IO/Operators.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
+#include <Common/setThreadName.h>
+#include <Common/randomSeed.h>
 
 
 namespace ProfileEvents
diff --git a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
rename to dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
index fa889ab4ba8..3226a4e9cf6 100644
--- a/dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
+++ b/dbms/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
@@ -2,7 +2,7 @@
 
 #include <Poco/Event.h>
 #include <common/logger_useful.h>
-#include <DB/Core/Types.h>
+#include <Core/Types.h>
 #include <thread>
 #include <atomic>
 
diff --git a/dbms/src/Storages/MergeTree/ReshardingJob.cpp b/dbms/src/Storages/MergeTree/ReshardingJob.cpp
index 334c07b9343..cfe008cf55c 100644
--- a/dbms/src/Storages/MergeTree/ReshardingJob.cpp
+++ b/dbms/src/Storages/MergeTree/ReshardingJob.cpp
@@ -1,11 +1,11 @@
-#include <DB/Storages/MergeTree/ReshardingJob.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Parsers/ParserQuery.h>
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/queryToString.h>
+#include <Storages/MergeTree/ReshardingJob.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Parsers/ParserQuery.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/queryToString.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/MergeTree/ReshardingJob.h b/dbms/src/Storages/MergeTree/ReshardingJob.h
similarity index 95%
rename from dbms/include/DB/Storages/MergeTree/ReshardingJob.h
rename to dbms/src/Storages/MergeTree/ReshardingJob.h
index c1813a221cb..e5caee37b3e 100644
--- a/dbms/include/DB/Storages/MergeTree/ReshardingJob.h
+++ b/dbms/src/Storages/MergeTree/ReshardingJob.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Storages/AlterCommands.h>
-#include <DB/Storages/IStorage.h>
+#include <Storages/AlterCommands.h>
+#include <Storages/IStorage.h>
 #include <string>
 
 namespace DB
diff --git a/dbms/src/Storages/MergeTree/ReshardingWorker.cpp b/dbms/src/Storages/MergeTree/ReshardingWorker.cpp
index 7167688b315..bca1ba0d2a1 100644
--- a/dbms/src/Storages/MergeTree/ReshardingWorker.cpp
+++ b/dbms/src/Storages/MergeTree/ReshardingWorker.cpp
@@ -1,28 +1,28 @@
-#include <DB/Storages/MergeTree/ReshardingWorker.h>
-#include <DB/Storages/MergeTree/ReshardingJob.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Storages/MergeTree/MergeTreeDataMerger.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeAddress.h>
-#include <DB/Storages/MergeTree/MergeTreeSharder.h>
-#include <DB/Storages/MergeTree/MergeTreeBlockInputStream.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
+#include <Storages/MergeTree/ReshardingWorker.h>
+#include <Storages/MergeTree/ReshardingJob.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeDataMerger.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
+#include <Storages/MergeTree/MergeTreeSharder.h>
+#include <Storages/MergeTree/MergeTreeBlockInputStream.h>
+#include <Storages/StorageReplicatedMergeTree.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/Common/getFQDNOrHostName.h>
-#include <DB/Common/SipHash.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Common/randomSeed.h>
+#include <Common/getFQDNOrHostName.h>
+#include <Common/SipHash.h>
+#include <Common/StringUtils.h>
+#include <Common/randomSeed.h>
 
-#include <DB/Interpreters/executeQuery.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/Cluster.h>
+#include <Interpreters/executeQuery.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/Cluster.h>
 
-#include <DB/Common/ThreadPool.h>
+#include <Common/ThreadPool.h>
 
 #include <zkutil/ZooKeeper.h>
 
diff --git a/dbms/include/DB/Storages/MergeTree/ReshardingWorker.h b/dbms/src/Storages/MergeTree/ReshardingWorker.h
similarity index 99%
rename from dbms/include/DB/Storages/MergeTree/ReshardingWorker.h
rename to dbms/src/Storages/MergeTree/ReshardingWorker.h
index cdeb035773e..d62076251eb 100644
--- a/dbms/include/DB/Storages/MergeTree/ReshardingWorker.h
+++ b/dbms/src/Storages/MergeTree/ReshardingWorker.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <DB/Storages/MergeTree/ReshardingJob.h>
-#include <DB/Storages/AlterCommands.h>
+#include <Storages/MergeTree/ReshardingJob.h>
+#include <Storages/AlterCommands.h>
 #include <common/logger_useful.h>
 
 #include <zkutil/RWLock.h>
diff --git a/dbms/src/Storages/MergeTree/ShardedPartitionUploader.cpp b/dbms/src/Storages/MergeTree/ShardedPartitionUploader.cpp
index b55d86924ca..46588b284d3 100644
--- a/dbms/src/Storages/MergeTree/ShardedPartitionUploader.cpp
+++ b/dbms/src/Storages/MergeTree/ShardedPartitionUploader.cpp
@@ -1,9 +1,9 @@
-#include <DB/Storages/MergeTree/ShardedPartitionUploader.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeAddress.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/InterserverWriteBuffer.h>
+#include <Storages/MergeTree/ShardedPartitionUploader.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/InterserverWriteBuffer.h>
 #include <Poco/File.h>
 
 
diff --git a/dbms/include/DB/Storages/MergeTree/ShardedPartitionUploader.h b/dbms/src/Storages/MergeTree/ShardedPartitionUploader.h
similarity index 92%
rename from dbms/include/DB/Storages/MergeTree/ShardedPartitionUploader.h
rename to dbms/src/Storages/MergeTree/ShardedPartitionUploader.h
index 21ed79d084c..f3c429a222a 100644
--- a/dbms/include/DB/Storages/MergeTree/ShardedPartitionUploader.h
+++ b/dbms/src/Storages/MergeTree/ShardedPartitionUploader.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <DB/Interpreters/InterserverIOHandler.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/IO/WriteBuffer.h>
+#include <Interpreters/InterserverIOHandler.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <IO/WriteBuffer.h>
 #include <common/logger_useful.h>
 #include <functional>
 
diff --git a/dbms/src/Storages/MergeTree/SimpleMergeSelector.cpp b/dbms/src/Storages/MergeTree/SimpleMergeSelector.cpp
index c7cebcca5f0..093120ff2f4 100644
--- a/dbms/src/Storages/MergeTree/SimpleMergeSelector.cpp
+++ b/dbms/src/Storages/MergeTree/SimpleMergeSelector.cpp
@@ -1,5 +1,5 @@
-#include <DB/Storages/MergeTree/SimpleMergeSelector.h>
-#include <DB/Common/interpolate.h>
+#include <Storages/MergeTree/SimpleMergeSelector.h>
+#include <Common/interpolate.h>
 
 #include <cmath>
 #include <iostream>
diff --git a/dbms/include/DB/Storages/MergeTree/SimpleMergeSelector.h b/dbms/src/Storages/MergeTree/SimpleMergeSelector.h
similarity index 98%
rename from dbms/include/DB/Storages/MergeTree/SimpleMergeSelector.h
rename to dbms/src/Storages/MergeTree/SimpleMergeSelector.h
index 81dfdc82eb2..17eb0aa2839 100644
--- a/dbms/include/DB/Storages/MergeTree/SimpleMergeSelector.h
+++ b/dbms/src/Storages/MergeTree/SimpleMergeSelector.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Storages/MergeTree/MergeSelector.h>
+#include <Storages/MergeTree/MergeSelector.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageBuffer.cpp b/dbms/src/Storages/StorageBuffer.cpp
index d106d4e57f8..8b51c9147e3 100644
--- a/dbms/src/Storages/StorageBuffer.cpp
+++ b/dbms/src/Storages/StorageBuffer.cpp
@@ -1,14 +1,14 @@
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/Interpreters/InterpreterInsertQuery.h>
-#include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Databases/IDatabase.h>
-#include <DB/Storages/StorageBuffer.h>
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/InterpreterAlterQuery.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Databases/IDatabase.h>
+#include <Storages/StorageBuffer.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Common/setThreadName.h>
+#include <Common/CurrentMetrics.h>
 #include <common/logger_useful.h>
 #include <Poco/Ext/ThreadNumber.h>
 
diff --git a/dbms/include/DB/Storages/StorageBuffer.h b/dbms/src/Storages/StorageBuffer.h
similarity index 98%
rename from dbms/include/DB/Storages/StorageBuffer.h
rename to dbms/src/Storages/StorageBuffer.h
index 67c6988a557..788406c71d7 100644
--- a/dbms/include/DB/Storages/StorageBuffer.h
+++ b/dbms/src/Storages/StorageBuffer.h
@@ -3,9 +3,9 @@
 #include <mutex>
 #include <thread>
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <Core/NamesAndTypes.h>
+#include <Storages/IStorage.h>
+#include <DataStreams/IBlockOutputStream.h>
 #include <Poco/Event.h>
 
 
diff --git a/dbms/src/Storages/StorageCloud.cpp b/dbms/src/Storages/StorageCloud.cpp
index ccf8889286a..16c8ecad894 100644
--- a/dbms/src/Storages/StorageCloud.cpp
+++ b/dbms/src/Storages/StorageCloud.cpp
@@ -1,5 +1,5 @@
-#include <DB/Storages/StorageCloud.h>
-#include <DB/Databases/DatabaseCloud.h>
+#include <Storages/StorageCloud.h>
+#include <Databases/DatabaseCloud.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/StorageCloud.h b/dbms/src/Storages/StorageCloud.h
similarity index 97%
rename from dbms/include/DB/Storages/StorageCloud.h
rename to dbms/src/Storages/StorageCloud.h
index ed13cd87ee8..695e182b8b4 100644
--- a/dbms/include/DB/Storages/StorageCloud.h
+++ b/dbms/src/Storages/StorageCloud.h
@@ -2,8 +2,8 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Storages/IStorage.h>
-#include <DB/Databases/IDatabase.h>
+#include <Storages/IStorage.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageDistributed.cpp b/dbms/src/Storages/StorageDistributed.cpp
index 311e5786dfd..9c4522c75fe 100644
--- a/dbms/src/Storages/StorageDistributed.cpp
+++ b/dbms/src/Storages/StorageDistributed.cpp
@@ -1,38 +1,38 @@
-#include <DB/DataStreams/RemoteBlockInputStream.h>
-#include <DB/DataStreams/BlockExtraInfoInputStream.h>
-#include <DB/DataStreams/UnionBlockInputStream.h>
+#include <DataStreams/RemoteBlockInputStream.h>
+#include <DataStreams/BlockExtraInfoInputStream.h>
+#include <DataStreams/UnionBlockInputStream.h>
 
-#include <DB/Databases/IDatabase.h>
+#include <Databases/IDatabase.h>
 
-#include <DB/Storages/StorageDistributed.h>
-#include <DB/Storages/VirtualColumnFactory.h>
-#include <DB/Storages/Distributed/DistributedBlockOutputStream.h>
-#include <DB/Storages/Distributed/DirectoryMonitor.h>
-#include <DB/Storages/MergeTree/ReshardingWorker.h>
+#include <Storages/StorageDistributed.h>
+#include <Storages/VirtualColumnFactory.h>
+#include <Storages/Distributed/DistributedBlockOutputStream.h>
+#include <Storages/Distributed/DirectoryMonitor.h>
+#include <Storages/MergeTree/ReshardingWorker.h>
 
-#include <DB/Common/escapeForFileName.h>
+#include <Common/escapeForFileName.h>
 
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/TablePropertiesQueriesASTs.h>
-#include <DB/Parsers/ParserAlterQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/Parsers/ASTWeightedZooKeeperPath.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/queryToString.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/TablePropertiesQueriesASTs.h>
+#include <Parsers/ParserAlterQuery.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ASTWeightedZooKeeperPath.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/queryToString.h>
 
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/Interpreters/InterpreterDescribeQuery.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/ClusterProxy/Query.h>
-#include <DB/Interpreters/ClusterProxy/SelectQueryConstructor.h>
-#include <DB/Interpreters/ClusterProxy/DescribeQueryConstructor.h>
-#include <DB/Interpreters/ClusterProxy/AlterQueryConstructor.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/InterpreterAlterQuery.h>
+#include <Interpreters/InterpreterDescribeQuery.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/ClusterProxy/Query.h>
+#include <Interpreters/ClusterProxy/SelectQueryConstructor.h>
+#include <Interpreters/ClusterProxy/DescribeQueryConstructor.h>
+#include <Interpreters/ClusterProxy/AlterQueryConstructor.h>
 
-#include <DB/Core/Field.h>
+#include <Core/Field.h>
 
 #include <Poco/DirectoryIterator.h>
 
diff --git a/dbms/include/DB/Storages/StorageDistributed.h b/dbms/src/Storages/StorageDistributed.h
similarity index 96%
rename from dbms/include/DB/Storages/StorageDistributed.h
rename to dbms/src/Storages/StorageDistributed.h
index 57a0edcad08..a73bc80b9b9 100644
--- a/dbms/include/DB/Storages/StorageDistributed.h
+++ b/dbms/src/Storages/StorageDistributed.h
@@ -2,12 +2,12 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Storages/IStorage.h>
-#include <DB/Client/ConnectionPool.h>
-#include <DB/Client/ConnectionPoolWithFailover.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Interpreters/ExpressionActions.h>
+#include <Storages/IStorage.h>
+#include <Client/ConnectionPool.h>
+#include <Client/ConnectionPoolWithFailover.h>
+#include <Interpreters/Settings.h>
+#include <Interpreters/Cluster.h>
+#include <Interpreters/ExpressionActions.h>
 #include <common/logger_useful.h>
 
 
diff --git a/dbms/src/Storages/StorageFactory.cpp b/dbms/src/Storages/StorageFactory.cpp
index 578cf0b1b8e..8fd654a7924 100644
--- a/dbms/src/Storages/StorageFactory.cpp
+++ b/dbms/src/Storages/StorageFactory.cpp
@@ -1,36 +1,36 @@
 #include <Poco/Util/Application.h>
 #include <Poco/Util/AbstractConfiguration.h>
 
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Common/StringUtils.h>
+#include <Core/FieldVisitors.h>
+#include <Common/StringUtils.h>
 
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/evaluateConstantExpression.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/getClusterName.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/getClusterName.h>
 
-#include <DB/Storages/StorageLog.h>
-#include <DB/Storages/StorageTinyLog.h>
-#include <DB/Storages/StorageStripeLog.h>
-#include <DB/Storages/StorageMemory.h>
-#include <DB/Storages/StorageBuffer.h>
-#include <DB/Storages/StorageNull.h>
-#include <DB/Storages/StorageMerge.h>
-#include <DB/Storages/StorageMergeTree.h>
-#include <DB/Storages/StorageDistributed.h>
-#include <DB/Storages/StorageFactory.h>
-#include <DB/Storages/StorageView.h>
-#include <DB/Storages/StorageMaterializedView.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Storages/StorageSet.h>
-#include <DB/Storages/StorageJoin.h>
-#include <DB/Storages/StorageFile.h>
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
+#include <Storages/StorageLog.h>
+#include <Storages/StorageTinyLog.h>
+#include <Storages/StorageStripeLog.h>
+#include <Storages/StorageMemory.h>
+#include <Storages/StorageBuffer.h>
+#include <Storages/StorageNull.h>
+#include <Storages/StorageMerge.h>
+#include <Storages/StorageMergeTree.h>
+#include <Storages/StorageDistributed.h>
+#include <Storages/StorageFactory.h>
+#include <Storages/StorageView.h>
+#include <Storages/StorageMaterializedView.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/StorageSet.h>
+#include <Storages/StorageJoin.h>
+#include <Storages/StorageFile.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
 
 #include <unistd.h>
 
diff --git a/dbms/include/DB/Storages/StorageFactory.h b/dbms/src/Storages/StorageFactory.h
similarity index 95%
rename from dbms/include/DB/Storages/StorageFactory.h
rename to dbms/src/Storages/StorageFactory.h
index 5329944dfa9..c5b1b5ec43f 100644
--- a/dbms/include/DB/Storages/StorageFactory.h
+++ b/dbms/src/Storages/StorageFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 #include <common/singleton.h>
 
 
diff --git a/dbms/src/Storages/StorageFile.cpp b/dbms/src/Storages/StorageFile.cpp
index b8967bd8ad4..e18bcd3b1d9 100644
--- a/dbms/src/Storages/StorageFile.cpp
+++ b/dbms/src/Storages/StorageFile.cpp
@@ -1,14 +1,14 @@
-#include <DB/Storages/StorageFile.h>
+#include <Storages/StorageFile.h>
 
-#include <DB/Interpreters/Context.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/DataStreams/FormatFactory.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <Interpreters/Context.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/WriteHelpers.h>
+#include <DataStreams/FormatFactory.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
 
-#include <DB/Common/escapeForFileName.h>
+#include <Common/escapeForFileName.h>
 
 #include <fcntl.h>
 
diff --git a/dbms/include/DB/Storages/StorageFile.h b/dbms/src/Storages/StorageFile.h
similarity index 98%
rename from dbms/include/DB/Storages/StorageFile.h
rename to dbms/src/Storages/StorageFile.h
index 16d7101ee4f..79f110ef891 100644
--- a/dbms/include/DB/Storages/StorageFile.h
+++ b/dbms/src/Storages/StorageFile.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 #include <Poco/File.h>
 #include <Poco/Path.h>
diff --git a/dbms/src/Storages/StorageJoin.cpp b/dbms/src/Storages/StorageJoin.cpp
index 49b5d20ba1e..7dafb3182c4 100644
--- a/dbms/src/Storages/StorageJoin.cpp
+++ b/dbms/src/Storages/StorageJoin.cpp
@@ -1,6 +1,6 @@
-#include <DB/Storages/StorageJoin.h>
-#include <DB/Interpreters/Join.h>
-#include <DB/Interpreters/Limits.h>
+#include <Storages/StorageJoin.h>
+#include <Interpreters/Join.h>
+#include <Interpreters/Limits.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/StorageJoin.h b/dbms/src/Storages/StorageJoin.h
similarity index 96%
rename from dbms/include/DB/Storages/StorageJoin.h
rename to dbms/src/Storages/StorageJoin.h
index f98814614ce..5397cffa871 100644
--- a/dbms/include/DB/Storages/StorageJoin.h
+++ b/dbms/src/Storages/StorageJoin.h
@@ -2,8 +2,8 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Storages/StorageSet.h>
-#include <DB/Parsers/ASTTablesInSelectQuery.h>
+#include <Storages/StorageSet.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageLog.cpp b/dbms/src/Storages/StorageLog.cpp
index aa1b6735f93..344aa234258 100644
--- a/dbms/src/Storages/StorageLog.cpp
+++ b/dbms/src/Storages/StorageLog.cpp
@@ -1,28 +1,28 @@
-#include <DB/Storages/StorageLog.h>
+#include <Storages/StorageLog.h>
 
-#include <DB/Common/Exception.h>
-#include <DB/Common/StringUtils.h>
+#include <Common/Exception.h>
+#include <Common/StringUtils.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnNullable.h>
 
-#include <DB/Interpreters/Settings.h>
+#include <Interpreters/Settings.h>
 
 #include <Poco/Path.h>
 #include <Poco/DirectoryIterator.h>
diff --git a/dbms/include/DB/Storages/StorageLog.h b/dbms/src/Storages/StorageLog.h
similarity index 98%
rename from dbms/include/DB/Storages/StorageLog.h
rename to dbms/src/Storages/StorageLog.h
index 38f4bf60a2c..33eeb44d068 100644
--- a/dbms/include/DB/Storages/StorageLog.h
+++ b/dbms/src/Storages/StorageLog.h
@@ -7,9 +7,9 @@
 #include <Poco/File.h>
 #include <Poco/RWLock.h>
 
-#include <DB/Storages/IStorage.h>
-#include <DB/Common/FileChecker.h>
-#include <DB/Common/escapeForFileName.h>
+#include <Storages/IStorage.h>
+#include <Common/FileChecker.h>
+#include <Common/escapeForFileName.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageMaterializedView.cpp b/dbms/src/Storages/StorageMaterializedView.cpp
index ece53f7a25b..733cc49eecb 100644
--- a/dbms/src/Storages/StorageMaterializedView.cpp
+++ b/dbms/src/Storages/StorageMaterializedView.cpp
@@ -1,11 +1,11 @@
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/ASTDropQuery.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTDropQuery.h>
 
-#include <DB/Interpreters/InterpreterCreateQuery.h>
-#include <DB/Interpreters/InterpreterDropQuery.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/InterpreterDropQuery.h>
 
-#include <DB/Storages/StorageMaterializedView.h>
-#include <DB/Storages/VirtualColumnFactory.h>
+#include <Storages/StorageMaterializedView.h>
+#include <Storages/VirtualColumnFactory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/StorageMaterializedView.h b/dbms/src/Storages/StorageMaterializedView.h
similarity index 98%
rename from dbms/include/DB/Storages/StorageMaterializedView.h
rename to dbms/src/Storages/StorageMaterializedView.h
index 3a27d69ca7f..b8211f18de7 100644
--- a/dbms/include/DB/Storages/StorageMaterializedView.h
+++ b/dbms/src/Storages/StorageMaterializedView.h
@@ -2,7 +2,7 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Storages/StorageView.h>
+#include <Storages/StorageView.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageMemory.cpp b/dbms/src/Storages/StorageMemory.cpp
index e98cd488d56..baa707b7fb5 100644
--- a/dbms/src/Storages/StorageMemory.cpp
+++ b/dbms/src/Storages/StorageMemory.cpp
@@ -1,10 +1,10 @@
 #include <map>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
 
-#include <DB/Storages/StorageMemory.h>
+#include <Storages/StorageMemory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/StorageMemory.h b/dbms/src/Storages/StorageMemory.h
similarity index 95%
rename from dbms/include/DB/Storages/StorageMemory.h
rename to dbms/src/Storages/StorageMemory.h
index 63e745203d5..6bfb256d8f2 100644
--- a/dbms/include/DB/Storages/StorageMemory.h
+++ b/dbms/src/Storages/StorageMemory.h
@@ -4,9 +4,9 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <Core/NamesAndTypes.h>
+#include <Storages/IStorage.h>
+#include <DataStreams/IBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageMerge.cpp b/dbms/src/Storages/StorageMerge.cpp
index 22d6892c068..68be2361613 100644
--- a/dbms/src/Storages/StorageMerge.cpp
+++ b/dbms/src/Storages/StorageMerge.cpp
@@ -1,16 +1,16 @@
-#include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
-#include <DB/DataStreams/narrowBlockInputStreams.h>
-#include <DB/DataStreams/LazyBlockInputStream.h>
-#include <DB/DataStreams/NullBlockInputStream.h>
-#include <DB/Storages/StorageMerge.h>
-#include <DB/Common/VirtualColumnUtils.h>
-#include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/Interpreters/ExpressionActions.h>
-#include <DB/Storages/VirtualColumnFactory.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Databases/IDatabase.h>
+#include <DataStreams/AddingConstColumnBlockInputStream.h>
+#include <DataStreams/narrowBlockInputStreams.h>
+#include <DataStreams/LazyBlockInputStream.h>
+#include <DataStreams/NullBlockInputStream.h>
+#include <Storages/StorageMerge.h>
+#include <Common/VirtualColumnUtils.h>
+#include <Interpreters/InterpreterAlterQuery.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Storages/VirtualColumnFactory.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnString.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/StorageMerge.h b/dbms/src/Storages/StorageMerge.h
similarity index 98%
rename from dbms/include/DB/Storages/StorageMerge.h
rename to dbms/src/Storages/StorageMerge.h
index 64d5f0500ff..b6798df31b4 100644
--- a/dbms/include/DB/Storages/StorageMerge.h
+++ b/dbms/src/Storages/StorageMerge.h
@@ -2,8 +2,8 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Common/OptimizedRegularExpression.h>
-#include <DB/Storages/IStorage.h>
+#include <Common/OptimizedRegularExpression.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageMergeTree.cpp b/dbms/src/Storages/StorageMergeTree.cpp
index 15f4c374017..e7198668c91 100644
--- a/dbms/src/Storages/StorageMergeTree.cpp
+++ b/dbms/src/Storages/StorageMergeTree.cpp
@@ -1,17 +1,17 @@
 #include <experimental/optional>
-#include <DB/Core/FieldVisitors.h>
-#include <DB/Storages/StorageMergeTree.h>
-#include <DB/Storages/MergeTree/MergeTreeBlockOutputStream.h>
-#include <DB/Storages/MergeTree/DiskSpaceMonitor.h>
-#include <DB/Storages/MergeTree/MergeList.h>
-#include <DB/Storages/MergeTree/MergeTreeWhereOptimizer.h>
-#include <DB/Databases/IDatabase.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/Interpreters/ExpressionAnalyzer.h>
-#include <DB/Interpreters/PartLog.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTSelectQuery.h>
+#include <Core/FieldVisitors.h>
+#include <Storages/StorageMergeTree.h>
+#include <Storages/MergeTree/MergeTreeBlockOutputStream.h>
+#include <Storages/MergeTree/DiskSpaceMonitor.h>
+#include <Storages/MergeTree/MergeList.h>
+#include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
+#include <Databases/IDatabase.h>
+#include <Common/escapeForFileName.h>
+#include <Interpreters/InterpreterAlterQuery.h>
+#include <Interpreters/ExpressionAnalyzer.h>
+#include <Interpreters/PartLog.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSelectQuery.h>
 
 #include <Poco/DirectoryIterator.h>
 #include <Poco/File.h>
diff --git a/dbms/include/DB/Storages/StorageMergeTree.h b/dbms/src/Storages/StorageMergeTree.h
similarity index 94%
rename from dbms/include/DB/Storages/StorageMergeTree.h
rename to dbms/src/Storages/StorageMergeTree.h
index 65e3158ace7..06829eade3f 100644
--- a/dbms/include/DB/Storages/StorageMergeTree.h
+++ b/dbms/src/Storages/StorageMergeTree.h
@@ -2,13 +2,13 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Storages/MergeTree/MergeTreeDataSelectExecutor.h>
-#include <DB/Storages/MergeTree/MergeTreeDataWriter.h>
-#include <DB/Storages/MergeTree/MergeTreeDataMerger.h>
-#include <DB/Storages/MergeTree/DiskSpaceMonitor.h>
-#include <DB/Storages/MergeTree/BackgroundProcessingPool.h>
-#include <DB/Common/Increment.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+#include <Storages/MergeTree/MergeTreeDataWriter.h>
+#include <Storages/MergeTree/MergeTreeDataMerger.h>
+#include <Storages/MergeTree/DiskSpaceMonitor.h>
+#include <Storages/MergeTree/BackgroundProcessingPool.h>
+#include <Common/Increment.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/StorageNull.h b/dbms/src/Storages/StorageNull.h
similarity index 92%
rename from dbms/include/DB/Storages/StorageNull.h
rename to dbms/src/Storages/StorageNull.h
index 5383aa34f84..d7c1efaab83 100644
--- a/dbms/include/DB/Storages/StorageNull.h
+++ b/dbms/src/Storages/StorageNull.h
@@ -2,10 +2,10 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Core/NamesAndTypes.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/DataStreams/NullBlockInputStream.h>
-#include <DB/DataStreams/NullBlockOutputStream.h>
+#include <Core/NamesAndTypes.h>
+#include <Storages/IStorage.h>
+#include <DataStreams/NullBlockInputStream.h>
+#include <DataStreams/NullBlockOutputStream.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageReplicatedMergeTree.cpp b/dbms/src/Storages/StorageReplicatedMergeTree.cpp
index 9f2064e2ba6..a6103422b10 100644
--- a/dbms/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/dbms/src/Storages/StorageReplicatedMergeTree.cpp
@@ -1,45 +1,45 @@
 #include <zkutil/Types.h>
 #include <zkutil/KeeperException.h>
 
-#include <DB/Core/FieldVisitors.h>
+#include <Core/FieldVisitors.h>
 
-#include <DB/Storages/ColumnsDescription.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
-#include <DB/Storages/MergeTree/MergeList.h>
-#include <DB/Storages/MergeTree/MergeTreeWhereOptimizer.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeAddress.h>
-#include <DB/Storages/MergeTree/ReshardingWorker.h>
+#include <Storages/ColumnsDescription.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
+#include <Storages/MergeTree/MergeList.h>
+#include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
+#include <Storages/MergeTree/ReshardingWorker.h>
 
-#include <DB/Databases/IDatabase.h>
+#include <Databases/IDatabase.h>
 
-#include <DB/Parsers/formatAST.h>
-#include <DB/Parsers/ASTInsertQuery.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/queryToString.h>
+#include <Parsers/formatAST.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/queryToString.h>
 
-#include <DB/IO/ReadBufferFromString.h>
-#include <DB/IO/Operators.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/Operators.h>
 
-#include <DB/Interpreters/InterpreterAlterQuery.h>
-#include <DB/Interpreters/PartLog.h>
+#include <Interpreters/InterpreterAlterQuery.h>
+#include <Interpreters/PartLog.h>
 
-#include <DB/DataStreams/AddingConstColumnBlockInputStream.h>
-#include <DB/DataStreams/RemoteBlockInputStream.h>
-#include <DB/DataStreams/NullBlockOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/AddingConstColumnBlockInputStream.h>
+#include <DataStreams/RemoteBlockInputStream.h>
+#include <DataStreams/NullBlockOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/Common/Macros.h>
-#include <DB/Common/VirtualColumnUtils.h>
-#include <DB/Common/formatReadable.h>
-#include <DB/Common/setThreadName.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Common/StringUtils.h>
+#include <Common/Macros.h>
+#include <Common/VirtualColumnUtils.h>
+#include <Common/formatReadable.h>
+#include <Common/setThreadName.h>
+#include <Common/escapeForFileName.h>
+#include <Common/StringUtils.h>
 
 #include <Poco/DirectoryIterator.h>
 
-#include <DB/Common/ThreadPool.h>
+#include <Common/ThreadPool.h>
 
 #include <ext/range.hpp>
 #include <ext/scope_guard.hpp>
diff --git a/dbms/include/DB/Storages/StorageReplicatedMergeTree.h b/dbms/src/Storages/StorageReplicatedMergeTree.h
similarity index 96%
rename from dbms/include/DB/Storages/StorageReplicatedMergeTree.h
rename to dbms/src/Storages/StorageReplicatedMergeTree.h
index 39c4a121481..93c3dc64f49 100644
--- a/dbms/include/DB/Storages/StorageReplicatedMergeTree.h
+++ b/dbms/src/Storages/StorageReplicatedMergeTree.h
@@ -2,25 +2,25 @@
 
 #include <ext/shared_ptr_helper.hpp>
 #include <atomic>
-#include <DB/Storages/IStorage.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Storages/MergeTree/MergeTreeDataMerger.h>
-#include <DB/Storages/MergeTree/MergeTreeDataWriter.h>
-#include <DB/Storages/MergeTree/MergeTreeDataSelectExecutor.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeQueue.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h>
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeAlterThread.h>
-#include <DB/Storages/MergeTree/AbandonableLockInZooKeeper.h>
-#include <DB/Storages/MergeTree/BackgroundProcessingPool.h>
-#include <DB/Storages/MergeTree/DataPartsExchange.h>
-#include <DB/Storages/MergeTree/RemoteDiskSpaceMonitor.h>
-#include <DB/Storages/MergeTree/ShardedPartitionUploader.h>
-#include <DB/Storages/MergeTree/RemoteQueryExecutor.h>
-#include <DB/Storages/MergeTree/RemotePartChecker.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <Storages/IStorage.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeDataMerger.h>
+#include <Storages/MergeTree/MergeTreeDataWriter.h>
+#include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h>
+#include <Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeAlterThread.h>
+#include <Storages/MergeTree/AbandonableLockInZooKeeper.h>
+#include <Storages/MergeTree/BackgroundProcessingPool.h>
+#include <Storages/MergeTree/DataPartsExchange.h>
+#include <Storages/MergeTree/RemoteDiskSpaceMonitor.h>
+#include <Storages/MergeTree/ShardedPartitionUploader.h>
+#include <Storages/MergeTree/RemoteQueryExecutor.h>
+#include <Storages/MergeTree/RemotePartChecker.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <zkutil/ZooKeeper.h>
 #include <zkutil/LeaderElection.h>
 
diff --git a/dbms/src/Storages/StorageSet.cpp b/dbms/src/Storages/StorageSet.cpp
index ca8deb03936..0697e2fe090 100644
--- a/dbms/src/Storages/StorageSet.cpp
+++ b/dbms/src/Storages/StorageSet.cpp
@@ -1,13 +1,13 @@
-#include <DB/Storages/StorageSet.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
-#include <DB/DataStreams/NativeBlockInputStream.h>
-#include <DB/Common/escapeForFileName.h>
-#include <DB/Common/StringUtils.h>
-#include <DB/Interpreters/Set.h>
+#include <Storages/StorageSet.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <DataStreams/NativeBlockOutputStream.h>
+#include <DataStreams/NativeBlockInputStream.h>
+#include <Common/escapeForFileName.h>
+#include <Common/StringUtils.h>
+#include <Interpreters/Set.h>
 #include <Poco/DirectoryIterator.h>
 
 
diff --git a/dbms/include/DB/Storages/StorageSet.h b/dbms/src/Storages/StorageSet.h
similarity index 98%
rename from dbms/include/DB/Storages/StorageSet.h
rename to dbms/src/Storages/StorageSet.h
index 88cd3c71625..30baf42f050 100644
--- a/dbms/include/DB/Storages/StorageSet.h
+++ b/dbms/src/Storages/StorageSet.h
@@ -2,7 +2,7 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageStripeLog.cpp b/dbms/src/Storages/StorageStripeLog.cpp
index 7a3626b060b..9b367d76775 100644
--- a/dbms/src/Storages/StorageStripeLog.cpp
+++ b/dbms/src/Storages/StorageStripeLog.cpp
@@ -7,31 +7,31 @@
 #include <Poco/Path.h>
 #include <Poco/Util/XMLConfiguration.h>
 
-#include <DB/Common/escapeForFileName.h>
+#include <Common/escapeForFileName.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedReadBufferFromFile.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedReadBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNested.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
-#include <DB/DataStreams/NativeBlockInputStream.h>
-#include <DB/DataStreams/NativeBlockOutputStream.h>
-#include <DB/DataStreams/NullBlockInputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
+#include <DataStreams/NativeBlockInputStream.h>
+#include <DataStreams/NativeBlockOutputStream.h>
+#include <DataStreams/NullBlockInputStream.h>
 
-#include <DB/Columns/ColumnArray.h>
+#include <Columns/ColumnArray.h>
 
-#include <DB/Interpreters/Settings.h>
+#include <Interpreters/Settings.h>
 
-#include <DB/Storages/StorageStripeLog.h>
+#include <Storages/StorageStripeLog.h>
 #include <Poco/DirectoryIterator.h>
 
 
diff --git a/dbms/include/DB/Storages/StorageStripeLog.h b/dbms/src/Storages/StorageStripeLog.h
similarity index 96%
rename from dbms/include/DB/Storages/StorageStripeLog.h
rename to dbms/src/Storages/StorageStripeLog.h
index d7ecd0deba3..39ca53bd2d5 100644
--- a/dbms/include/DB/Storages/StorageStripeLog.h
+++ b/dbms/src/Storages/StorageStripeLog.h
@@ -6,9 +6,9 @@
 
 #include <Poco/File.h>
 
-#include <DB/Storages/IStorage.h>
-#include <DB/Common/FileChecker.h>
-#include <DB/Common/escapeForFileName.h>
+#include <Storages/IStorage.h>
+#include <Common/FileChecker.h>
+#include <Common/escapeForFileName.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageTinyLog.cpp b/dbms/src/Storages/StorageTinyLog.cpp
index 1ed17c15202..a3e67142179 100644
--- a/dbms/src/Storages/StorageTinyLog.cpp
+++ b/dbms/src/Storages/StorageTinyLog.cpp
@@ -6,31 +6,31 @@
 #include <Poco/Path.h>
 #include <Poco/Util/XMLConfiguration.h>
 
-#include <DB/Common/escapeForFileName.h>
+#include <Common/escapeForFileName.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
 
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeNested.h>
-#include <DB/DataTypes/DataTypeNullable.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/DataStreams/IBlockOutputStream.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <DataStreams/IBlockOutputStream.h>
 
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnNullable.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnNullable.h>
 
-#include <DB/Interpreters/Settings.h>
+#include <Interpreters/Settings.h>
 
-#include <DB/Storages/StorageTinyLog.h>
+#include <Storages/StorageTinyLog.h>
 #include <Poco/DirectoryIterator.h>
 
 #define DBMS_STORAGE_LOG_DATA_FILE_EXTENSION     ".bin"
diff --git a/dbms/include/DB/Storages/StorageTinyLog.h b/dbms/src/Storages/StorageTinyLog.h
similarity index 96%
rename from dbms/include/DB/Storages/StorageTinyLog.h
rename to dbms/src/Storages/StorageTinyLog.h
index d7e5ee4171f..f012e282160 100644
--- a/dbms/include/DB/Storages/StorageTinyLog.h
+++ b/dbms/src/Storages/StorageTinyLog.h
@@ -6,9 +6,9 @@
 
 #include <Poco/File.h>
 
-#include <DB/Storages/IStorage.h>
-#include <DB/Common/FileChecker.h>
-#include <DB/Common/escapeForFileName.h>
+#include <Storages/IStorage.h>
+#include <Common/FileChecker.h>
+#include <Common/escapeForFileName.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/StorageView.cpp b/dbms/src/Storages/StorageView.cpp
index 95dbcd9bf9e..30858bdc78d 100644
--- a/dbms/src/Storages/StorageView.cpp
+++ b/dbms/src/Storages/StorageView.cpp
@@ -1,9 +1,9 @@
-#include <DB/Interpreters/InterpreterSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTCreateQuery.h>
-#include <DB/Parsers/ASTSelectQuery.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTSelectQuery.h>
 
-#include <DB/Storages/StorageView.h>
+#include <Storages/StorageView.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/StorageView.h b/dbms/src/Storages/StorageView.h
similarity index 96%
rename from dbms/include/DB/Storages/StorageView.h
rename to dbms/src/Storages/StorageView.h
index 2add74b1291..a6be51cdad5 100644
--- a/dbms/include/DB/Storages/StorageView.h
+++ b/dbms/src/Storages/StorageView.h
@@ -2,8 +2,8 @@
 
 #include <ext/shared_ptr_helper.hpp>
 
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Storages/IStorage.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemAsynchronousMetrics.cpp b/dbms/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
index 9a092d0cc74..ab8695b812c 100644
--- a/dbms/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
+++ b/dbms/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
@@ -1,11 +1,11 @@
-#include <DB/Storages/System/StorageSystemAsynchronousMetrics.h>
+#include <Storages/System/StorageSystemAsynchronousMetrics.h>
 
-#include <DB/Interpreters/AsynchronousMetrics.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
+#include <Interpreters/AsynchronousMetrics.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemAsynchronousMetrics.h b/dbms/src/Storages/System/StorageSystemAsynchronousMetrics.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemAsynchronousMetrics.h
rename to dbms/src/Storages/System/StorageSystemAsynchronousMetrics.h
index 9ba0cb62bdc..be6520764c1 100644
--- a/dbms/include/DB/Storages/System/StorageSystemAsynchronousMetrics.h
+++ b/dbms/src/Storages/System/StorageSystemAsynchronousMetrics.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemBuildOptions.cpp b/dbms/src/Storages/System/StorageSystemBuildOptions.cpp
index d0ca57cbd82..67e61014524 100644
--- a/dbms/src/Storages/System/StorageSystemBuildOptions.cpp
+++ b/dbms/src/Storages/System/StorageSystemBuildOptions.cpp
@@ -1,10 +1,10 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Storages/System/StorageSystemBuildOptions.h>
-#include <DB/Common/config_build.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Interpreters/Settings.h>
+#include <Storages/System/StorageSystemBuildOptions.h>
+#include <Common/config_build.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Storages/System/StorageSystemBuildOptions.h b/dbms/src/Storages/System/StorageSystemBuildOptions.h
similarity index 96%
rename from dbms/include/DB/Storages/System/StorageSystemBuildOptions.h
rename to dbms/src/Storages/System/StorageSystemBuildOptions.h
index d84e8180605..be3d6e64fa8 100644
--- a/dbms/include/DB/Storages/System/StorageSystemBuildOptions.h
+++ b/dbms/src/Storages/System/StorageSystemBuildOptions.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemClusters.cpp b/dbms/src/Storages/System/StorageSystemClusters.cpp
index 197792d2506..0011af8a178 100644
--- a/dbms/src/Storages/System/StorageSystemClusters.cpp
+++ b/dbms/src/Storages/System/StorageSystemClusters.cpp
@@ -1,11 +1,11 @@
-#include <DB/Storages/System/StorageSystemClusters.h>
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Interpreters/Context.h>
+#include <Storages/System/StorageSystemClusters.h>
+#include <Interpreters/Cluster.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Storages/System/StorageSystemClusters.h b/dbms/src/Storages/System/StorageSystemClusters.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemClusters.h
rename to dbms/src/Storages/System/StorageSystemClusters.h
index 1bec1008c99..2c90f5318a6 100644
--- a/dbms/include/DB/Storages/System/StorageSystemClusters.h
+++ b/dbms/src/Storages/System/StorageSystemClusters.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemColumns.cpp b/dbms/src/Storages/System/StorageSystemColumns.cpp
index 448cf6b17b8..0448bb35253 100644
--- a/dbms/src/Storages/System/StorageSystemColumns.cpp
+++ b/dbms/src/Storages/System/StorageSystemColumns.cpp
@@ -1,15 +1,15 @@
-#include <DB/Storages/System/StorageSystemColumns.h>
-#include <DB/Storages/MergeTree/MergeTreeData.h>
-#include <DB/Storages/StorageMergeTree.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Common/VirtualColumnUtils.h>
-#include <DB/Parsers/queryToString.h>
-#include <DB/Databases/IDatabase.h>
+#include <Storages/System/StorageSystemColumns.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/StorageMergeTree.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Common/VirtualColumnUtils.h>
+#include <Parsers/queryToString.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemColumns.h b/dbms/src/Storages/System/StorageSystemColumns.h
similarity index 96%
rename from dbms/include/DB/Storages/System/StorageSystemColumns.h
rename to dbms/src/Storages/System/StorageSystemColumns.h
index 0623bf1ff24..25639150c25 100644
--- a/dbms/include/DB/Storages/System/StorageSystemColumns.h
+++ b/dbms/src/Storages/System/StorageSystemColumns.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemDatabases.cpp b/dbms/src/Storages/System/StorageSystemDatabases.cpp
index 86a8f0ced3b..4e29edc2614 100644
--- a/dbms/src/Storages/System/StorageSystemDatabases.cpp
+++ b/dbms/src/Storages/System/StorageSystemDatabases.cpp
@@ -1,9 +1,9 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Databases/IDatabase.h>
-#include <DB/Storages/System/StorageSystemDatabases.h>
-#include <DB/Interpreters/Context.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Databases/IDatabase.h>
+#include <Storages/System/StorageSystemDatabases.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemDatabases.h b/dbms/src/Storages/System/StorageSystemDatabases.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemDatabases.h
rename to dbms/src/Storages/System/StorageSystemDatabases.h
index c05d35cb595..e16308121e4 100644
--- a/dbms/include/DB/Storages/System/StorageSystemDatabases.h
+++ b/dbms/src/Storages/System/StorageSystemDatabases.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemDictionaries.cpp b/dbms/src/Storages/System/StorageSystemDictionaries.cpp
index 6230ca901a0..2bdc9e66a3a 100644
--- a/dbms/src/Storages/System/StorageSystemDictionaries.cpp
+++ b/dbms/src/Storages/System/StorageSystemDictionaries.cpp
@@ -1,17 +1,17 @@
-#include <DB/Storages/System/StorageSystemDictionaries.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Dictionaries/IDictionary.h>
-#include <DB/Dictionaries/IDictionarySource.h>
-#include <DB/Dictionaries/DictionaryStructure.h>
-#include <DB/Interpreters/ExternalDictionaries.h>
+#include <Storages/System/StorageSystemDictionaries.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnArray.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Interpreters/Context.h>
+#include <Dictionaries/IDictionary.h>
+#include <Dictionaries/IDictionarySource.h>
+#include <Dictionaries/DictionaryStructure.h>
+#include <Interpreters/ExternalDictionaries.h>
 #include <ext/map.hpp>
 #include <mutex>
 
diff --git a/dbms/include/DB/Storages/System/StorageSystemDictionaries.h b/dbms/src/Storages/System/StorageSystemDictionaries.h
similarity index 96%
rename from dbms/include/DB/Storages/System/StorageSystemDictionaries.h
rename to dbms/src/Storages/System/StorageSystemDictionaries.h
index 2433c774a88..a854964a784 100644
--- a/dbms/include/DB/Storages/System/StorageSystemDictionaries.h
+++ b/dbms/src/Storages/System/StorageSystemDictionaries.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemEvents.cpp b/dbms/src/Storages/System/StorageSystemEvents.cpp
index 2673cb65988..d3d46f57d15 100644
--- a/dbms/src/Storages/System/StorageSystemEvents.cpp
+++ b/dbms/src/Storages/System/StorageSystemEvents.cpp
@@ -1,9 +1,9 @@
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Storages/System/StorageSystemEvents.h>
+#include <Common/ProfileEvents.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Storages/System/StorageSystemEvents.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemEvents.h b/dbms/src/Storages/System/StorageSystemEvents.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemEvents.h
rename to dbms/src/Storages/System/StorageSystemEvents.h
index 73691b537e2..2308a9775cb 100644
--- a/dbms/include/DB/Storages/System/StorageSystemEvents.h
+++ b/dbms/src/Storages/System/StorageSystemEvents.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemFunctions.cpp b/dbms/src/Storages/System/StorageSystemFunctions.cpp
index 4728476ea6c..e9c7075f11f 100644
--- a/dbms/src/Storages/System/StorageSystemFunctions.cpp
+++ b/dbms/src/Storages/System/StorageSystemFunctions.cpp
@@ -1,13 +1,13 @@
-#include <DB/Storages/System/StorageSystemFunctions.h>
-#include <DB/Functions/FunctionFactory.h>
-#include <DB/Functions/IFunction.h>
-#include <DB/AggregateFunctions/AggregateFunctionFactory.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Interpreters/Context.h>
+#include <Storages/System/StorageSystemFunctions.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemFunctions.h b/dbms/src/Storages/System/StorageSystemFunctions.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemFunctions.h
rename to dbms/src/Storages/System/StorageSystemFunctions.h
index e5778a92b6b..cf6150c2a51 100644
--- a/dbms/include/DB/Storages/System/StorageSystemFunctions.h
+++ b/dbms/src/Storages/System/StorageSystemFunctions.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemGraphite.cpp b/dbms/src/Storages/System/StorageSystemGraphite.cpp
index f894b43ca82..5d432d28d32 100644
--- a/dbms/src/Storages/System/StorageSystemGraphite.cpp
+++ b/dbms/src/Storages/System/StorageSystemGraphite.cpp
@@ -1,11 +1,11 @@
-#include <DB/Storages/System/StorageSystemGraphite.h>
+#include <Storages/System/StorageSystemGraphite.h>
 
-#include <DB/Core/Field.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <Core/Field.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
 
 #include <Poco/Util/Application.h>
 
diff --git a/dbms/include/DB/Storages/System/StorageSystemGraphite.h b/dbms/src/Storages/System/StorageSystemGraphite.h
similarity index 96%
rename from dbms/include/DB/Storages/System/StorageSystemGraphite.h
rename to dbms/src/Storages/System/StorageSystemGraphite.h
index b4d255a2aa7..08d21d97368 100644
--- a/dbms/include/DB/Storages/System/StorageSystemGraphite.h
+++ b/dbms/src/Storages/System/StorageSystemGraphite.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 #include <ext/shared_ptr_helper.hpp>
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemMerges.cpp b/dbms/src/Storages/System/StorageSystemMerges.cpp
index b746dc130f9..5c2745bcd35 100644
--- a/dbms/src/Storages/System/StorageSystemMerges.cpp
+++ b/dbms/src/Storages/System/StorageSystemMerges.cpp
@@ -1,11 +1,11 @@
-#include <DB/Storages/System/StorageSystemMerges.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Storages/MergeTree/MergeList.h>
+#include <Storages/System/StorageSystemMerges.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Columns/ColumnString.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Interpreters/Context.h>
+#include <Storages/MergeTree/MergeList.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemMerges.h b/dbms/src/Storages/System/StorageSystemMerges.h
similarity index 96%
rename from dbms/include/DB/Storages/System/StorageSystemMerges.h
rename to dbms/src/Storages/System/StorageSystemMerges.h
index 7d5ed6a8c86..a915af8c95a 100644
--- a/dbms/include/DB/Storages/System/StorageSystemMerges.h
+++ b/dbms/src/Storages/System/StorageSystemMerges.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemMetrics.cpp b/dbms/src/Storages/System/StorageSystemMetrics.cpp
index 6dd6eca494e..32ae6319f97 100644
--- a/dbms/src/Storages/System/StorageSystemMetrics.cpp
+++ b/dbms/src/Storages/System/StorageSystemMetrics.cpp
@@ -1,10 +1,10 @@
-#include <DB/Common/CurrentMetrics.h>
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Storages/System/StorageSystemMetrics.h>
+#include <Common/CurrentMetrics.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Storages/System/StorageSystemMetrics.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemMetrics.h b/dbms/src/Storages/System/StorageSystemMetrics.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemMetrics.h
rename to dbms/src/Storages/System/StorageSystemMetrics.h
index 032a72f3e4b..c858f1d4e37 100644
--- a/dbms/include/DB/Storages/System/StorageSystemMetrics.h
+++ b/dbms/src/Storages/System/StorageSystemMetrics.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemNumbers.cpp b/dbms/src/Storages/System/StorageSystemNumbers.cpp
index 01e507bdffd..1af8567471d 100644
--- a/dbms/src/Storages/System/StorageSystemNumbers.cpp
+++ b/dbms/src/Storages/System/StorageSystemNumbers.cpp
@@ -1,8 +1,8 @@
-#include <DB/Common/Exception.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/IProfilingBlockInputStream.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
+#include <Common/Exception.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/IProfilingBlockInputStream.h>
+#include <Storages/System/StorageSystemNumbers.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemNumbers.h b/dbms/src/Storages/System/StorageSystemNumbers.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemNumbers.h
rename to dbms/src/Storages/System/StorageSystemNumbers.h
index b5204c2603e..293621e6642 100644
--- a/dbms/include/DB/Storages/System/StorageSystemNumbers.h
+++ b/dbms/src/Storages/System/StorageSystemNumbers.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemOne.cpp b/dbms/src/Storages/System/StorageSystemOne.cpp
index 13b2e00e72a..34672debbac 100644
--- a/dbms/src/Storages/System/StorageSystemOne.cpp
+++ b/dbms/src/Storages/System/StorageSystemOne.cpp
@@ -1,9 +1,9 @@
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Storages/System/StorageSystemOne.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Storages/System/StorageSystemOne.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemOne.h b/dbms/src/Storages/System/StorageSystemOne.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemOne.h
rename to dbms/src/Storages/System/StorageSystemOne.h
index 0e49349f9d4..ec7085e9c48 100644
--- a/dbms/include/DB/Storages/System/StorageSystemOne.h
+++ b/dbms/src/Storages/System/StorageSystemOne.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemParts.cpp b/dbms/src/Storages/System/StorageSystemParts.cpp
index fb340390aa9..6c747f08075 100644
--- a/dbms/src/Storages/System/StorageSystemParts.cpp
+++ b/dbms/src/Storages/System/StorageSystemParts.cpp
@@ -1,14 +1,14 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Storages/System/StorageSystemParts.h>
-#include <DB/Storages/StorageMergeTree.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Common/VirtualColumnUtils.h>
-#include <DB/Databases/IDatabase.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Storages/System/StorageSystemParts.h>
+#include <Storages/StorageMergeTree.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Common/VirtualColumnUtils.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemParts.h b/dbms/src/Storages/System/StorageSystemParts.h
similarity index 96%
rename from dbms/include/DB/Storages/System/StorageSystemParts.h
rename to dbms/src/Storages/System/StorageSystemParts.h
index 92a72547825..e4d29064959 100644
--- a/dbms/include/DB/Storages/System/StorageSystemParts.h
+++ b/dbms/src/Storages/System/StorageSystemParts.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemProcesses.cpp b/dbms/src/Storages/System/StorageSystemProcesses.cpp
index 4832adb98b9..c5c26447495 100644
--- a/dbms/src/Storages/System/StorageSystemProcesses.cpp
+++ b/dbms/src/Storages/System/StorageSystemProcesses.cpp
@@ -1,10 +1,10 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Interpreters/ProcessList.h>
-#include <DB/Storages/System/StorageSystemProcesses.h>
-#include <DB/Interpreters/Context.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Interpreters/ProcessList.h>
+#include <Storages/System/StorageSystemProcesses.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemProcesses.h b/dbms/src/Storages/System/StorageSystemProcesses.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemProcesses.h
rename to dbms/src/Storages/System/StorageSystemProcesses.h
index 945732f3cab..11856c15911 100644
--- a/dbms/include/DB/Storages/System/StorageSystemProcesses.h
+++ b/dbms/src/Storages/System/StorageSystemProcesses.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemReplicas.cpp b/dbms/src/Storages/System/StorageSystemReplicas.cpp
index 1a0161b008d..8b236ec81af 100644
--- a/dbms/src/Storages/System/StorageSystemReplicas.cpp
+++ b/dbms/src/Storages/System/StorageSystemReplicas.cpp
@@ -1,12 +1,12 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Storages/System/StorageSystemReplicas.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Common/VirtualColumnUtils.h>
-#include <DB/Databases/IDatabase.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Storages/System/StorageSystemReplicas.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Common/VirtualColumnUtils.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemReplicas.h b/dbms/src/Storages/System/StorageSystemReplicas.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemReplicas.h
rename to dbms/src/Storages/System/StorageSystemReplicas.h
index 24e0cac2720..15aad000cec 100644
--- a/dbms/include/DB/Storages/System/StorageSystemReplicas.h
+++ b/dbms/src/Storages/System/StorageSystemReplicas.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemReplicationQueue.cpp b/dbms/src/Storages/System/StorageSystemReplicationQueue.cpp
index 37ede8719ea..f0823a8124a 100644
--- a/dbms/src/Storages/System/StorageSystemReplicationQueue.cpp
+++ b/dbms/src/Storages/System/StorageSystemReplicationQueue.cpp
@@ -1,15 +1,15 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnArray.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Storages/System/StorageSystemReplicationQueue.h>
-#include <DB/Storages/StorageReplicatedMergeTree.h>
-#include <DB/Common/VirtualColumnUtils.h>
-#include <DB/Databases/IDatabase.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Storages/System/StorageSystemReplicationQueue.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <Common/VirtualColumnUtils.h>
+#include <Databases/IDatabase.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemReplicationQueue.h b/dbms/src/Storages/System/StorageSystemReplicationQueue.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemReplicationQueue.h
rename to dbms/src/Storages/System/StorageSystemReplicationQueue.h
index 51d0908f7d9..ebed5db28d3 100644
--- a/dbms/include/DB/Storages/System/StorageSystemReplicationQueue.h
+++ b/dbms/src/Storages/System/StorageSystemReplicationQueue.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemSettings.cpp b/dbms/src/Storages/System/StorageSystemSettings.cpp
index 61a366a44a0..c36d194fe89 100644
--- a/dbms/src/Storages/System/StorageSystemSettings.cpp
+++ b/dbms/src/Storages/System/StorageSystemSettings.cpp
@@ -1,10 +1,10 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Interpreters/Settings.h>
-#include <DB/Storages/System/StorageSystemSettings.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Interpreters/Settings.h>
+#include <Storages/System/StorageSystemSettings.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemSettings.h b/dbms/src/Storages/System/StorageSystemSettings.h
similarity index 96%
rename from dbms/include/DB/Storages/System/StorageSystemSettings.h
rename to dbms/src/Storages/System/StorageSystemSettings.h
index 2f0fae248d1..6aed861477f 100644
--- a/dbms/include/DB/Storages/System/StorageSystemSettings.h
+++ b/dbms/src/Storages/System/StorageSystemSettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemTables.cpp b/dbms/src/Storages/System/StorageSystemTables.cpp
index 449a0726930..3bcb3cf9e6c 100644
--- a/dbms/src/Storages/System/StorageSystemTables.cpp
+++ b/dbms/src/Storages/System/StorageSystemTables.cpp
@@ -1,12 +1,12 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Storages/System/StorageSystemTables.h>
-#include <DB/Common/VirtualColumnUtils.h>
-#include <DB/Databases/IDatabase.h>
-#include <DB/Interpreters/Context.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Storages/System/StorageSystemTables.h>
+#include <Common/VirtualColumnUtils.h>
+#include <Databases/IDatabase.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/System/StorageSystemTables.h b/dbms/src/Storages/System/StorageSystemTables.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemTables.h
rename to dbms/src/Storages/System/StorageSystemTables.h
index 1aeff4d5867..09678625655 100644
--- a/dbms/include/DB/Storages/System/StorageSystemTables.h
+++ b/dbms/src/Storages/System/StorageSystemTables.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/StorageSystemZooKeeper.cpp b/dbms/src/Storages/System/StorageSystemZooKeeper.cpp
index 6816daa4fc1..8fdbe1b1b2e 100644
--- a/dbms/src/Storages/System/StorageSystemZooKeeper.cpp
+++ b/dbms/src/Storages/System/StorageSystemZooKeeper.cpp
@@ -1,16 +1,16 @@
-#include <DB/Columns/ColumnString.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
-#include <DB/DataStreams/OneBlockInputStream.h>
-#include <DB/Storages/System/StorageSystemZooKeeper.h>
-#include <DB/Parsers/ASTSelectQuery.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Interpreters/Context.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataStreams/OneBlockInputStream.h>
+#include <Storages/System/StorageSystemZooKeeper.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
+#include <Interpreters/Context.h>
 #include <zkutil/ZooKeeper.h>
 
 
diff --git a/dbms/include/DB/Storages/System/StorageSystemZooKeeper.h b/dbms/src/Storages/System/StorageSystemZooKeeper.h
similarity index 97%
rename from dbms/include/DB/Storages/System/StorageSystemZooKeeper.h
rename to dbms/src/Storages/System/StorageSystemZooKeeper.h
index 691c2fb697f..4431d7b5ea8 100644
--- a/dbms/include/DB/Storages/System/StorageSystemZooKeeper.h
+++ b/dbms/src/Storages/System/StorageSystemZooKeeper.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <ext/shared_ptr_helper.hpp>
-#include <DB/Storages/IStorage.h>
+#include <Storages/IStorage.h>
 
 
 namespace DB
diff --git a/dbms/src/Storages/System/attachSystemTables.cpp b/dbms/src/Storages/System/attachSystemTables.cpp
index 84130438d31..8a2e980c04b 100644
--- a/dbms/src/Storages/System/attachSystemTables.cpp
+++ b/dbms/src/Storages/System/attachSystemTables.cpp
@@ -1,25 +1,25 @@
-#include <DB/Storages/System/attachSystemTables.h>
+#include <Storages/System/attachSystemTables.h>
 
-#include <DB/Storages/System/StorageSystemAsynchronousMetrics.h>
-#include <DB/Storages/System/StorageSystemBuildOptions.h>
-#include <DB/Storages/System/StorageSystemClusters.h>
-#include <DB/Storages/System/StorageSystemColumns.h>
-#include <DB/Storages/System/StorageSystemDatabases.h>
-#include <DB/Storages/System/StorageSystemDictionaries.h>
-#include <DB/Storages/System/StorageSystemEvents.h>
-#include <DB/Storages/System/StorageSystemFunctions.h>
-#include <DB/Storages/System/StorageSystemGraphite.h>
-#include <DB/Storages/System/StorageSystemMerges.h>
-#include <DB/Storages/System/StorageSystemMetrics.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/Storages/System/StorageSystemOne.h>
-#include <DB/Storages/System/StorageSystemParts.h>
-#include <DB/Storages/System/StorageSystemProcesses.h>
-#include <DB/Storages/System/StorageSystemReplicas.h>
-#include <DB/Storages/System/StorageSystemReplicationQueue.h>
-#include <DB/Storages/System/StorageSystemSettings.h>
-#include <DB/Storages/System/StorageSystemTables.h>
-#include <DB/Storages/System/StorageSystemZooKeeper.h>
+#include <Storages/System/StorageSystemAsynchronousMetrics.h>
+#include <Storages/System/StorageSystemBuildOptions.h>
+#include <Storages/System/StorageSystemClusters.h>
+#include <Storages/System/StorageSystemColumns.h>
+#include <Storages/System/StorageSystemDatabases.h>
+#include <Storages/System/StorageSystemDictionaries.h>
+#include <Storages/System/StorageSystemEvents.h>
+#include <Storages/System/StorageSystemFunctions.h>
+#include <Storages/System/StorageSystemGraphite.h>
+#include <Storages/System/StorageSystemMerges.h>
+#include <Storages/System/StorageSystemMetrics.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <Storages/System/StorageSystemOne.h>
+#include <Storages/System/StorageSystemParts.h>
+#include <Storages/System/StorageSystemProcesses.h>
+#include <Storages/System/StorageSystemReplicas.h>
+#include <Storages/System/StorageSystemReplicationQueue.h>
+#include <Storages/System/StorageSystemSettings.h>
+#include <Storages/System/StorageSystemTables.h>
+#include <Storages/System/StorageSystemZooKeeper.h>
 
 namespace DB
 {
diff --git a/dbms/include/DB/Storages/System/attachSystemTables.h b/dbms/src/Storages/System/attachSystemTables.h
similarity index 90%
rename from dbms/include/DB/Storages/System/attachSystemTables.h
rename to dbms/src/Storages/System/attachSystemTables.h
index 7928f763a01..a11bad41120 100644
--- a/dbms/include/DB/Storages/System/attachSystemTables.h
+++ b/dbms/src/Storages/System/attachSystemTables.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Databases/IDatabase.h>
+#include <Databases/IDatabase.h>
 
 namespace DB
 {
diff --git a/dbms/src/Storages/VirtualColumnFactory.cpp b/dbms/src/Storages/VirtualColumnFactory.cpp
index 704094de5c1..4c0a2658674 100644
--- a/dbms/src/Storages/VirtualColumnFactory.cpp
+++ b/dbms/src/Storages/VirtualColumnFactory.cpp
@@ -1,6 +1,6 @@
-#include <DB/Storages/VirtualColumnFactory.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <Storages/VirtualColumnFactory.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/Storages/VirtualColumnFactory.h b/dbms/src/Storages/VirtualColumnFactory.h
similarity index 93%
rename from dbms/include/DB/Storages/VirtualColumnFactory.h
rename to dbms/src/Storages/VirtualColumnFactory.h
index 7a714b9256f..ace05ca72c0 100644
--- a/dbms/include/DB/Storages/VirtualColumnFactory.h
+++ b/dbms/src/Storages/VirtualColumnFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/DataTypes/IDataType.h>
+#include <DataTypes/IDataType.h>
 
 namespace DB
 {
diff --git a/dbms/src/Storages/tests/hit_log.cpp b/dbms/src/Storages/tests/hit_log.cpp
index 7be75ead746..aed297ad27a 100644
--- a/dbms/src/Storages/tests/hit_log.cpp
+++ b/dbms/src/Storages/tests/hit_log.cpp
@@ -2,23 +2,23 @@
 #include <list>
 #include <iostream>
 
-#include <DB/IO/ReadBufferFromIStream.h>
-#include <DB/IO/WriteBufferFromOStream.h>
+#include <IO/ReadBufferFromIStream.h>
+#include <IO/WriteBufferFromOStream.h>
 
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/DataTypes/DataTypeString.h>
-#include <DB/DataTypes/DataTypeFixedString.h>
-#include <DB/DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeDateTime.h>
 
-#include <DB/DataStreams/TabSeparatedRowInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/BlockInputStreamFromRowInputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/TabSeparatedRowInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/BlockInputStreamFromRowInputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/Storages/StorageLog.h>
+#include <Storages/StorageLog.h>
 
-#include <DB/Interpreters/Context.h>
+#include <Interpreters/Context.h>
 
 
 using namespace DB;
diff --git a/dbms/src/Storages/tests/merge_selector.cpp b/dbms/src/Storages/tests/merge_selector.cpp
index 9643c470879..843557d2ed9 100644
--- a/dbms/src/Storages/tests/merge_selector.cpp
+++ b/dbms/src/Storages/tests/merge_selector.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Storages/MergeTree/SimpleMergeSelector.h>
-#include <DB/Storages/MergeTree/LevelMergeSelector.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <Storages/MergeTree/SimpleMergeSelector.h>
+#include <Storages/MergeTree/LevelMergeSelector.h>
 
 
 /** This program tests merge-selecting algorithm.
diff --git a/dbms/src/Storages/tests/merge_selector2.cpp b/dbms/src/Storages/tests/merge_selector2.cpp
index fbdeba0a517..a85b39296a6 100644
--- a/dbms/src/Storages/tests/merge_selector2.cpp
+++ b/dbms/src/Storages/tests/merge_selector2.cpp
@@ -1,10 +1,10 @@
 #include <list>
 #include <iostream>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/Operators.h>
-#include <DB/Storages/MergeTree/SimpleMergeSelector.h>
-#include <DB/Storages/MergeTree/LevelMergeSelector.h>
-#include <DB/Common/formatReadable.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/Operators.h>
+#include <Storages/MergeTree/SimpleMergeSelector.h>
+#include <Storages/MergeTree/LevelMergeSelector.h>
+#include <Common/formatReadable.h>
 
 
 /** This program tests merge-selecting algorithm.
diff --git a/dbms/src/Storages/tests/merge_tree.cpp b/dbms/src/Storages/tests/merge_tree.cpp
index 34650abc7ad..1912e359e56 100644
--- a/dbms/src/Storages/tests/merge_tree.cpp
+++ b/dbms/src/Storages/tests/merge_tree.cpp
@@ -1,18 +1,18 @@
 #include <iostream>
 
-#include <DB/Storages/StorageMergeTree.h>
+#include <Storages/StorageMergeTree.h>
 
-#include <DB/DataTypes/DataTypeDate.h>
-#include <DB/DataTypes/DataTypeArray.h>
-#include <DB/DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
 
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
 
-#include <DB/Parsers/ExpressionListParsers.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/parseQuery.h>
+#include <Parsers/ExpressionListParsers.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/parseQuery.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Storages/tests/part_checker.cpp b/dbms/src/Storages/tests/part_checker.cpp
index 92ab107d998..2af7aad754b 100644
--- a/dbms/src/Storages/tests/part_checker.cpp
+++ b/dbms/src/Storages/tests/part_checker.cpp
@@ -1,5 +1,5 @@
 #include <Poco/ConsoleChannel.h>
-#include <DB/Storages/MergeTree/MergeTreePartChecker.h>
+#include <Storages/MergeTree/MergeTreePartChecker.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Storages/tests/part_name.cpp b/dbms/src/Storages/tests/part_name.cpp
index 57316441b7a..1e2058b2eb7 100644
--- a/dbms/src/Storages/tests/part_name.cpp
+++ b/dbms/src/Storages/tests/part_name.cpp
@@ -1,5 +1,5 @@
-#include <DB/IO/ReadHelpers.h>
-#include <DB/Storages/MergeTree/ActiveDataPartSet.h>
+#include <IO/ReadHelpers.h>
+#include <Storages/MergeTree/ActiveDataPartSet.h>
 #include <common/LocalDateTime.h>
 
 
diff --git a/dbms/src/Storages/tests/pk_condition.cpp b/dbms/src/Storages/tests/pk_condition.cpp
index 31aff2478a0..75b3c916d61 100644
--- a/dbms/src/Storages/tests/pk_condition.cpp
+++ b/dbms/src/Storages/tests/pk_condition.cpp
@@ -1,10 +1,10 @@
 #include <iostream>
-#include <DB/Storages/MergeTree/PKCondition.h>
-#include <DB/Parsers/ParserSelectQuery.h>
-#include <DB/Parsers/parseQuery.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Core/Block.h>
-#include <DB/Core/NamesAndTypes.h>
+#include <Storages/MergeTree/PKCondition.h>
+#include <Parsers/ParserSelectQuery.h>
+#include <Parsers/parseQuery.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Core/Block.h>
+#include <Core/NamesAndTypes.h>
 
 
 using namespace DB;
diff --git a/dbms/src/Storages/tests/remove_symlink_directory.cpp b/dbms/src/Storages/tests/remove_symlink_directory.cpp
index c99b8386327..8f61636076e 100644
--- a/dbms/src/Storages/tests/remove_symlink_directory.cpp
+++ b/dbms/src/Storages/tests/remove_symlink_directory.cpp
@@ -3,7 +3,7 @@
 
 #include <Poco/File.h>
 #include <Poco/Path.h>
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Storages/tests/row_source_bitwise_test.cpp b/dbms/src/Storages/tests/row_source_bitwise_test.cpp
index 761559127a7..66b281365a3 100644
--- a/dbms/src/Storages/tests/row_source_bitwise_test.cpp
+++ b/dbms/src/Storages/tests/row_source_bitwise_test.cpp
@@ -1,5 +1,5 @@
 #include <cstdlib>
-#include <DB/DataStreams/ColumnGathererStream.h>
+#include <DataStreams/ColumnGathererStream.h>
 using DB::RowSourcePart;
 
 static void check(const RowSourcePart & s, size_t num, bool flag)
diff --git a/dbms/src/Storages/tests/seek_speed_test.cpp b/dbms/src/Storages/tests/seek_speed_test.cpp
index 0f8d55fc6ef..bb06f7b95bf 100644
--- a/dbms/src/Storages/tests/seek_speed_test.cpp
+++ b/dbms/src/Storages/tests/seek_speed_test.cpp
@@ -1,6 +1,6 @@
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/WriteBufferFromFile.h>
-#include <DB/Common/Stopwatch.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/WriteBufferFromFile.h>
+#include <Common/Stopwatch.h>
 #include <Poco/File.h>
 #include <iostream>
 #include <iomanip>
diff --git a/dbms/src/Storages/tests/storage_log.cpp b/dbms/src/Storages/tests/storage_log.cpp
index f066be0977d..6cec4fb6497 100644
--- a/dbms/src/Storages/tests/storage_log.cpp
+++ b/dbms/src/Storages/tests/storage_log.cpp
@@ -1,14 +1,14 @@
 #include <iostream>
 
-#include <DB/IO/WriteBufferFromOStream.h>
-#include <DB/Storages/StorageLog.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Columns/ColumnsNumber.h>
-#include <DB/Interpreters/Context.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <Storages/StorageLog.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
+#include <Interpreters/Context.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/src/Storages/tests/system_numbers.cpp b/dbms/src/Storages/tests/system_numbers.cpp
index c76d9ba368b..afdb39271c6 100644
--- a/dbms/src/Storages/tests/system_numbers.cpp
+++ b/dbms/src/Storages/tests/system_numbers.cpp
@@ -1,13 +1,13 @@
 #include <iostream>
 
-#include <DB/IO/WriteBufferFromOStream.h>
-#include <DB/Storages/System/StorageSystemNumbers.h>
-#include <DB/DataStreams/LimitBlockInputStream.h>
-#include <DB/DataStreams/TabSeparatedRowOutputStream.h>
-#include <DB/DataStreams/BlockOutputStreamFromRowOutputStream.h>
-#include <DB/DataStreams/copyData.h>
-#include <DB/DataTypes/DataTypesNumber.h>
-#include <DB/Interpreters/Context.h>
+#include <IO/WriteBufferFromOStream.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <DataStreams/LimitBlockInputStream.h>
+#include <DataStreams/TabSeparatedRowOutputStream.h>
+#include <DataStreams/BlockOutputStreamFromRowOutputStream.h>
+#include <DataStreams/copyData.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context.h>
 
 
 int main(int argc, char ** argv)
diff --git a/dbms/include/DB/TableFunctions/ITableFunction.h b/dbms/src/TableFunctions/ITableFunction.h
similarity index 100%
rename from dbms/include/DB/TableFunctions/ITableFunction.h
rename to dbms/src/TableFunctions/ITableFunction.h
diff --git a/dbms/src/TableFunctions/TableFunctionFactory.cpp b/dbms/src/TableFunctions/TableFunctionFactory.cpp
index 97c7bd9a466..9d127909087 100644
--- a/dbms/src/TableFunctions/TableFunctionFactory.cpp
+++ b/dbms/src/TableFunctions/TableFunctionFactory.cpp
@@ -1,11 +1,11 @@
-#include <DB/Common/Exception.h>
-#include <DB/Interpreters/Context.h>
+#include <Common/Exception.h>
+#include <Interpreters/Context.h>
 
-#include <DB/TableFunctions/TableFunctionMerge.h>
-#include <DB/TableFunctions/TableFunctionRemote.h>
-#include <DB/TableFunctions/TableFunctionShardByHash.h>
+#include <TableFunctions/TableFunctionMerge.h>
+#include <TableFunctions/TableFunctionRemote.h>
+#include <TableFunctions/TableFunctionShardByHash.h>
 
-#include <DB/TableFunctions/TableFunctionFactory.h>
+#include <TableFunctions/TableFunctionFactory.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/TableFunctions/TableFunctionFactory.h b/dbms/src/TableFunctions/TableFunctionFactory.h
similarity index 85%
rename from dbms/include/DB/TableFunctions/TableFunctionFactory.h
rename to dbms/src/TableFunctions/TableFunctionFactory.h
index 078e1e6c829..760b4ec8478 100644
--- a/dbms/include/DB/TableFunctions/TableFunctionFactory.h
+++ b/dbms/src/TableFunctions/TableFunctionFactory.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/TableFunctions/ITableFunction.h>
+#include <TableFunctions/ITableFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/TableFunctions/TableFunctionMerge.cpp b/dbms/src/TableFunctions/TableFunctionMerge.cpp
index de57747d415..1b1fa5159ba 100644
--- a/dbms/src/TableFunctions/TableFunctionMerge.cpp
+++ b/dbms/src/TableFunctions/TableFunctionMerge.cpp
@@ -1,15 +1,15 @@
-#include <DB/Common/OptimizedRegularExpression.h>
+#include <Common/OptimizedRegularExpression.h>
 
-#include <DB/Storages/StorageMerge.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/TableFunctions/ITableFunction.h>
-#include <DB/Interpreters/evaluateConstantExpression.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Databases/IDatabase.h>
-#include <DB/TableFunctions/TableFunctionMerge.h>
+#include <Storages/StorageMerge.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <TableFunctions/ITableFunction.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/Context.h>
+#include <Databases/IDatabase.h>
+#include <TableFunctions/TableFunctionMerge.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/TableFunctions/TableFunctionMerge.h b/dbms/src/TableFunctions/TableFunctionMerge.h
similarity index 92%
rename from dbms/include/DB/TableFunctions/TableFunctionMerge.h
rename to dbms/src/TableFunctions/TableFunctionMerge.h
index 1bedd34d640..cc83554de58 100644
--- a/dbms/include/DB/TableFunctions/TableFunctionMerge.h
+++ b/dbms/src/TableFunctions/TableFunctionMerge.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/TableFunctions/ITableFunction.h>
+#include <TableFunctions/ITableFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/TableFunctions/TableFunctionRemote.cpp b/dbms/src/TableFunctions/TableFunctionRemote.cpp
index 3f51804afab..ecfcd850c7e 100644
--- a/dbms/src/TableFunctions/TableFunctionRemote.cpp
+++ b/dbms/src/TableFunctions/TableFunctionRemote.cpp
@@ -1,14 +1,14 @@
-#include <DB/TableFunctions/getStructureOfRemoteTable.h>
-#include <DB/Storages/StorageDistributed.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Parsers/ASTExpressionList.h>
-#include <DB/Interpreters/evaluateConstantExpression.h>
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Interpreters/Context.h>
+#include <TableFunctions/getStructureOfRemoteTable.h>
+#include <Storages/StorageDistributed.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTExpressionList.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/Cluster.h>
+#include <Interpreters/Context.h>
 
-#include <DB/TableFunctions/TableFunctionRemote.h>
+#include <TableFunctions/TableFunctionRemote.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/TableFunctions/TableFunctionRemote.h b/dbms/src/TableFunctions/TableFunctionRemote.h
similarity index 94%
rename from dbms/include/DB/TableFunctions/TableFunctionRemote.h
rename to dbms/src/TableFunctions/TableFunctionRemote.h
index eeb4200c824..5dfa61b3ff8 100644
--- a/dbms/include/DB/TableFunctions/TableFunctionRemote.h
+++ b/dbms/src/TableFunctions/TableFunctionRemote.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/TableFunctions/ITableFunction.h>
+#include <TableFunctions/ITableFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/TableFunctions/TableFunctionShardByHash.cpp b/dbms/src/TableFunctions/TableFunctionShardByHash.cpp
index 7dfcb1ec3db..d337bc0f03a 100644
--- a/dbms/src/TableFunctions/TableFunctionShardByHash.cpp
+++ b/dbms/src/TableFunctions/TableFunctionShardByHash.cpp
@@ -1,14 +1,14 @@
-#include <DB/TableFunctions/getStructureOfRemoteTable.h>
-#include <DB/Storages/StorageDistributed.h>
-#include <DB/Parsers/ASTIdentifier.h>
-#include <DB/Parsers/ASTLiteral.h>
-#include <DB/Parsers/ASTFunction.h>
-#include <DB/Interpreters/evaluateConstantExpression.h>
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/Interpreters/getClusterName.h>
-#include <DB/Common/SipHash.h>
-#include <DB/TableFunctions/TableFunctionShardByHash.h>
+#include <TableFunctions/getStructureOfRemoteTable.h>
+#include <Storages/StorageDistributed.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Interpreters/Cluster.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/getClusterName.h>
+#include <Common/SipHash.h>
+#include <TableFunctions/TableFunctionShardByHash.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/TableFunctions/TableFunctionShardByHash.h b/dbms/src/TableFunctions/TableFunctionShardByHash.h
similarity index 93%
rename from dbms/include/DB/TableFunctions/TableFunctionShardByHash.h
rename to dbms/src/TableFunctions/TableFunctionShardByHash.h
index 1ec02688558..26233c8a744 100644
--- a/dbms/include/DB/TableFunctions/TableFunctionShardByHash.h
+++ b/dbms/src/TableFunctions/TableFunctionShardByHash.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/TableFunctions/ITableFunction.h>
+#include <TableFunctions/ITableFunction.h>
 
 
 namespace DB
diff --git a/dbms/src/TableFunctions/getStructureOfRemoteTable.cpp b/dbms/src/TableFunctions/getStructureOfRemoteTable.cpp
index c95da5cfa42..c8f0ead3e89 100644
--- a/dbms/src/TableFunctions/getStructureOfRemoteTable.cpp
+++ b/dbms/src/TableFunctions/getStructureOfRemoteTable.cpp
@@ -1,11 +1,11 @@
-#include <DB/Interpreters/Cluster.h>
-#include <DB/Interpreters/Context.h>
-#include <DB/DataStreams/RemoteBlockInputStream.h>
-#include <DB/DataTypes/DataTypeFactory.h>
-#include <DB/Storages/IStorage.h>
-#include <DB/Parsers/IAST.h>
+#include <Interpreters/Cluster.h>
+#include <Interpreters/Context.h>
+#include <DataStreams/RemoteBlockInputStream.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <Storages/IStorage.h>
+#include <Parsers/IAST.h>
 
-#include <DB/TableFunctions/getStructureOfRemoteTable.h>
+#include <TableFunctions/getStructureOfRemoteTable.h>
 
 
 namespace DB
diff --git a/dbms/include/DB/TableFunctions/getStructureOfRemoteTable.h b/dbms/src/TableFunctions/getStructureOfRemoteTable.h
similarity index 93%
rename from dbms/include/DB/TableFunctions/getStructureOfRemoteTable.h
rename to dbms/src/TableFunctions/getStructureOfRemoteTable.h
index edbbb9c3f8a..4ebdfca6afb 100644
--- a/dbms/include/DB/TableFunctions/getStructureOfRemoteTable.h
+++ b/dbms/src/TableFunctions/getStructureOfRemoteTable.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <DB/Core/NamesAndTypes.h>
+#include <Core/NamesAndTypes.h>
 
 
 namespace DB
diff --git a/libs/libcommon/include/common/DateLUT.h b/libs/libcommon/include/common/DateLUT.h
index e193a2dd5fd..ce3d706fbe3 100644
--- a/libs/libcommon/include/common/DateLUT.h
+++ b/libs/libcommon/include/common/DateLUT.h
@@ -2,7 +2,7 @@
 
 #include <common/DateLUTImpl.h>
 #include <common/singleton.h>
-#include <DB/Core/Defines.h>
+#include <Core/Defines.h>
 
 #include <unordered_map>
 #include <atomic>
diff --git a/libs/libcommon/include/common/ErrorHandlers.h b/libs/libcommon/include/common/ErrorHandlers.h
index cdff6f71f7e..5114226930f 100644
--- a/libs/libcommon/include/common/ErrorHandlers.h
+++ b/libs/libcommon/include/common/ErrorHandlers.h
@@ -2,7 +2,7 @@
 
 #include <Poco/ErrorHandler.h>
 #include <common/logger_useful.h>
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 
 /** ErrorHandler для потоков, который в случае неперехваченного исключения,
diff --git a/libs/libcommon/include/common/JSON.h b/libs/libcommon/include/common/JSON.h
index 65adb4ff4d1..c0ca74daea9 100644
--- a/libs/libcommon/include/common/JSON.h
+++ b/libs/libcommon/include/common/JSON.h
@@ -2,7 +2,7 @@
 
 #include <typeinfo>
 #include <Poco/Exception.h>
-#include <DB/Core/StringRef.h>
+#include <Core/StringRef.h>
 #include <common/Common.h>
 
 
diff --git a/libs/libcommon/src/tests/multi_version.cpp b/libs/libcommon/src/tests/multi_version.cpp
index 341e8941877..0e5258b77aa 100644
--- a/libs/libcommon/src/tests/multi_version.cpp
+++ b/libs/libcommon/src/tests/multi_version.cpp
@@ -1,6 +1,6 @@
 #include <string.h>
 #include <iostream>
-#include <DB/Common/ThreadPool.h>
+#include <Common/ThreadPool.h>
 #include <functional>
 #include <common/MultiVersion.h>
 #include <Poco/Exception.h>
diff --git a/libs/libdaemon/include/daemon/BaseDaemon.h b/libs/libdaemon/include/daemon/BaseDaemon.h
index 89f71cb39cf..8050fbfc67a 100644
--- a/libs/libdaemon/include/daemon/BaseDaemon.h
+++ b/libs/libdaemon/include/daemon/BaseDaemon.h
@@ -22,7 +22,7 @@
 #include <common/Common.h>
 #include <common/logger_useful.h>
 #include <daemon/GraphiteWriter.h>
-#include <DB/Common/ConfigProcessor.h>
+#include <Common/ConfigProcessor.h>
 
 namespace Poco { class TaskManager; }
 
diff --git a/libs/libdaemon/include/daemon/OwnPatternFormatter.h b/libs/libdaemon/include/daemon/OwnPatternFormatter.h
index 450e59632e7..4fb468bd4aa 100644
--- a/libs/libdaemon/include/daemon/OwnPatternFormatter.h
+++ b/libs/libdaemon/include/daemon/OwnPatternFormatter.h
@@ -3,8 +3,8 @@
 
 #include <Poco/PatternFormatter.h>
 #include <Poco/Ext/ThreadNumber.h>
-#include <DB/IO/WriteBufferFromString.h>
-#include <DB/IO/WriteHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
 #include <daemon/BaseDaemon.h>
 
 #include <experimental/optional>
diff --git a/libs/libdaemon/src/BaseDaemon.cpp b/libs/libdaemon/src/BaseDaemon.cpp
index 72adb373ced..907ad76cb57 100644
--- a/libs/libdaemon/src/BaseDaemon.cpp
+++ b/libs/libdaemon/src/BaseDaemon.cpp
@@ -1,6 +1,6 @@
 #include <daemon/BaseDaemon.h>
 
-#include <DB/Common/ConfigProcessor.h>
+#include <Common/ConfigProcessor.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -44,13 +44,13 @@
 #include <Poco/NumberFormatter.h>
 #include <Poco/Condition.h>
 #include <Poco/SyslogChannel.h>
-#include <DB/Common/Exception.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/Common/getMultipleKeysFromConfig.h>
-#include <DB/Common/ClickHouseRevision.h>
+#include <Common/Exception.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/getMultipleKeysFromConfig.h>
+#include <Common/ClickHouseRevision.h>
 #include <daemon/OwnPatternFormatter.h>
 
 using Poco::Logger;
diff --git a/libs/libdaemon/src/GraphiteWriter.cpp b/libs/libdaemon/src/GraphiteWriter.cpp
index aaec97726f0..9ec09e486bc 100644
--- a/libs/libdaemon/src/GraphiteWriter.cpp
+++ b/libs/libdaemon/src/GraphiteWriter.cpp
@@ -2,7 +2,7 @@
 #include <daemon/BaseDaemon.h>
 #include <Poco/Util/LayeredConfiguration.h>
 #include <Poco/Util/Application.h>
-#include <DB/Common/getFQDNOrHostName.h>
+#include <Common/getFQDNOrHostName.h>
 
 #include <mutex>
 #include <iomanip>
diff --git a/libs/libzkutil/include/zkutil/KeeperException.h b/libs/libzkutil/include/zkutil/KeeperException.h
index 1024e9c3a77..6be13633b3e 100644
--- a/libs/libzkutil/include/zkutil/KeeperException.h
+++ b/libs/libzkutil/include/zkutil/KeeperException.h
@@ -1,7 +1,7 @@
 #pragma once
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 #include <zkutil/Types.h>
-#include <DB/Common/ProfileEvents.h>
+#include <Common/ProfileEvents.h>
 
 
 namespace DB
diff --git a/libs/libzkutil/include/zkutil/LeaderElection.h b/libs/libzkutil/include/zkutil/LeaderElection.h
index b87bd444aa1..a5480f131fd 100644
--- a/libs/libzkutil/include/zkutil/LeaderElection.h
+++ b/libs/libzkutil/include/zkutil/LeaderElection.h
@@ -4,7 +4,7 @@
 #include <functional>
 #include <memory>
 #include <common/logger_useful.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/CurrentMetrics.h>
 
 
 namespace ProfileEvents
diff --git a/libs/libzkutil/include/zkutil/Lock.h b/libs/libzkutil/include/zkutil/Lock.h
index 416d7f4e7aa..c53d7d02569 100644
--- a/libs/libzkutil/include/zkutil/Lock.h
+++ b/libs/libzkutil/include/zkutil/Lock.h
@@ -2,7 +2,7 @@
 
 #include <zkutil/ZooKeeperHolder.h>
 #include <common/logger_useful.h>
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
 namespace zkutil
 {
diff --git a/libs/libzkutil/include/zkutil/RWLock.h b/libs/libzkutil/include/zkutil/RWLock.h
index eb6895f8d59..b9bd354bf1d 100644
--- a/libs/libzkutil/include/zkutil/RWLock.h
+++ b/libs/libzkutil/include/zkutil/RWLock.h
@@ -2,7 +2,7 @@
 
 #include <zkutil/ZooKeeper.h>
 #include <zkutil/Common.h>
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 #include <Poco/Event.h>
 #include <string>
 #include <type_traits>
diff --git a/libs/libzkutil/include/zkutil/ZooKeeper.h b/libs/libzkutil/include/zkutil/ZooKeeper.h
index 767bcc5da3c..c414f99af23 100644
--- a/libs/libzkutil/include/zkutil/ZooKeeper.h
+++ b/libs/libzkutil/include/zkutil/ZooKeeper.h
@@ -9,8 +9,8 @@
 #include <mutex>
 #include <string>
 #include <common/logger_useful.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/CurrentMetrics.h>
+#include <Common/ProfileEvents.h>
+#include <Common/CurrentMetrics.h>
 
 
 namespace ProfileEvents
diff --git a/libs/libzkutil/src/RWLock.cpp b/libs/libzkutil/src/RWLock.cpp
index e4e825e0b81..4dcd015c6b7 100644
--- a/libs/libzkutil/src/RWLock.cpp
+++ b/libs/libzkutil/src/RWLock.cpp
@@ -1,5 +1,5 @@
 #include <zkutil/RWLock.h>
-#include <DB/Common/StringUtils.h>
+#include <Common/StringUtils.h>
 #include <algorithm>
 #include <iterator>
 
diff --git a/libs/libzkutil/src/SingleBarrier.cpp b/libs/libzkutil/src/SingleBarrier.cpp
index f2288334929..28af15a1606 100644
--- a/libs/libzkutil/src/SingleBarrier.cpp
+++ b/libs/libzkutil/src/SingleBarrier.cpp
@@ -1,9 +1,9 @@
 #include <zkutil/SingleBarrier.h>
 #include <zkutil/RWLock.h>
-#include <DB/Common/getFQDNOrHostName.h>
-#include <DB/Common/Exception.h>
-#include <DB/Common/Stopwatch.h>
-#include <DB/IO/WriteHelpers.h>
+#include <Common/getFQDNOrHostName.h>
+#include <Common/Exception.h>
+#include <Common/Stopwatch.h>
+#include <IO/WriteHelpers.h>
 
 namespace DB
 {
diff --git a/libs/libzkutil/src/ZooKeeper.cpp b/libs/libzkutil/src/ZooKeeper.cpp
index 85c6dd1b93e..8db8ab76478 100644
--- a/libs/libzkutil/src/ZooKeeper.cpp
+++ b/libs/libzkutil/src/ZooKeeper.cpp
@@ -1,8 +1,8 @@
 #include <functional>
 #include <zkutil/ZooKeeper.h>
 #include <common/logger_useful.h>
-#include <DB/Common/ProfileEvents.h>
-#include <DB/Common/StringUtils.h>
+#include <Common/ProfileEvents.h>
+#include <Common/StringUtils.h>
 
 
 namespace ProfileEvents
diff --git a/libs/libzkutil/src/tests/zk_many_watches_reconnect.cpp b/libs/libzkutil/src/tests/zk_many_watches_reconnect.cpp
index 9ca7d500325..b11e81cf9a7 100644
--- a/libs/libzkutil/src/tests/zk_many_watches_reconnect.cpp
+++ b/libs/libzkutil/src/tests/zk_many_watches_reconnect.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/ConfigProcessor.h>
+#include <Common/ConfigProcessor.h>
 #include <zkutil/ZooKeeper.h>
 #include <Poco/Event.h>
 #include <iostream>
diff --git a/libs/libzkutil/src/tests/zkutil_test.cpp b/libs/libzkutil/src/tests/zkutil_test.cpp
index d0808aab6cc..b7682163aa6 100644
--- a/libs/libzkutil/src/tests/zkutil_test.cpp
+++ b/libs/libzkutil/src/tests/zkutil_test.cpp
@@ -5,8 +5,8 @@
 #include <Poco/ConsoleChannel.h>
 #include <common/logger_useful.h>
 #include <common/readline_use.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromString.h>
 
 
 void printStat(const zkutil::Stat & s)
diff --git a/libs/libzkutil/src/tests/zkutil_test_async.cpp b/libs/libzkutil/src/tests/zkutil_test_async.cpp
index dff3e9daaec..5713526ecd2 100644
--- a/libs/libzkutil/src/tests/zkutil_test_async.cpp
+++ b/libs/libzkutil/src/tests/zkutil_test_async.cpp
@@ -1,5 +1,5 @@
 #include <zkutil/ZooKeeper.h>
-#include <DB/IO/ReadHelpers.h>
+#include <IO/ReadHelpers.h>
 
 
 int main(int argc, char ** argv)
diff --git a/utils/check-marks/main.cpp b/utils/check-marks/main.cpp
index a74e5c00092..63e785b8e9d 100644
--- a/utils/check-marks/main.cpp
+++ b/utils/check-marks/main.cpp
@@ -2,14 +2,14 @@
 
 #include <boost/program_options.hpp>
 
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/Operators.h>
-#include <DB/IO/ReadBufferFromFile.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/CompressedReadBufferFromFile.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/Operators.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/CompressedReadBufferFromFile.h>
 
 
 /** This program checks correctness of .mrk (marks) file for corresponding compressed .bin file.
diff --git a/utils/compressor/main.cpp b/utils/compressor/main.cpp
index 5c5da6cf1a4..a71773a30a1 100644
--- a/utils/compressor/main.cpp
+++ b/utils/compressor/main.cpp
@@ -2,13 +2,13 @@
 
 #include <boost/program_options.hpp>
 
-#include <DB/Common/Exception.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/CompressedWriteBuffer.h>
-#include <DB/IO/CompressedReadBuffer.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/copyData.h>
+#include <Common/Exception.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/CompressedWriteBuffer.h>
+#include <IO/CompressedReadBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/copyData.h>
 
 
 namespace DB
diff --git a/utils/config-processor/config-processor.cpp b/utils/config-processor/config-processor.cpp
index 286d8d9913d..b22f37a9f9d 100644
--- a/utils/config-processor/config-processor.cpp
+++ b/utils/config-processor/config-processor.cpp
@@ -1,4 +1,4 @@
-#include <DB/Common/ConfigProcessor.h>
+#include <Common/ConfigProcessor.h>
 #include <iostream>
 
 int main(int argc, char ** argv)
diff --git a/utils/corrector_utf8/CMakeLists.txt b/utils/corrector_utf8/CMakeLists.txt
index 3c10689e94c..2c5ece765f9 100644
--- a/utils/corrector_utf8/CMakeLists.txt
+++ b/utils/corrector_utf8/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories (${ClickHouse_SOURCE_DIR}/dbms/include)
+include_directories (${ClickHouse_SOURCE_DIR}/dbms/src)
 
 add_executable(corrector_utf8 corrector_utf8.cpp)
 
diff --git a/utils/corrector_utf8/corrector_utf8.cpp b/utils/corrector_utf8/corrector_utf8.cpp
index f0e4cd60ca1..4f443874c3c 100644
--- a/utils/corrector_utf8/corrector_utf8.cpp
+++ b/utils/corrector_utf8/corrector_utf8.cpp
@@ -1,9 +1,9 @@
 #include <iostream>
 
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferValidUTF8.h>
-#include <DB/IO/copyData.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferValidUTF8.h>
+#include <IO/copyData.h>
 
 int main(int argc, char **argv)
 {
diff --git a/utils/fill-factor/main.cpp b/utils/fill-factor/main.cpp
index 510fb7be292..1581cbfba15 100644
--- a/utils/fill-factor/main.cpp
+++ b/utils/fill-factor/main.cpp
@@ -7,7 +7,7 @@
 
 #include <common/Common.h>
 #include <Poco/NumberParser.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
 
 /** Считает количество нулей в файле.
   * Выводит "заполненность" файла - отношение количества ненулевых байт к ожидаемому количеству ненулевых байт в файле со случайными байтами.
diff --git a/utils/iotest/CMakeLists.txt b/utils/iotest/CMakeLists.txt
index 0a1313ed1f1..9c1bb50cb2c 100644
--- a/utils/iotest/CMakeLists.txt
+++ b/utils/iotest/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories (${ClickHouse_SOURCE_DIR}/dbms/include)
+include_directories (${ClickHouse_SOURCE_DIR}/dbms/src)
 include_directories (${ClickHouse_SOURCE_DIR}/libs/libcommon/include)
 
 add_executable (iotest iotest.cpp ${SRCS})
diff --git a/utils/iotest/iotest.cpp b/utils/iotest/iotest.cpp
index 7b75a82aebf..e5673eea7db 100644
--- a/utils/iotest/iotest.cpp
+++ b/utils/iotest/iotest.cpp
@@ -12,10 +12,10 @@
 #include <Poco/NumberFormatter.h>
 #include <Poco/Exception.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/Common/ThreadPool.h>
-#include <DB/Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
 
 #include <cstdlib>
 
diff --git a/utils/iotest/iotest_aio.cpp b/utils/iotest/iotest_aio.cpp
index 272736b294e..c9157920077 100644
--- a/utils/iotest/iotest_aio.cpp
+++ b/utils/iotest/iotest_aio.cpp
@@ -11,10 +11,10 @@
 #include <Poco/NumberFormatter.h>
 #include <Poco/Exception.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/Common/ThreadPool.h>
-#include <DB/Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
 
 #include <stdlib.h>
 #if !defined(__APPLE__) && !defined(__FreeBSD__)
diff --git a/utils/iotest/iotest_nonblock.cpp b/utils/iotest/iotest_nonblock.cpp
index 1524d4e6748..814f725db05 100644
--- a/utils/iotest/iotest_nonblock.cpp
+++ b/utils/iotest/iotest_nonblock.cpp
@@ -18,10 +18,10 @@
 #include <Poco/NumberFormatter.h>
 #include <Poco/Exception.h>
 
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 
-#include <DB/Common/ThreadPool.h>
-#include <DB/Common/Stopwatch.h>
+#include <Common/ThreadPool.h>
+#include <Common/Stopwatch.h>
 
 #ifdef __APPLE__
 #include <common/apple_rt.h>
diff --git a/utils/wikistat-loader/main.cpp b/utils/wikistat-loader/main.cpp
index e92e3514e74..21d6d6a2d71 100644
--- a/utils/wikistat-loader/main.cpp
+++ b/utils/wikistat-loader/main.cpp
@@ -1,11 +1,11 @@
 #include <boost/program_options.hpp>
 
-#include <DB/IO/ReadBuffer.h>
-#include <DB/IO/WriteBuffer.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/WriteHelpers.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
-#include <DB/IO/WriteBufferFromFileDescriptor.h>
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
 
 
 /** Reads uncompressed wikistat data from stdin,
diff --git a/utils/zookeeper-create-entry-to-download-part/main.cpp b/utils/zookeeper-create-entry-to-download-part/main.cpp
index c752a1274ad..c5174b954ef 100644
--- a/utils/zookeeper-create-entry-to-download-part/main.cpp
+++ b/utils/zookeeper-create-entry-to-download-part/main.cpp
@@ -1,4 +1,4 @@
-#include <DB/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
+#include <Storages/MergeTree/ReplicatedMergeTreeLogEntry.h>
 #include <zkutil/ZooKeeper.h>
 #include <boost/program_options.hpp>
 
diff --git a/utils/zookeeper-dump-tree/main.cpp b/utils/zookeeper-dump-tree/main.cpp
index 7e5fdea2bbe..d88b01060ee 100644
--- a/utils/zookeeper-dump-tree/main.cpp
+++ b/utils/zookeeper-dump-tree/main.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <boost/program_options.hpp>
-#include <DB/Common/Exception.h>
+#include <Common/Exception.h>
 #include <Poco/Event.h>
 #include <zkutil/ZooKeeper.h>
 
diff --git a/utils/zookeeper-remove-by-list/main.cpp b/utils/zookeeper-remove-by-list/main.cpp
index ed6222557db..b03890e23c3 100644
--- a/utils/zookeeper-remove-by-list/main.cpp
+++ b/utils/zookeeper-remove-by-list/main.cpp
@@ -1,6 +1,6 @@
 #include <zkutil/ZooKeeper.h>
-#include <DB/IO/ReadHelpers.h>
-#include <DB/IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
 #include <boost/program_options.hpp>