Fix include path for coding

130 files changed, 532 insertions, 532 deletions

diff --git a/coding/arithmetic_codec.cpp b/coding/arithmetic_codec.cpp
index d179540b9e..c659120eaf 100644
--- a/coding/arithmetic_codec.cpp
+++ b/coding/arithmetic_codec.cpp
@@ -1,10 +1,10 @@
-#include "arithmetic_codec.hpp"
+#include "coding/arithmetic_codec.hpp"
 
-#include "writer.hpp"
-#include "reader.hpp"
+#include "coding/writer.hpp"
+#include "coding/reader.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/bits.hpp"
+#include "base/assert.hpp"
+#include "base/bits.hpp"
 
 vector<uint32_t> FreqsToDistrTable(vector<uint32_t> const & origFreqs)
 {
diff --git a/coding/arithmetic_codec.hpp b/coding/arithmetic_codec.hpp
index 5f7d9cee23..6092a362c6 100644
--- a/coding/arithmetic_codec.hpp
+++ b/coding/arithmetic_codec.hpp
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include "../std/stdint.hpp"
-#include "../std/vector.hpp"
+#include "std/stdint.hpp"
+#include "std/vector.hpp"
 
 // Forward declarations.
 class Reader;
diff --git a/coding/base64.cpp b/coding/base64.cpp
index 9d241ad361..3ad61ebd6e 100644
--- a/coding/base64.cpp
+++ b/coding/base64.cpp
@@ -1,8 +1,8 @@
-#include "base64.hpp"
+#include "coding/base64.hpp"
 
-#include "../3party/tomcrypt/src/headers/tomcrypt.h"
-#include "../3party/tomcrypt/src/headers/tomcrypt_misc.h"
-#include "../base/assert.hpp"
+#include "3party/tomcrypt/src/headers/tomcrypt.h"
+#include "3party/tomcrypt/src/headers/tomcrypt_misc.h"
+#include "base/assert.hpp"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wreorder"
diff --git a/coding/base64.hpp b/coding/base64.hpp
index 5ae58c69ed..c73f24ed40 100644
--- a/coding/base64.hpp
+++ b/coding/base64.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../std/vector.hpp"
-#include "../std/string.hpp"
+#include "std/vector.hpp"
+#include "std/string.hpp"
 
 namespace base64
 {
diff --git a/coding/bit_shift.hpp b/coding/bit_shift.hpp
index 134241a8da..7d90a547d0 100644
--- a/coding/bit_shift.hpp
+++ b/coding/bit_shift.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/limits.hpp"
+#include "std/limits.hpp"
 
 namespace bits
 {
diff --git a/coding/bit_streams.cpp b/coding/bit_streams.cpp
index 31ea921b5a..c10547e50a 100644
--- a/coding/bit_streams.cpp
+++ b/coding/bit_streams.cpp
@@ -1,7 +1,7 @@
-#include "bit_streams.hpp"
+#include "coding/bit_streams.hpp"
 
-#include "reader.hpp"
-#include "writer.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
 BitSink::BitSink(Writer & writer)
   : m_writer(writer), m_lastByte(0), m_size(0) {}
diff --git a/coding/bit_streams.hpp b/coding/bit_streams.hpp
index 9ba330d3d9..d5e6681d9d 100644
--- a/coding/bit_streams.hpp
+++ b/coding/bit_streams.hpp
@@ -3,7 +3,7 @@
 
 #pragma once
 
-#include "../std/stdint.hpp"
+#include "std/stdint.hpp"
 
 // Forward declarations.
 class Reader;
diff --git a/coding/blob_indexer.cpp b/coding/blob_indexer.cpp
index f57ae611d9..e81db54303 100644
--- a/coding/blob_indexer.cpp
+++ b/coding/blob_indexer.cpp
@@ -1,11 +1,11 @@
-#include "blob_indexer.hpp"
+#include "coding/blob_indexer.hpp"
 
 /*
-#include "../coding/writer.hpp"
-#include "../coding/write_to_sink.hpp"
+#include "coding/writer.hpp"
+#include "coding/write_to_sink.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/logging.hpp"
+#include "base/assert.hpp"
+#include "base/logging.hpp"
 
 
 BlobIndexer::BlobIndexer(Writer & writer,
diff --git a/coding/blob_indexer.hpp b/coding/blob_indexer.hpp
index 6f131cc87e..6b619d5d5f 100644
--- a/coding/blob_indexer.hpp
+++ b/coding/blob_indexer.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
 /*
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/function.hpp"
-#include "../std/string.hpp"
-#include "../std/vector.hpp"
+#include "std/function.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 
 
 class Writer;
diff --git a/coding/blob_storage.cpp b/coding/blob_storage.cpp
index 6bc904933e..0cd0d68a50 100644
--- a/coding/blob_storage.cpp
+++ b/coding/blob_storage.cpp
@@ -1,7 +1,7 @@
-#include "blob_storage.hpp"
+#include "coding/blob_storage.hpp"
 
 /*
-#include "reader.hpp"
+#include "coding/reader.hpp"
 
 // File Format:
 // Blobs are grouped together in chunks and then chunks are compressed.
diff --git a/coding/blob_storage.hpp b/coding/blob_storage.hpp
index cbf76adbdb..3e9ecd18de 100644
--- a/coding/blob_storage.hpp
+++ b/coding/blob_storage.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
 /*
-#include "dd_vector.hpp"
-#include "polymorph_reader.hpp"
-#include "../std/function.hpp"
-#include "../std/unique_ptr.hpp"
-#include "../std/string.hpp"
-#include "../base/base.hpp"
-#include "../base/exception.hpp"
+#include "coding/dd_vector.hpp"
+#include "coding/polymorph_reader.hpp"
+#include "std/function.hpp"
+#include "std/unique_ptr.hpp"
+#include "std/string.hpp"
+#include "base/base.hpp"
+#include "base/exception.hpp"
 
 class Reader;
 
diff --git a/coding/buffer_reader.hpp b/coding/buffer_reader.hpp
index 929c6d115b..8c99d644d1 100644
--- a/coding/buffer_reader.hpp
+++ b/coding/buffer_reader.hpp
@@ -1,7 +1,7 @@
-#include "reader.hpp"
+#include "coding/reader.hpp"
 
-#include "../std/shared_ptr.hpp"
-#include "../std/cstring.hpp"
+#include "std/shared_ptr.hpp"
+#include "std/cstring.hpp"
 
 
 /// Reader from buffer with ownership on it, but cheap copy constructor.
diff --git a/coding/byte_stream.hpp b/coding/byte_stream.hpp
index a1cd12ff22..9d145b6a4c 100644
--- a/coding/byte_stream.hpp
+++ b/coding/byte_stream.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/cstring.hpp"
+#include "std/vector.hpp"
+#include "std/cstring.hpp"
 
 
 class ArrayByteSource
diff --git a/coding/bzip2_compressor.cpp b/coding/bzip2_compressor.cpp
index ab08fab27b..3f81988a20 100644
--- a/coding/bzip2_compressor.cpp
+++ b/coding/bzip2_compressor.cpp
@@ -1,11 +1,11 @@
-#include "bzip2_compressor.hpp"
-#include "coder_util.hpp"
+#include "coding/bzip2_compressor.hpp"
+#include "coding/coder_util.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/vector.hpp"
+#include "std/vector.hpp"
 
-#include "../3party/bzip2/bzlib.h"
+#include "3party/bzip2/bzlib.h"
 
 size_t DecompressBZip2IntoFixedSize(char const * pSrc, size_t srcSize, char * pDst, size_t dstSize)
 {
diff --git a/coding/bzip2_compressor.hpp b/coding/bzip2_compressor.hpp
index b94da4a68b..0f56646103 100644
--- a/coding/bzip2_compressor.hpp
+++ b/coding/bzip2_compressor.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "coder.hpp"
-#include "../base/base.hpp"
-#include "../base/exception.hpp"
+#include "coding/coder.hpp"
+#include "base/base.hpp"
+#include "base/exception.hpp"
 
 DECLARE_EXCEPTION(CompressBZip2Exception, StringCodingException);
 DECLARE_EXCEPTION(DecompressBZip2Exception, StringCodingException);
diff --git a/coding/coder.hpp b/coding/coder.hpp
index b5494d1969..f45d09c1bd 100644
--- a/coding/coder.hpp
+++ b/coding/coder.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "../base/exception.hpp"
+#include "base/exception.hpp"
 
 DECLARE_EXCEPTION(StringCodingException, RootException);
 DECLARE_EXCEPTION(DstOutOfMemoryStringCodingException, StringCodingException);
diff --git a/coding/coder_util.hpp b/coding/coder_util.hpp
index 0cf4b3b174..a29c88a65c 100644
--- a/coding/coder_util.hpp
+++ b/coding/coder_util.hpp
@@ -1,8 +1,8 @@
 #pragma once
-#include "coder.hpp"
-#include "../base/base.hpp"
-#include "../base/exception.hpp"
-#include "../std/string.hpp"
+#include "coding/coder.hpp"
+#include "base/base.hpp"
+#include "base/exception.hpp"
+#include "std/string.hpp"
 
 template <typename FixedSizeCoderT, typename SrcCharT>
 void FixedDstSizeCodeToString(FixedSizeCoderT coder, SrcCharT * pSrc, size_t srcSize, string & dst)
diff --git a/coding/coding_tests/arithmetic_codec_test.cpp b/coding/coding_tests/arithmetic_codec_test.cpp
index 61eef08197..27fbc83529 100644
--- a/coding/coding_tests/arithmetic_codec_test.cpp
+++ b/coding/coding_tests/arithmetic_codec_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../arithmetic_codec.hpp"
-#include "../reader.hpp"
+#include "coding/arithmetic_codec.hpp"
+#include "coding/reader.hpp"
 
-#include "../../base/pseudo_random.hpp"
+#include "base/pseudo_random.hpp"
 
 
 UNIT_TEST(ArithmeticCodec)
diff --git a/coding/coding_tests/base64_for_user_id_test.cpp b/coding/coding_tests/base64_for_user_id_test.cpp
index 20ba53aa23..5bf9c3e40b 100644
--- a/coding/coding_tests/base64_for_user_id_test.cpp
+++ b/coding/coding_tests/base64_for_user_id_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../base/logging.hpp"
-#include "../../base/pseudo_random.hpp"
+#include "base/logging.hpp"
+#include "base/pseudo_random.hpp"
 
-#include "../base64.hpp"
+#include "coding/base64.hpp"
 
 using namespace base64_for_user_ids;
 
diff --git a/coding/coding_tests/base64_test.cpp b/coding/coding_tests/base64_test.cpp
index dfe45fe53f..04da71677d 100644
--- a/coding/coding_tests/base64_test.cpp
+++ b/coding/coding_tests/base64_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../base64.hpp"
+#include "coding/base64.hpp"
 
 
 using namespace base64;
diff --git a/coding/coding_tests/bit_shift_test.cpp b/coding/coding_tests/bit_shift_test.cpp
index 67ef457044..ba94fab2cc 100644
--- a/coding/coding_tests/bit_shift_test.cpp
+++ b/coding/coding_tests/bit_shift_test.cpp
@@ -1,9 +1,9 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../../std/limits.hpp"
+#include "std/limits.hpp"
 
-#include "../bit_shift.hpp"
+#include "coding/bit_shift.hpp"
 
 
 UNIT_TEST(BitShift)
diff --git a/coding/coding_tests/bit_streams_test.cpp b/coding/coding_tests/bit_streams_test.cpp
index dc9382dd11..c7a15ec1d9 100644
--- a/coding/coding_tests/bit_streams_test.cpp
+++ b/coding/coding_tests/bit_streams_test.cpp
@@ -1,13 +1,13 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../bit_streams.hpp"
-#include "../reader.hpp"
-#include "../writer.hpp"
+#include "coding/bit_streams.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
-#include "../../base/pseudo_random.hpp"
+#include "base/pseudo_random.hpp"
 
-#include "../../std/utility.hpp"
-#include "../../std/vector.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 
 using namespace rnd;
diff --git a/coding/coding_tests/blob_storage_test.cpp b/coding/coding_tests/blob_storage_test.cpp
index a6ac4692b3..cbaff8556d 100644
--- a/coding/coding_tests/blob_storage_test.cpp
+++ b/coding/coding_tests/blob_storage_test.cpp
@@ -1,17 +1,17 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
 /*
-#include "../blob_storage.hpp"
-#include "../blob_indexer.hpp"
+#include "coding/blob_storage.hpp"
+#include "coding/blob_indexer.hpp"
 
-#include "compressor_test_utils.hpp"
+#include "coding/coding_tests/compressor_test_utils.hpp"
 
-#include "../../coding/reader.hpp"
-#include "../../coding/writer.hpp"
-#include "../../base/logging.hpp"
-#include "../../base/macros.hpp"
-#include "../../std/string.hpp"
-#include "../../std/vector.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
+#include "base/logging.hpp"
+#include "base/macros.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 
 namespace
 {
diff --git a/coding/coding_tests/bzip2_test.cpp b/coding/coding_tests/bzip2_test.cpp
index c1966838a3..03ac284dbe 100644
--- a/coding/coding_tests/bzip2_test.cpp
+++ b/coding/coding_tests/bzip2_test.cpp
@@ -1,8 +1,8 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "coder_test.hpp"
-#include "../bzip2_compressor.hpp"
+#include "coding/coding_tests/coder_test.hpp"
+#include "coding/bzip2_compressor.hpp"
 
 namespace
 {
diff --git a/coding/coding_tests/coder_test.hpp b/coding/coding_tests/coder_test.hpp
index 784f2bcd6e..3f72a5e0e1 100644
--- a/coding/coding_tests/coder_test.hpp
+++ b/coding/coding_tests/coder_test.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../../testing/testing.hpp"
-#include "../coder.hpp"
+#include "testing/testing.hpp"
+#include "coding/coder.hpp"
 
 // TODO: void CoderRandomTest(Coder & encoder, Coder & decoder);
 // TODO: void CoderTextTest(Coder & encoder, Coder & decoder);
diff --git a/coding/coding_tests/coder_util_test.cpp b/coding/coding_tests/coder_util_test.cpp
index ad7e1b8fda..56541c0d61 100644
--- a/coding/coding_tests/coder_util_test.cpp
+++ b/coding/coding_tests/coder_util_test.cpp
@@ -1,8 +1,8 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../coder_util.hpp"
-#include "../../base/logging.hpp"
+#include "coding/coder_util.hpp"
+#include "base/logging.hpp"
 
 //namespace
 //{
diff --git a/coding/coding_tests/compressed_bit_vector_test.cpp b/coding/coding_tests/compressed_bit_vector_test.cpp
index 2801259c90..026abe1a8d 100644
--- a/coding/coding_tests/compressed_bit_vector_test.cpp
+++ b/coding/coding_tests/compressed_bit_vector_test.cpp
@@ -1,10 +1,10 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../compressed_bit_vector.hpp"
-#include "../reader.hpp"
-#include "../writer.hpp"
+#include "coding/compressed_bit_vector.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
-#include "../../base/pseudo_random.hpp"
+#include "base/pseudo_random.hpp"
 
 
 using namespace rnd;
diff --git a/coding/coding_tests/compressed_varnum_vector_test.cpp b/coding/coding_tests/compressed_varnum_vector_test.cpp
index 513ccd1af1..a696f4c8a3 100644
--- a/coding/coding_tests/compressed_varnum_vector_test.cpp
+++ b/coding/coding_tests/compressed_varnum_vector_test.cpp
@@ -1,12 +1,12 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../compressed_varnum_vector.hpp"
+#include "coding/compressed_varnum_vector.hpp"
 
 /*
-#include "../reader.hpp"
-#include "../writer.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
-#include "../../base/pseudo_random.hpp"
+#include "base/pseudo_random.hpp"
 
 
 using namespace rnd;
diff --git a/coding/coding_tests/compressor_test_utils.hpp b/coding/coding_tests/compressor_test_utils.hpp
index efddc15003..0fd00a350a 100644
--- a/coding/coding_tests/compressor_test_utils.hpp
+++ b/coding/coding_tests/compressor_test_utils.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../std/cstring.hpp"
+#include "std/cstring.hpp"
 
 
 namespace coding
diff --git a/coding/coding_tests/dd_vector_test.cpp b/coding/coding_tests/dd_vector_test.cpp
index 42eb8e1f7b..d6cc16f842 100644
--- a/coding/coding_tests/dd_vector_test.cpp
+++ b/coding/coding_tests/dd_vector_test.cpp
@@ -1,7 +1,7 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../dd_vector.hpp"
-#include "../reader.hpp"
+#include "coding/dd_vector.hpp"
+#include "coding/reader.hpp"
 
 
 UNIT_TEST(DDVector_Smoke)
diff --git a/coding/coding_tests/diff_test.cpp b/coding/coding_tests/diff_test.cpp
index 3120871cda..649a7a4a65 100644
--- a/coding/coding_tests/diff_test.cpp
+++ b/coding/coding_tests/diff_test.cpp
@@ -1,12 +1,12 @@
-#include "../../testing/testing.hpp"
-#include "../diff.hpp"
-
-#include "../byte_stream.hpp"
-#include "../dd_vector.hpp"
-#include "../reader.hpp"
-#include "../../base/rolling_hash.hpp"
-#include "../../std/string.hpp"
-#include "../../std/sstream.hpp"
+#include "testing/testing.hpp"
+#include "coding/diff.hpp"
+
+#include "coding/byte_stream.hpp"
+#include "coding/dd_vector.hpp"
+#include "coding/reader.hpp"
+#include "base/rolling_hash.hpp"
+#include "std/string.hpp"
+#include "std/sstream.hpp"
 
 
 UNIT_TEST(MyersSimpleDiff)
diff --git a/coding/coding_tests/endianness_test.cpp b/coding/coding_tests/endianness_test.cpp
index 55b8a4c509..dc529e6211 100644
--- a/coding/coding_tests/endianness_test.cpp
+++ b/coding/coding_tests/endianness_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../endianness.hpp"
+#include "coding/endianness.hpp"
 
 
 UNIT_TEST(Endianness1Byte)
diff --git a/coding/coding_tests/file_container_test.cpp b/coding/coding_tests/file_container_test.cpp
index 55be9717fb..e1c657d086 100644
--- a/coding/coding_tests/file_container_test.cpp
+++ b/coding/coding_tests/file_container_test.cpp
@@ -1,11 +1,11 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../file_container.hpp"
-#include "../varint.hpp"
+#include "coding/file_container.hpp"
+#include "coding/varint.hpp"
 
-#include "../../base/logging.hpp"
-#include "../../base/string_utils.hpp"
-#include "../../base/scope_guard.hpp"
+#include "base/logging.hpp"
+#include "base/string_utils.hpp"
+#include "base/scope_guard.hpp"
 
 
 UNIT_TEST(FilesContainer_Smoke)
diff --git a/coding/coding_tests/file_data_test.cpp b/coding/coding_tests/file_data_test.cpp
index b02c09c4e6..f610c3f072 100644
--- a/coding/coding_tests/file_data_test.cpp
+++ b/coding/coding_tests/file_data_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../internal/file_data.hpp"
-#include "../writer.hpp"
+#include "coding/internal/file_data.hpp"
+#include "coding/writer.hpp"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 
 namespace
diff --git a/coding/coding_tests/file_sort_test.cpp b/coding/coding_tests/file_sort_test.cpp
index 04c7d19ef9..0c4751c445 100644
--- a/coding/coding_tests/file_sort_test.cpp
+++ b/coding/coding_tests/file_sort_test.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
-#include "../file_sort.hpp"
-#include "../write_to_sink.hpp"
-#include "../reader.hpp"
-#include "../../base/pseudo_random.hpp"
+#include "testing/testing.hpp"
+#include "coding/file_sort.hpp"
+#include "coding/write_to_sink.hpp"
+#include "coding/reader.hpp"
+#include "base/pseudo_random.hpp"
 
 namespace
 {
diff --git a/coding/coding_tests/file_utils_test.cpp b/coding/coding_tests/file_utils_test.cpp
index be81fa8f3f..d5c8ca565c 100644
--- a/coding/coding_tests/file_utils_test.cpp
+++ b/coding/coding_tests/file_utils_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../file_name_utils.hpp"
+#include "coding/file_name_utils.hpp"
 
 
 UNIT_TEST(FileName_Smoke)
diff --git a/coding/coding_tests/gzip_test.cpp b/coding/coding_tests/gzip_test.cpp
index 3ee28f64e3..143dd0965f 100644
--- a/coding/coding_tests/gzip_test.cpp
+++ b/coding/coding_tests/gzip_test.cpp
@@ -1,8 +1,8 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "coder_test.hpp"
-#include "../gzip_compressor.hpp"
+#include "coding/coding_tests/coder_test.hpp"
+#include "coding/gzip_compressor.hpp"
 
 namespace
 {
diff --git a/coding/coding_tests/hex_test.cpp b/coding/coding_tests/hex_test.cpp
index 4bef2c1c34..2b9993c59d 100644
--- a/coding/coding_tests/hex_test.cpp
+++ b/coding/coding_tests/hex_test.cpp
@@ -1,10 +1,10 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../hex.hpp"
+#include "coding/hex.hpp"
 
-#include "../../base/pseudo_random.hpp"
+#include "base/pseudo_random.hpp"
 
-#include "../../std/string.hpp"
+#include "std/string.hpp"
 
 
 UNIT_TEST(GoldenRecode)
diff --git a/coding/coding_tests/mem_file_reader_test.cpp b/coding/coding_tests/mem_file_reader_test.cpp
index 541a71922b..bfa5311a23 100644
--- a/coding/coding_tests/mem_file_reader_test.cpp
+++ b/coding/coding_tests/mem_file_reader_test.cpp
@@ -1,8 +1,8 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../reader.hpp"
-#include "../../base/macros.hpp"
+#include "coding/reader.hpp"
+#include "base/macros.hpp"
 
 UNIT_TEST(MemReaderSimple)
 {
diff --git a/coding/coding_tests/mem_file_writer_test.cpp b/coding/coding_tests/mem_file_writer_test.cpp
index b4928c98a4..2625649795 100644
--- a/coding/coding_tests/mem_file_writer_test.cpp
+++ b/coding/coding_tests/mem_file_writer_test.cpp
@@ -1,10 +1,10 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../writer.hpp"
-#include "../file_writer.hpp"
+#include "coding/writer.hpp"
+#include "coding/file_writer.hpp"
 
-#include "../../base/macros.hpp"
+#include "base/macros.hpp"
 
 
 UNIT_TEST(MemWriterEmpty)
diff --git a/coding/coding_tests/multilang_utf8_string_test.cpp b/coding/coding_tests/multilang_utf8_string_test.cpp
index 6736e76f21..de8942fb15 100644
--- a/coding/coding_tests/multilang_utf8_string_test.cpp
+++ b/coding/coding_tests/multilang_utf8_string_test.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../multilang_utf8_string.hpp"
+#include "coding/multilang_utf8_string.hpp"
 
-#include "../../3party/utfcpp/source/utf8.h"
+#include "3party/utfcpp/source/utf8.h"
 
 
 namespace
diff --git a/coding/coding_tests/png_decoder_test.cpp b/coding/coding_tests/png_decoder_test.cpp
index e5e7d06029..91a148046f 100644
--- a/coding/coding_tests/png_decoder_test.cpp
+++ b/coding/coding_tests/png_decoder_test.cpp
@@ -1,7 +1,7 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../std/string.hpp"
-#include "../../std/fstream.hpp"
+#include "std/string.hpp"
+#include "std/fstream.hpp"
 
 void loadFile(vector<unsigned char> & buffer, string const & filename) //designed for loading files from hard disk in an std::vector
 {
diff --git a/coding/coding_tests/reader_cache_test.cpp b/coding/coding_tests/reader_cache_test.cpp
index 0e21320154..11969a6370 100644
--- a/coding/coding_tests/reader_cache_test.cpp
+++ b/coding/coding_tests/reader_cache_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../reader_cache.hpp"
-#include "../reader.hpp"
+#include "coding/reader_cache.hpp"
+#include "coding/reader.hpp"
 
-#include "../../base/pseudo_random.hpp"
+#include "base/pseudo_random.hpp"
 
 
 namespace
diff --git a/coding/coding_tests/reader_test.cpp b/coding/coding_tests/reader_test.cpp
index e8e98814e7..e61999187a 100644
--- a/coding/coding_tests/reader_test.cpp
+++ b/coding/coding_tests/reader_test.cpp
@@ -1,14 +1,14 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "reader_test.hpp"
+#include "coding/coding_tests/reader_test.hpp"
 
-#include "../file_reader.hpp"
-#include "../file_writer.hpp"
-#include "../buffer_reader.hpp"
-#include "../reader_streambuf.hpp"
+#include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
+#include "coding/buffer_reader.hpp"
+#include "coding/reader_streambuf.hpp"
 
-#include "../../std/iostream.hpp"
-#include "../../std/cstring.hpp"
+#include "std/iostream.hpp"
+#include "std/cstring.hpp"
 
 
 namespace
diff --git a/coding/coding_tests/reader_test.hpp b/coding/coding_tests/reader_test.hpp
index c6381c83e8..bdd00c9d10 100644
--- a/coding/coding_tests/reader_test.hpp
+++ b/coding/coding_tests/reader_test.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "../../testing/testing.hpp"
-#include "../reader.hpp"
+#include "testing/testing.hpp"
+#include "coding/reader.hpp"
 
 
 namespace
diff --git a/coding/coding_tests/reader_writer_ops_test.cpp b/coding/coding_tests/reader_writer_ops_test.cpp
index 2004574c90..5b30313f2d 100644
--- a/coding/coding_tests/reader_writer_ops_test.cpp
+++ b/coding/coding_tests/reader_writer_ops_test.cpp
@@ -1,14 +1,14 @@
-#include "../../base/SRC_FIRST.hpp"
+#include "base/SRC_FIRST.hpp"
 
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../coding/reader_writer_ops.hpp"
-#include "../../coding/file_reader.hpp"
-#include "../../coding/file_writer.hpp"
-#include "../../coding/read_write_utils.hpp"
-#include "../../coding/byte_stream.hpp"
+#include "coding/reader_writer_ops.hpp"
+#include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
+#include "coding/read_write_utils.hpp"
+#include "coding/byte_stream.hpp"
 
-#include "../../std/algorithm.hpp"
+#include "std/algorithm.hpp"
 
 
 namespace
diff --git a/coding/coding_tests/sha2_test.cpp b/coding/coding_tests/sha2_test.cpp
index 7175b8a789..4fdc192f79 100644
--- a/coding/coding_tests/sha2_test.cpp
+++ b/coding/coding_tests/sha2_test.cpp
@@ -1,7 +1,7 @@
-#include "../../base/SRC_FIRST.hpp"
-#include "../../testing/testing.hpp"
+#include "base/SRC_FIRST.hpp"
+#include "testing/testing.hpp"
 
-#include "../sha2.hpp"
+#include "coding/sha2.hpp"
 
 UNIT_TEST(Sha2_256)
 {
diff --git a/coding/coding_tests/timsort_test.cpp b/coding/coding_tests/timsort_test.cpp
index 3cc6e30f05..e57d73bba4 100644
--- a/coding/coding_tests/timsort_test.cpp
+++ b/coding/coding_tests/timsort_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../timsort/timsort.hpp"
+#include "coding/timsort/timsort.hpp"
 
-#include "../../std/algorithm.hpp"
-#include "../../std/vector.hpp"
+#include "std/algorithm.hpp"
+#include "std/vector.hpp"
 
 int intCmp(void const * plhs, void const * prhs)
 {
diff --git a/coding/coding_tests/trie_test.cpp b/coding/coding_tests/trie_test.cpp
index 744530c3e9..a9b63f3042 100644
--- a/coding/coding_tests/trie_test.cpp
+++ b/coding/coding_tests/trie_test.cpp
@@ -1,17 +1,17 @@
-#include "../../testing/testing.hpp"
-#include "../trie.hpp"
-#include "../trie_builder.hpp"
-#include "../trie_reader.hpp"
-#include "../byte_stream.hpp"
-#include "../write_to_sink.hpp"
-
-#include "../../base/logging.hpp"
-
-#include "../../std/algorithm.hpp"
-#include "../../std/scoped_ptr.hpp"
-#include "../../std/string.hpp"
-#include "../../std/vector.hpp"
-#include "../../std/cstring.hpp"
+#include "testing/testing.hpp"
+#include "coding/trie.hpp"
+#include "coding/trie_builder.hpp"
+#include "coding/trie_reader.hpp"
+#include "coding/byte_stream.hpp"
+#include "coding/write_to_sink.hpp"
+
+#include "base/logging.hpp"
+
+#include "std/algorithm.hpp"
+#include "std/scoped_ptr.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
+#include "std/cstring.hpp"
 
 #include <boost/utility/binary.hpp>
 
diff --git a/coding/coding_tests/uri_test.cpp b/coding/coding_tests/uri_test.cpp
index 86eb69db56..9a46296aac 100644
--- a/coding/coding_tests/uri_test.cpp
+++ b/coding/coding_tests/uri_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
-#include "../uri.hpp"
-#include "../../base/macros.hpp"
-#include "../../std/bind.hpp"
-#include "../../std/queue.hpp"
-#include "../../std/utility.hpp"
+#include "testing/testing.hpp"
+#include "coding/uri.hpp"
+#include "base/macros.hpp"
+#include "std/bind.hpp"
+#include "std/queue.hpp"
+#include "std/utility.hpp"
 
 using url_scheme::Uri;
 
diff --git a/coding/coding_tests/url_encode_test.cpp b/coding/coding_tests/url_encode_test.cpp
index ea8ec9817a..806af555de 100644
--- a/coding/coding_tests/url_encode_test.cpp
+++ b/coding/coding_tests/url_encode_test.cpp
@@ -1,6 +1,6 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../url_encode.hpp"
+#include "coding/url_encode.hpp"
 
 char const * orig1 = "http://google.com/main_index.php";
 char const * enc1 = "http%3A%2F%2Fgoogle.com%2Fmain_index.php";
diff --git a/coding/coding_tests/value_opt_string_test.cpp b/coding/coding_tests/value_opt_string_test.cpp
index e2ca3aa281..e700fe9c58 100644
--- a/coding/coding_tests/value_opt_string_test.cpp
+++ b/coding/coding_tests/value_opt_string_test.cpp
@@ -1,9 +1,9 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../value_opt_string.hpp"
+#include "coding/value_opt_string.hpp"
 
-#include "../reader.hpp"
-#include "../writer.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
 
 namespace
diff --git a/coding/coding_tests/var_record_reader_test.cpp b/coding/coding_tests/var_record_reader_test.cpp
index aa5cbc989f..b72ae6784e 100644
--- a/coding/coding_tests/var_record_reader_test.cpp
+++ b/coding/coding_tests/var_record_reader_test.cpp
@@ -1,12 +1,12 @@
-#include "../../testing/testing.hpp"
-#include "../var_record_reader.hpp"
-#include "../varint.hpp"
-#include "../reader.hpp"
-#include "../writer.hpp"
-#include "../../base/macros.hpp"
-#include "../../std/string.hpp"
-#include "../../std/utility.hpp"
-#include "../../std/vector.hpp"
+#include "testing/testing.hpp"
+#include "coding/var_record_reader.hpp"
+#include "coding/varint.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
+#include "base/macros.hpp"
+#include "std/string.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 namespace
 {
diff --git a/coding/coding_tests/var_serial_vector_test.cpp b/coding/coding_tests/var_serial_vector_test.cpp
index 75157dacae..911b82dee6 100644
--- a/coding/coding_tests/var_serial_vector_test.cpp
+++ b/coding/coding_tests/var_serial_vector_test.cpp
@@ -1,17 +1,17 @@
-#include "../var_serial_vector.hpp"
+#include "coding/var_serial_vector.hpp"
 
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../coding/byte_stream.hpp"
-#include "../../coding/hex.hpp"
-#include "../../coding/reader.hpp"
-#include "../../coding/writer.hpp"
+#include "coding/byte_stream.hpp"
+#include "coding/hex.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
-#include "../../base/macros.hpp"
-#include "../../base/pseudo_random.hpp"
+#include "base/macros.hpp"
+#include "base/pseudo_random.hpp"
 
-#include "../../std/string.hpp"
-#include "../../std/vector.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 
 
 char const kHexSerial[] = "03000000" "01000000" "04000000" "06000000" "616263646566";
diff --git a/coding/coding_tests/varint_test.cpp b/coding/coding_tests/varint_test.cpp
index c1d2f6b69e..8bcb1e5b51 100644
--- a/coding/coding_tests/varint_test.cpp
+++ b/coding/coding_tests/varint_test.cpp
@@ -1,10 +1,10 @@
-#include "../varint.hpp"
-#include "../../testing/testing.hpp"
+#include "coding/varint.hpp"
+#include "testing/testing.hpp"
 
-#include "../byte_stream.hpp"
+#include "coding/byte_stream.hpp"
 
-#include "../../base/macros.hpp"
-#include "../../base/stl_add.hpp"
+#include "base/macros.hpp"
+#include "base/stl_add.hpp"
 
 
 namespace
diff --git a/coding/coding_tests/varint_vector_test.cpp b/coding/coding_tests/varint_vector_test.cpp
index b73c50883b..b5090b8ccb 100644
--- a/coding/coding_tests/varint_vector_test.cpp
+++ b/coding/coding_tests/varint_vector_test.cpp
@@ -1,11 +1,11 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
 /*
-#include "../varint_vector.hpp"
-#include "../writer.hpp"
-#include "../reader.hpp"
+#include "coding/varint_vector.hpp"
+#include "coding/writer.hpp"
+#include "coding/reader.hpp"
 
-#include "../../base/pseudo_random.hpp"
+#include "base/pseudo_random.hpp"
 
 
 using namespace varint;
diff --git a/coding/coding_tests/writer_test.cpp b/coding/coding_tests/writer_test.cpp
index 8b3f7b2e8e..7d5277f6c2 100644
--- a/coding/coding_tests/writer_test.cpp
+++ b/coding/coding_tests/writer_test.cpp
@@ -1,8 +1,8 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../file_writer.hpp"
-#include "../file_reader.hpp"
-#include "../internal/file_data.hpp"
+#include "coding/file_writer.hpp"
+#include "coding/file_reader.hpp"
+#include "coding/internal/file_data.hpp"
 
 
 namespace
diff --git a/coding/coding_tests/zip_creator_test.cpp b/coding/coding_tests/zip_creator_test.cpp
index 9f03d1d57e..781f6ff9f4 100644
--- a/coding/coding_tests/zip_creator_test.cpp
+++ b/coding/coding_tests/zip_creator_test.cpp
@@ -1,13 +1,13 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../../coding/zip_creator.hpp"
-#include "../../coding/zip_reader.hpp"
-#include "../../coding/internal/file_data.hpp"
-#include "../../coding/file_writer.hpp"
-#include "../../coding/constants.hpp"
+#include "coding/zip_creator.hpp"
+#include "coding/zip_reader.hpp"
+#include "coding/internal/file_data.hpp"
+#include "coding/file_writer.hpp"
+#include "coding/constants.hpp"
 
-#include "../../std/string.hpp"
-#include "../../std/vector.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 
 
 namespace
diff --git a/coding/coding_tests/zip_reader_test.cpp b/coding/coding_tests/zip_reader_test.cpp
index b07a1d0c52..bb8781dfc7 100644
--- a/coding/coding_tests/zip_reader_test.cpp
+++ b/coding/coding_tests/zip_reader_test.cpp
@@ -1,10 +1,10 @@
-#include "../../testing/testing.hpp"
+#include "testing/testing.hpp"
 
-#include "../zip_reader.hpp"
-#include "../file_writer.hpp"
+#include "coding/zip_reader.hpp"
+#include "coding/file_writer.hpp"
 
-#include "../../base/logging.hpp"
-#include "../../base/macros.hpp"
+#include "base/logging.hpp"
+#include "base/macros.hpp"
 
 static char const zipBytes[] = "PK\003\004\n\0\0\0\0\0\222\226\342>\302\032"
 "x\372\005\0\0\0\005\0\0\0\b\0\034\0te"
diff --git a/coding/compressed_bit_vector.cpp b/coding/compressed_bit_vector.cpp
index feab4297b4..238809845b 100644
--- a/coding/compressed_bit_vector.cpp
+++ b/coding/compressed_bit_vector.cpp
@@ -1,16 +1,16 @@
-#include "compressed_bit_vector.hpp"
+#include "coding/compressed_bit_vector.hpp"
 
-#include "arithmetic_codec.hpp"
-#include "bit_streams.hpp"
-#include "reader.hpp"
-#include "writer.hpp"
-#include "varint_misc.hpp"
+#include "coding/arithmetic_codec.hpp"
+#include "coding/bit_streams.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
+#include "coding/varint_misc.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/bits.hpp"
+#include "base/assert.hpp"
+#include "base/bits.hpp"
 
-#include "../std/cmath.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/cmath.hpp"
+#include "std/unique_ptr.hpp"
 
 namespace {
   vector<uint32_t> SerialFreqsToDistrTable(Reader & reader, uint64_t & decodeOffset, uint64_t cnt)
diff --git a/coding/compressed_bit_vector.hpp b/coding/compressed_bit_vector.hpp
index 3d0526acfe..8d1c3a515f 100644
--- a/coding/compressed_bit_vector.hpp
+++ b/coding/compressed_bit_vector.hpp
@@ -21,10 +21,10 @@
 
 #pragma once
 
-#include "../base/assert.hpp"
-#include "../std/iterator.hpp"
-#include "../std/stdint.hpp"
-#include "../std/vector.hpp"
+#include "base/assert.hpp"
+#include "std/iterator.hpp"
+#include "std/stdint.hpp"
+#include "std/vector.hpp"
 
 // Forward declare used Reader/Writer.
 class Reader;
diff --git a/coding/compressed_varnum_vector.cpp b/coding/compressed_varnum_vector.cpp
index 8bf3322d2f..72d77945de 100644
--- a/coding/compressed_varnum_vector.cpp
+++ b/coding/compressed_varnum_vector.cpp
@@ -1,16 +1,16 @@
-#include "compressed_varnum_vector.hpp"
+#include "coding/compressed_varnum_vector.hpp"
 
 /*
-#include "arithmetic_codec.hpp"
-#include "bit_streams.hpp"
-#include "reader.hpp"
-#include "writer.hpp"
-#include "varint_misc.hpp"
-
-#include "../base/bits.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/unique_ptr.hpp"
-#include "../std/vector.hpp"
+#include "coding/arithmetic_codec.hpp"
+#include "coding/bit_streams.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
+#include "coding/varint_misc.hpp"
+
+#include "base/bits.hpp"
+#include "std/algorithm.hpp"
+#include "std/unique_ptr.hpp"
+#include "std/vector.hpp"
 
 //namespace {
 //  vector<uint32_t> SerialFreqsToDistrTable(Reader & reader, uint64_t & decodeOffset, uint64_t cnt)
diff --git a/coding/compressed_varnum_vector.hpp b/coding/compressed_varnum_vector.hpp
index 20f55ee5e7..4d6bcae955 100644
--- a/coding/compressed_varnum_vector.hpp
+++ b/coding/compressed_varnum_vector.hpp
@@ -5,9 +5,9 @@
 #pragma once
 
 /*
-#include "../std/function.hpp"
-#include "../std/stdint.hpp"
-#include "../std/vector.hpp"
+#include "std/function.hpp"
+#include "std/stdint.hpp"
+#include "std/vector.hpp"
 
 // Forward declarations.
 class Reader;
diff --git a/coding/dd_vector.hpp b/coding/dd_vector.hpp
index e5f56985dc..342ae43165 100644
--- a/coding/dd_vector.hpp
+++ b/coding/dd_vector.hpp
@@ -1,11 +1,11 @@
 #pragma once
-#include "reader.hpp"
+#include "coding/reader.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/exception.hpp"
+#include "base/assert.hpp"
+#include "base/exception.hpp"
 
-#include "../std/type_traits.hpp"
-#include "../std/iterator_facade.hpp"
+#include "std/type_traits.hpp"
+#include "std/iterator_facade.hpp"
 
 
 template <
diff --git a/coding/diff.hpp b/coding/diff.hpp
index bfb4316cbb..754db84459 100644
--- a/coding/diff.hpp
+++ b/coding/diff.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "diff_patch_common.hpp"
-#include "../base/assert.hpp"
-#include "../base/base.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/unordered_map.hpp"
-#include "../std/vector.hpp"
+#include "coding/diff_patch_common.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "std/algorithm.hpp"
+#include "std/unordered_map.hpp"
+#include "std/vector.hpp"
 
 namespace diff
 {
diff --git a/coding/endianness.hpp b/coding/endianness.hpp
index e68e328886..3d209981d7 100644
--- a/coding/endianness.hpp
+++ b/coding/endianness.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/type_traits.hpp"
+#include "std/type_traits.hpp"
 
 
 // #define ENDIAN_IS_BIG
diff --git a/coding/file_container.cpp b/coding/file_container.cpp
index 4a1c29fb5b..0368c2b3d9 100644
--- a/coding/file_container.cpp
+++ b/coding/file_container.cpp
@@ -1,9 +1,9 @@
-#include "../base/SRC_FIRST.hpp"
+#include "base/SRC_FIRST.hpp"
 
-#include "file_container.hpp"
-#include "read_write_utils.hpp"
-#include "write_to_sink.hpp"
-#include "internal/file_data.hpp"
+#include "coding/file_container.hpp"
+#include "coding/read_write_utils.hpp"
+#include "coding/write_to_sink.hpp"
+#include "coding/internal/file_data.hpp"
 
 #ifndef OMIM_OS_WINDOWS
   #include <unistd.h>
diff --git a/coding/file_container.hpp b/coding/file_container.hpp
index 53ee935e2c..ac5640a814 100644
--- a/coding/file_container.hpp
+++ b/coding/file_container.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "file_reader.hpp"
-#include "file_writer.hpp"
+#include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/string.hpp"
-#include "../std/noncopyable.hpp"
+#include "std/vector.hpp"
+#include "std/string.hpp"
+#include "std/noncopyable.hpp"
 
 
 class FilesContainerBase
diff --git a/coding/file_name_utils.cpp b/coding/file_name_utils.cpp
index dc0175f19e..9533705ada 100644
--- a/coding/file_name_utils.cpp
+++ b/coding/file_name_utils.cpp
@@ -1,4 +1,4 @@
-#include "file_name_utils.hpp"
+#include "coding/file_name_utils.hpp"
 
 
 namespace my
diff --git a/coding/file_name_utils.hpp b/coding/file_name_utils.hpp
index f45f9fcb91..91f38fda77 100644
--- a/coding/file_name_utils.hpp
+++ b/coding/file_name_utils.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../std/string.hpp"
-#include "../std/vector.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 
 namespace my
 {
diff --git a/coding/file_reader.cpp b/coding/file_reader.cpp
index a993ccb34a..d0300bccd2 100644
--- a/coding/file_reader.cpp
+++ b/coding/file_reader.cpp
@@ -1,6 +1,6 @@
-#include "file_reader.hpp"
-#include "reader_cache.hpp"
-#include "internal/file_data.hpp"
+#include "coding/file_reader.hpp"
+#include "coding/reader_cache.hpp"
+#include "coding/internal/file_data.hpp"
 
 #ifndef LOG_FILE_READER_STATS
 #define LOG_FILE_READER_STATS 0
diff --git a/coding/file_reader.hpp b/coding/file_reader.hpp
index cb8e080ce1..659079affc 100644
--- a/coding/file_reader.hpp
+++ b/coding/file_reader.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "reader.hpp"
-#include "../base/base.hpp"
-#include "../std/shared_ptr.hpp"
+#include "coding/reader.hpp"
+#include "base/base.hpp"
+#include "std/shared_ptr.hpp"
 
 // FileReader, cheap to copy, not thread safe.
 // It is assumed that file is not modified during FireReader lifetime,
diff --git a/coding/file_reader_stream.hpp b/coding/file_reader_stream.hpp
index 37e8a0a153..8bbc7a0925 100644
--- a/coding/file_reader_stream.hpp
+++ b/coding/file_reader_stream.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../coding/streams.hpp"
-#include "../coding/file_reader.hpp"
+#include "coding/streams.hpp"
+#include "coding/file_reader.hpp"
 
 
 class FileReaderStream : public stream::ReaderStream<ReaderSource<FileReader> >
diff --git a/coding/file_sort.hpp b/coding/file_sort.hpp
index 98de10136c..fd7b8a17e8 100644
--- a/coding/file_sort.hpp
+++ b/coding/file_sort.hpp
@@ -1,17 +1,17 @@
 #pragma once
-#include "file_reader.hpp"
-#include "file_writer.hpp"
-#include "../base/base.hpp"
-#include "../base/logging.hpp"
-#include "../base/exception.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/cstdlib.hpp"
-#include "../std/functional.hpp"
-#include "../std/queue.hpp"
-#include "../std/unique_ptr.hpp"
-#include "../std/string.hpp"
-#include "../std/utility.hpp"
-#include "../std/vector.hpp"
+#include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
+#include "base/base.hpp"
+#include "base/logging.hpp"
+#include "base/exception.hpp"
+#include "std/algorithm.hpp"
+#include "std/cstdlib.hpp"
+#include "std/functional.hpp"
+#include "std/queue.hpp"
+#include "std/unique_ptr.hpp"
+#include "std/string.hpp"
+#include "std/utility.hpp"
+#include "std/vector.hpp"
 
 template <typename LessT>
 struct Sorter
diff --git a/coding/file_writer.cpp b/coding/file_writer.cpp
index d5fea90733..0a8fd728ff 100644
--- a/coding/file_writer.cpp
+++ b/coding/file_writer.cpp
@@ -1,5 +1,5 @@
-#include "file_writer.hpp"
-#include "internal/file_data.hpp"
+#include "coding/file_writer.hpp"
+#include "coding/internal/file_data.hpp"
 
 FileWriter::FileWriter(FileWriter const & rhs)
 : Writer(*this), m_bTruncOnClose(rhs.m_bTruncOnClose)
diff --git a/coding/file_writer.hpp b/coding/file_writer.hpp
index 7475734107..7b18d8803b 100644
--- a/coding/file_writer.hpp
+++ b/coding/file_writer.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "writer.hpp"
-#include "../base/base.hpp"
-#include "../std/unique_ptr.hpp"
+#include "coding/writer.hpp"
+#include "base/base.hpp"
+#include "std/unique_ptr.hpp"
 
 namespace my { class FileData; }
 
diff --git a/coding/file_writer_stream.hpp b/coding/file_writer_stream.hpp
index b6d2a83522..d6861a5475 100644
--- a/coding/file_writer_stream.hpp
+++ b/coding/file_writer_stream.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../coding/streams.hpp"
-#include "../coding/file_writer.hpp"
+#include "coding/streams.hpp"
+#include "coding/file_writer.hpp"
 
 class FileWriterStream : public stream::WriterStream<FileWriter>
 {
diff --git a/coding/gzip_compressor.cpp b/coding/gzip_compressor.cpp
index 6cd6108c67..34ed54d682 100644
--- a/coding/gzip_compressor.cpp
+++ b/coding/gzip_compressor.cpp
@@ -1,7 +1,7 @@
-#include "gzip_compressor.hpp"
-#include "coder_util.hpp"
-#include "../base/assert.hpp"
-#include "../3party/zlib/zlib.h"
+#include "coding/gzip_compressor.hpp"
+#include "coding/coder_util.hpp"
+#include "base/assert.hpp"
+#include "3party/zlib/zlib.h"
 
 size_t DecompressGZipIntoFixedSize(char const * pSrc, size_t srcSize, char * pDst, size_t dstSize)
 {
diff --git a/coding/gzip_compressor.hpp b/coding/gzip_compressor.hpp
index ad6ba9de6d..93f63d1ec6 100644
--- a/coding/gzip_compressor.hpp
+++ b/coding/gzip_compressor.hpp
@@ -1,7 +1,7 @@
 #pragma once
-#include "coder.hpp"
-#include "../base/base.hpp"
-#include "../base/exception.hpp"
+#include "coding/coder.hpp"
+#include "base/base.hpp"
+#include "base/exception.hpp"
 
 DECLARE_EXCEPTION(CompressGZipException, StringCodingException);
 DECLARE_EXCEPTION(DecompressGZipException, StringCodingException);
diff --git a/coding/hex.cpp b/coding/hex.cpp
index 66ddffd678..b82214d2fd 100644
--- a/coding/hex.cpp
+++ b/coding/hex.cpp
@@ -1,6 +1,6 @@
-#include "hex.hpp"
+#include "coding/hex.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
 
 namespace impl
diff --git a/coding/hex.hpp b/coding/hex.hpp
index d766d4c126..1218e28884 100644
--- a/coding/hex.hpp
+++ b/coding/hex.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/string.hpp"
-#include "../std/type_traits.hpp"
+#include "std/string.hpp"
+#include "std/type_traits.hpp"
 
 
 namespace impl
diff --git a/coding/internal/file64_api.hpp b/coding/internal/file64_api.hpp
index 26d0f29650..a14baa1452 100644
--- a/coding/internal/file64_api.hpp
+++ b/coding/internal/file64_api.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../../base/base.hpp"
+#include "base/base.hpp"
 
 #if defined(OMIM_OS_WINDOWS_NATIVE)
   #define fseek64 _fseeki64
@@ -32,4 +32,4 @@
 
 #endif
 
-#include "../../std/cstdio.hpp"
+#include "std/cstdio.hpp"
diff --git a/coding/internal/file_data.cpp b/coding/internal/file_data.cpp
index 08b24afe3e..785fd9b53f 100644
--- a/coding/internal/file_data.cpp
+++ b/coding/internal/file_data.cpp
@@ -1,24 +1,24 @@
-#include "file_data.hpp"
+#include "coding/internal/file_data.hpp"
 
 #include "../reader.hpp" // For Reader exceptions.
 #include "../writer.hpp" // For Writer exceptions.
-#include "../constants.hpp"
+#include "coding/constants.hpp"
 
-#include "../../base/exception.hpp"
-#include "../../base/logging.hpp"
+#include "base/exception.hpp"
+#include "base/logging.hpp"
 
-#include "../../std/cerrno.hpp"
-#include "../../std/cstring.hpp"
-#include "../../std/exception.hpp"
-#include "../../std/fstream.hpp"
-#include "../../std/target_os.hpp"
+#include "std/cerrno.hpp"
+#include "std/cstring.hpp"
+#include "std/exception.hpp"
+#include "std/fstream.hpp"
+#include "std/target_os.hpp"
 
 #ifdef OMIM_OS_WINDOWS
   #include <io.h>
 #endif
 
 #ifdef OMIM_OS_TIZEN
-#include "../../tizen/inc/FIo.hpp"
+#include "tizen/inc/FIo.hpp"
 #endif
 
 
diff --git a/coding/internal/file_data.hpp b/coding/internal/file_data.hpp
index 7634c2948d..ce118bb8c5 100644
--- a/coding/internal/file_data.hpp
+++ b/coding/internal/file_data.hpp
@@ -1,11 +1,11 @@
 #pragma once
-#include "file64_api.hpp"
+#include "coding/internal/file64_api.hpp"
 
-#include "../../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../../std/string.hpp"
-#include "../../std/target_os.hpp"
-#include "../../std/noncopyable.hpp"
+#include "std/string.hpp"
+#include "std/target_os.hpp"
+#include "std/noncopyable.hpp"
 
 #ifdef OMIM_OS_TIZEN
 namespace Tizen
diff --git a/coding/internal/xmlparser.hpp b/coding/internal/xmlparser.hpp
index e435a2795d..0b2534e398 100644
--- a/coding/internal/xmlparser.hpp
+++ b/coding/internal/xmlparser.hpp
@@ -2,9 +2,9 @@
 
 #define XML_STATIC
 
-#include "expat_impl.h"
+#include "coding/internal/expat_impl.h"
 
-#include "../../base/logging.hpp"
+#include "base/logging.hpp"
 
 
 template <typename DispatcherT>
diff --git a/coding/lodepng.cpp b/coding/lodepng.cpp
index a1db3ec190..5585d95d56 100644
--- a/coding/lodepng.cpp
+++ b/coding/lodepng.cpp
@@ -28,7 +28,7 @@ The manual and changelog can be found in the header file "lodepng.h"
 You are free to name this file lodepng.cpp or lodepng.c depending on your usage.
 */
 
-#include "lodepng.hpp"
+#include "coding/lodepng.hpp"
 
 #define VERSION_STRING "20100314"
 
diff --git a/coding/lodepng.hpp b/coding/lodepng.hpp
index a9a4f8f532..1a8901d3fe 100644
--- a/coding/lodepng.hpp
+++ b/coding/lodepng.hpp
@@ -30,8 +30,8 @@ freely, subject to the following restrictions:
 #include <stdlib.h>
 #include <string.h>
 
-#include "reader.hpp"
-#include "writer.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
 /* ////////////////////////////////////////////////////////////////////////// */
 /* Code Sections                                                              */
@@ -1495,7 +1495,7 @@ More complex examples can be found in:
 -------------------------
 
 ////////////////////////////////////////////////////////////////////////////////
-#include "lodepng.h"
+#include "coding/lodepng.h"
 #include <iostream>
 
 int main(int argc, char *argv[])
@@ -1536,7 +1536,7 @@ int main(int argc, char *argv[])
 ------------------------
 
 ////////////////////////////////////////////////////////////////////////////////
-#include "lodepng.h"
+#include "coding/lodepng.h"
 #include <iostream>
 
 int main(int argc, char *argv[])
@@ -1577,7 +1577,7 @@ int main(int argc, char *argv[])
 
 This example loads the PNG in 1 function call
 
-#include "lodepng.h"
+#include "coding/lodepng.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/coding/lodepng_io.hpp b/coding/lodepng_io.hpp
index 23b7787e70..e29071be31 100644
--- a/coding/lodepng_io.hpp
+++ b/coding/lodepng_io.hpp
@@ -34,7 +34,7 @@
 #include <boost/gil/gil_config.hpp>
 #include <boost/gil/utilities.hpp>
 #include <boost/gil/extension/io/io_error.hpp>
-#include "lodepng_io_private.hpp"
+#include "coding/lodepng_io_private.hpp"
 
 namespace boost { namespace gil {
 
diff --git a/coding/lodepng_io_private.hpp b/coding/lodepng_io_private.hpp
index d1fa8b3374..dd84b061eb 100644
--- a/coding/lodepng_io_private.hpp
+++ b/coding/lodepng_io_private.hpp
@@ -23,7 +23,7 @@
 #include <boost/static_assert.hpp>
 #include <boost/gil/gil_all.hpp>
 #include <boost/gil/extension/io/io_error.hpp>
-#include "lodepng.hpp"
+#include "coding/lodepng.hpp"
 
 namespace boost { namespace gil {
 
diff --git a/coding/mmap_reader.cpp b/coding/mmap_reader.cpp
index a90720993e..4d0f677dbc 100644
--- a/coding/mmap_reader.cpp
+++ b/coding/mmap_reader.cpp
@@ -1,7 +1,7 @@
-#include "mmap_reader.hpp"
+#include "coding/mmap_reader.hpp"
 
-#include "../std/target_os.hpp"
-#include "../std/cstring.hpp"
+#include "std/target_os.hpp"
+#include "std/cstring.hpp"
 
 // @TODO we don't support windows at the moment
 #ifndef OMIM_OS_WINDOWS
diff --git a/coding/mmap_reader.hpp b/coding/mmap_reader.hpp
index c1cf2a0bdb..7e1a9d059b 100644
--- a/coding/mmap_reader.hpp
+++ b/coding/mmap_reader.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "reader.hpp"
+#include "coding/reader.hpp"
 
-#include "../std/shared_ptr.hpp"
+#include "std/shared_ptr.hpp"
 
 /// @TODO Add Windows support
 class MmapReader : public ModelReader
diff --git a/coding/multilang_utf8_string.cpp b/coding/multilang_utf8_string.cpp
index f71298261a..1614e72823 100644
--- a/coding/multilang_utf8_string.cpp
+++ b/coding/multilang_utf8_string.cpp
@@ -1,6 +1,6 @@
-#include "multilang_utf8_string.hpp"
+#include "coding/multilang_utf8_string.hpp"
 
-#include "../defines.hpp"
+#include "defines.hpp"
 
 static char const * gLangs[] = {
     "default",
diff --git a/coding/multilang_utf8_string.hpp b/coding/multilang_utf8_string.hpp
index 67d059126a..bd23925e74 100644
--- a/coding/multilang_utf8_string.hpp
+++ b/coding/multilang_utf8_string.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "varint.hpp"
+#include "coding/varint.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 
 namespace utils
diff --git a/coding/parse_xml.hpp b/coding/parse_xml.hpp
index d5bb6d129b..54f17aa537 100644
--- a/coding/parse_xml.hpp
+++ b/coding/parse_xml.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "internal/xmlparser.hpp"
+#include "coding/internal/xmlparser.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
 
 template <typename XMLDispatcherT, typename SequenceT>
diff --git a/coding/polymorph_reader.hpp b/coding/polymorph_reader.hpp
index 6f5d0e11f0..0277a359c9 100644
--- a/coding/polymorph_reader.hpp
+++ b/coding/polymorph_reader.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "../coding/reader.hpp"
-#include "../std/unique_ptr.hpp"
+#include "coding/reader.hpp"
+#include "std/unique_ptr.hpp"
 
 class PolymorphReader
 {
diff --git a/coding/read_write_utils.hpp b/coding/read_write_utils.hpp
index 580990aa9d..70370a2d42 100644
--- a/coding/read_write_utils.hpp
+++ b/coding/read_write_utils.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "varint.hpp"
+#include "coding/varint.hpp"
 
-#include "../base/buffer_vector.hpp"
+#include "base/buffer_vector.hpp"
 
-#include "../std/string.hpp"
-#include "../std/vector.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 //#include "../std/type_traits.hpp"
 
 
diff --git a/coding/reader.cpp b/coding/reader.cpp
index 42e2d59f08..f519a9e79c 100644
--- a/coding/reader.cpp
+++ b/coding/reader.cpp
@@ -1,6 +1,6 @@
-#include "reader.hpp"
+#include "coding/reader.hpp"
 
-#include "../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
 
 void Reader::ReadAsString(string & s) const
diff --git a/coding/reader.hpp b/coding/reader.hpp
index ce4f0b7987..b7fa24253e 100644
--- a/coding/reader.hpp
+++ b/coding/reader.hpp
@@ -1,13 +1,13 @@
 #pragma once
-#include "endianness.hpp"
+#include "coding/endianness.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/exception.hpp"
+#include "base/assert.hpp"
+#include "base/exception.hpp"
 
-#include "../std/shared_array.hpp"
-#include "../std/shared_ptr.hpp"
-#include "../std/string.hpp"
-#include "../std/cstring.hpp"
+#include "std/shared_array.hpp"
+#include "std/shared_ptr.hpp"
+#include "std/string.hpp"
+#include "std/cstring.hpp"
 
 
 // Base class for random-access Reader. Not thread-safe.
diff --git a/coding/reader_cache.hpp b/coding/reader_cache.hpp
index 793f5207fd..d8e5bdf91c 100644
--- a/coding/reader_cache.hpp
+++ b/coding/reader_cache.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "../base/base.hpp"
-#include "../base/cache.hpp"
-#include "../base/stats.hpp"
+#include "base/base.hpp"
+#include "base/cache.hpp"
+#include "base/stats.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/cstring.hpp"
-#include "../std/algorithm.hpp"
+#include "std/vector.hpp"
+#include "std/cstring.hpp"
+#include "std/algorithm.hpp"
 
 
 namespace impl
diff --git a/coding/reader_streambuf.cpp b/coding/reader_streambuf.cpp
index 88f24e19f9..3a023f323e 100644
--- a/coding/reader_streambuf.cpp
+++ b/coding/reader_streambuf.cpp
@@ -1,8 +1,8 @@
-#include "reader_streambuf.hpp"
-#include "reader.hpp"
-#include "file_writer.hpp"
+#include "coding/reader_streambuf.hpp"
+#include "coding/reader.hpp"
+#include "coding/file_writer.hpp"
 
-#include "../std/algorithm.hpp"
+#include "std/algorithm.hpp"
 
 
 ReaderStreamBuf::ReaderStreamBuf(Reader * p)
diff --git a/coding/reader_streambuf.hpp b/coding/reader_streambuf.hpp
index bb26acec06..5e35c0a8e9 100644
--- a/coding/reader_streambuf.hpp
+++ b/coding/reader_streambuf.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../std/stdint.hpp"
-#include "../std/iostream.hpp"
+#include "std/stdint.hpp"
+#include "std/iostream.hpp"
 
 class Reader;
 class Writer;
diff --git a/coding/reader_wrapper.hpp b/coding/reader_wrapper.hpp
index ce2ebad6da..28a0784463 100644
--- a/coding/reader_wrapper.hpp
+++ b/coding/reader_wrapper.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "reader.hpp"
+#include "coding/reader.hpp"
 
 
 /// Reader wrapper to avoid penalty on copy and polymorphic SubReader creation.
diff --git a/coding/reader_writer_ops.cpp b/coding/reader_writer_ops.cpp
index b0a483a584..7f9d8d05e8 100644
--- a/coding/reader_writer_ops.cpp
+++ b/coding/reader_writer_ops.cpp
@@ -1,4 +1,4 @@
-#include "reader_writer_ops.hpp"
+#include "coding/reader_writer_ops.hpp"
 
 namespace rw_ops
 {
diff --git a/coding/reader_writer_ops.hpp b/coding/reader_writer_ops.hpp
index 03294b72e5..cd508c01d8 100644
--- a/coding/reader_writer_ops.hpp
+++ b/coding/reader_writer_ops.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "reader.hpp"
-#include "writer.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
 namespace rw_ops
 {
diff --git a/coding/sha2.cpp b/coding/sha2.cpp
index cc86df6774..2de6b6ba65 100644
--- a/coding/sha2.cpp
+++ b/coding/sha2.cpp
@@ -1,7 +1,7 @@
-#include "sha2.hpp"
-#include "hex.hpp"
+#include "coding/sha2.hpp"
+#include "coding/hex.hpp"
 
-#include "../base/macros.hpp"
+#include "base/macros.hpp"
 
 #include <tomcrypt.h>
 
diff --git a/coding/sha2.hpp b/coding/sha2.hpp
index a0661b7dff..80b8cf1d40 100644
--- a/coding/sha2.hpp
+++ b/coding/sha2.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 namespace sha2
 {
diff --git a/coding/streams.hpp b/coding/streams.hpp
index 4c97812a80..2d7e6c8ada 100644
--- a/coding/streams.hpp
+++ b/coding/streams.hpp
@@ -1,5 +1,5 @@
 #pragma once
-#include "streams_common.hpp"
+#include "coding/streams_common.hpp"
 
 namespace stream
 {
diff --git a/coding/streams_common.hpp b/coding/streams_common.hpp
index acc17df587..94f45ab7d4 100644
--- a/coding/streams_common.hpp
+++ b/coding/streams_common.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../base/base.hpp"
-#include "../base/assert.hpp"
+#include "base/base.hpp"
+#include "base/assert.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 namespace stream
 {
diff --git a/coding/streams_sink.hpp b/coding/streams_sink.hpp
index bc3bd13cd7..dd6ff4ca42 100644
--- a/coding/streams_sink.hpp
+++ b/coding/streams_sink.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "streams_common.hpp"
-#include "reader.hpp"
-#include "write_to_sink.hpp"
+#include "coding/streams_common.hpp"
+#include "coding/reader.hpp"
+#include "coding/write_to_sink.hpp"
 
-#include "../std/type_traits.hpp"
+#include "std/type_traits.hpp"
 
 
 namespace stream
diff --git a/coding/timsort/timsort.cpp b/coding/timsort/timsort.cpp
index 56142f0be7..a53f76f7a6 100644
--- a/coding/timsort/timsort.cpp
+++ b/coding/timsort/timsort.cpp
@@ -1,7 +1,7 @@
-#include "timsort.hpp"
+#include "coding/timsort/timsort.hpp"
 
-#include "../../std/cstring.hpp"
-#include "../../std/cstdlib.hpp"
+#include "std/cstring.hpp"
+#include "std/cstdlib.hpp"
 
 typedef int cmpFunc(const void *, const void *);
 
diff --git a/coding/timsort/timsort.hpp b/coding/timsort/timsort.hpp
index 87744fc566..1a5ec24a4f 100644
--- a/coding/timsort/timsort.hpp
+++ b/coding/timsort/timsort.hpp
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "../../std/stdint.hpp"
+#include "std/stdint.hpp"
 
 void timsort(void *aArray, size_t aElementCnt, size_t aWidth, int (*aCmpCb)(const void *, const void *));
diff --git a/coding/trie.hpp b/coding/trie.hpp
index 57a4b98194..29769ea86c 100644
--- a/coding/trie.hpp
+++ b/coding/trie.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "../base/base.hpp"
-#include "../base/assert.hpp"
-#include "../base/buffer_vector.hpp"
+#include "base/base.hpp"
+#include "base/assert.hpp"
+#include "base/buffer_vector.hpp"
 //#include "../base/object_tracker.hpp"
 
-#include "../std/unique_ptr.hpp"
+#include "std/unique_ptr.hpp"
 
 
 namespace trie
diff --git a/coding/trie_builder.hpp b/coding/trie_builder.hpp
index 90d23e8ac8..e04faa8756 100644
--- a/coding/trie_builder.hpp
+++ b/coding/trie_builder.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "byte_stream.hpp"
-#include "varint.hpp"
+#include "coding/byte_stream.hpp"
+#include "coding/varint.hpp"
 
-#include "../base/buffer_vector.hpp"
+#include "base/buffer_vector.hpp"
 
-#include "../std/algorithm.hpp"
+#include "std/algorithm.hpp"
 
 // Trie format:
 // [1: header]
diff --git a/coding/trie_reader.hpp b/coding/trie_reader.hpp
index 6e2cc02eb1..46d4484f9a 100644
--- a/coding/trie_reader.hpp
+++ b/coding/trie_reader.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "trie.hpp"
-#include "../coding/reader.hpp"
-#include "../coding/varint.hpp"
-#include "../base/assert.hpp"
-#include "../base/bits.hpp"
-#include "../base/macros.hpp"
+#include "coding/trie.hpp"
+#include "coding/reader.hpp"
+#include "coding/varint.hpp"
+#include "base/assert.hpp"
+#include "base/bits.hpp"
+#include "base/macros.hpp"
 
 namespace trie
 {
diff --git a/coding/uri.cpp b/coding/uri.cpp
index e37b86413f..57242042ac 100644
--- a/coding/uri.cpp
+++ b/coding/uri.cpp
@@ -1,7 +1,7 @@
-#include "uri.hpp"
-#include "url_encode.hpp"
+#include "coding/uri.hpp"
+#include "coding/url_encode.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
 
 namespace url_scheme
diff --git a/coding/uri.hpp b/coding/uri.hpp
index 25ff1b6bab..e1ee611000 100644
--- a/coding/uri.hpp
+++ b/coding/uri.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/function.hpp"
-#include "../std/string.hpp"
+#include "std/function.hpp"
+#include "std/string.hpp"
 
 
 namespace url_scheme
diff --git a/coding/url_encode.hpp b/coding/url_encode.hpp
index cba1ee497e..9f3264293a 100644
--- a/coding/url_encode.hpp
+++ b/coding/url_encode.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "hex.hpp"
+#include "coding/hex.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 
 inline string UrlEncode(string const & rawUrl)
diff --git a/coding/value_opt_string.hpp b/coding/value_opt_string.hpp
index 02d066771b..6984852026 100644
--- a/coding/value_opt_string.hpp
+++ b/coding/value_opt_string.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "varint.hpp"
+#include "coding/varint.hpp"
 
-#include "../base/string_utils.hpp"
-#include "../base/assert.hpp"
+#include "base/string_utils.hpp"
+#include "base/assert.hpp"
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 
 class StringNumericOptimal
diff --git a/coding/var_record_reader.hpp b/coding/var_record_reader.hpp
index c21ccbf54d..8778885b01 100644
--- a/coding/var_record_reader.hpp
+++ b/coding/var_record_reader.hpp
@@ -1,10 +1,10 @@
 #pragma once
-#include "byte_stream.hpp"
-#include "reader.hpp"
-#include "varint.hpp"
-#include "../base/base.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/vector.hpp"
+#include "coding/byte_stream.hpp"
+#include "coding/reader.hpp"
+#include "coding/varint.hpp"
+#include "base/base.hpp"
+#include "std/algorithm.hpp"
+#include "std/vector.hpp"
 
 inline uint32_t VarRecordSizeReaderVarint(ArrayByteSource & source)
 {
diff --git a/coding/var_serial_vector.hpp b/coding/var_serial_vector.hpp
index 2d130f8501..b5d6773b19 100644
--- a/coding/var_serial_vector.hpp
+++ b/coding/var_serial_vector.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "reader.hpp"
-#include "write_to_sink.hpp"
+#include "coding/reader.hpp"
+#include "coding/write_to_sink.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
-#include "../std/string.hpp"
-#include "../std/utility.hpp"
+#include "std/string.hpp"
+#include "std/utility.hpp"
 
 
 template <class WriterT> class VarSerialVectorWriter
diff --git a/coding/varint.hpp b/coding/varint.hpp
index 85b49abda0..6b0ea0ab23 100644
--- a/coding/varint.hpp
+++ b/coding/varint.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "write_to_sink.hpp"
+#include "coding/write_to_sink.hpp"
 
-#include "../base/assert.hpp"
-#include "../base/base.hpp"
-#include "../base/bits.hpp"
-#include "../base/exception.hpp"
-#include "../base/stl_add.hpp"
-#include "../std/type_traits.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "base/bits.hpp"
+#include "base/exception.hpp"
+#include "base/stl_add.hpp"
+#include "std/type_traits.hpp"
 
 
 /// This function writes, using optimal bytes count.
diff --git a/coding/varint_misc.hpp b/coding/varint_misc.hpp
index 7a6ce9aaba..bae95d2581 100644
--- a/coding/varint_misc.hpp
+++ b/coding/varint_misc.hpp
@@ -3,12 +3,12 @@
 
 #pragma once
 
-#include "reader.hpp"
-#include "writer.hpp"
+#include "coding/reader.hpp"
+#include "coding/writer.hpp"
 
-#include "../base/assert.hpp"
-#include "../std/stdint.hpp"
-#include "../std/vector.hpp"
+#include "base/assert.hpp"
+#include "std/stdint.hpp"
+#include "std/vector.hpp"
 
 // Encode Varint by appending to vector of bytes.
 inline void VarintEncode(vector<uint8_t> & dst, uint64_t n)
diff --git a/coding/varint_vector.cpp b/coding/varint_vector.cpp
index 7b16526411..60fbe5584c 100644
--- a/coding/varint_vector.cpp
+++ b/coding/varint_vector.cpp
@@ -1,10 +1,10 @@
-#include "varint_vector.hpp"
+#include "coding/varint_vector.hpp"
 
 /*
-#include "writer.hpp"
-#include "reader.hpp"
+#include "coding/writer.hpp"
+#include "coding/reader.hpp"
 
-#include "../base/assert.hpp"
+#include "base/assert.hpp"
 
 
 namespace varint
diff --git a/coding/varint_vector.hpp b/coding/varint_vector.hpp
index c889b4b476..e84460e32d 100644
--- a/coding/varint_vector.hpp
+++ b/coding/varint_vector.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
 /*
-#include "../base/base.hpp"
+#include "base/base.hpp"
 
-#include "../std/vector.hpp"
+#include "std/vector.hpp"
 
 
 class Writer;
diff --git a/coding/write_to_sink.hpp b/coding/write_to_sink.hpp
index 318c38e21e..c26b6fa8a2 100644
--- a/coding/write_to_sink.hpp
+++ b/coding/write_to_sink.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "endianness.hpp"
+#include "coding/endianness.hpp"
 
-#include "../std/type_traits.hpp"
+#include "std/type_traits.hpp"
 
 
 template <class TSink, typename T>
diff --git a/coding/writer.hpp b/coding/writer.hpp
index fcc7208a9f..dd87b865a1 100644
--- a/coding/writer.hpp
+++ b/coding/writer.hpp
@@ -1,12 +1,12 @@
 #pragma once
-#include "../base/assert.hpp"
-#include "../base/base.hpp"
-#include "../base/exception.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/shared_ptr.hpp"
-#include "../std/cstring.hpp"
-#include "../std/string.hpp"
-#include "../std/vector.hpp"
+#include "base/assert.hpp"
+#include "base/base.hpp"
+#include "base/exception.hpp"
+#include "std/algorithm.hpp"
+#include "std/shared_ptr.hpp"
+#include "std/cstring.hpp"
+#include "std/string.hpp"
+#include "std/vector.hpp"
 
 // Generic Writer. Not thread-safe.
 // When SubWriter is used, pos can negative, so int64_t is used to store pos.
diff --git a/coding/zip_creator.cpp b/coding/zip_creator.cpp
index 95330ea9ca..e3443f0f96 100644
--- a/coding/zip_creator.cpp
+++ b/coding/zip_creator.cpp
@@ -1,21 +1,21 @@
-#include "zip_creator.hpp"
+#include "coding/zip_creator.hpp"
 
-#include "../base/string_utils.hpp"
+#include "base/string_utils.hpp"
 
-#include "../coding/file_name_utils.hpp"
-#include "../coding/internal/file_data.hpp"
-#include "../coding/reader.hpp"
-#include "../coding/constants.hpp"
+#include "coding/file_name_utils.hpp"
+#include "coding/internal/file_data.hpp"
+#include "coding/reader.hpp"
+#include "coding/constants.hpp"
 
-#include "../base/logging.hpp"
-#include "../base/scope_guard.hpp"
+#include "base/logging.hpp"
+#include "base/scope_guard.hpp"
 
-#include "../std/vector.hpp"
-#include "../std/ctime.hpp"
-#include "../std/algorithm.hpp"
-#include "../std/unique_ptr.hpp"
+#include "std/vector.hpp"
+#include "std/ctime.hpp"
+#include "std/algorithm.hpp"
+#include "std/unique_ptr.hpp"
 
-#include "../3party/zlib/contrib/minizip/zip.h"
+#include "3party/zlib/contrib/minizip/zip.h"
 
 
 namespace
diff --git a/coding/zip_creator.hpp b/coding/zip_creator.hpp
index b9af0273d9..976dd3acf3 100644
--- a/coding/zip_creator.hpp
+++ b/coding/zip_creator.hpp
@@ -1,4 +1,4 @@
 
-#include "../std/string.hpp"
+#include "std/string.hpp"
 
 bool CreateZipFromPathDeflatedAndDefaultCompression(string const & filePath, string const & zipFilePath);
diff --git a/coding/zip_reader.cpp b/coding/zip_reader.cpp
index df05df346b..ed7d6b3f09 100644
--- a/coding/zip_reader.cpp
+++ b/coding/zip_reader.cpp
@@ -1,14 +1,14 @@
-#include "zip_reader.hpp"
+#include "coding/zip_reader.hpp"
 
-#include "../base/scope_guard.hpp"
-#include "../base/logging.hpp"
+#include "base/scope_guard.hpp"
+#include "base/logging.hpp"
 
-#include "../coding/file_writer.hpp"
-#include "../coding/constants.hpp"
+#include "coding/file_writer.hpp"
+#include "coding/constants.hpp"
 
-#include "../std/bind.hpp"
+#include "std/bind.hpp"
 
-#include "../3party/zlib/contrib/minizip/unzip.h"
+#include "3party/zlib/contrib/minizip/unzip.h"
 
 
 ZipFileReader::ZipFileReader(string const & container, string const & file,
diff --git a/coding/zip_reader.hpp b/coding/zip_reader.hpp
index d4915a9891..b518b8d9e3 100644
--- a/coding/zip_reader.hpp
+++ b/coding/zip_reader.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "file_reader.hpp"
+#include "coding/file_reader.hpp"
 
-#include "../base/exception.hpp"
+#include "base/exception.hpp"
 
-#include "../std/function.hpp"
+#include "std/function.hpp"
 
 
 class ZipFileReader : public FileReader