diff --git a/CMakeLists.txt b/CMakeLists.txt
index e54c429758..833d04fd54 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(Threads)
 
 get_filename_component(PROJECT_SOURCE_DIR . ABSOLUTE)
 
-include_directories(${CMAKE_HOME_DIRECTORY} ${PROJECT_SOURCE_DIR}/3party/jansson/src)
+include_directories(${CMAKE_HOME_DIRECTORY})
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
@@ -53,5 +53,7 @@ endfunction()
 
 
 add_subdirectory(base)
+add_subdirectory(coding)
+add_subdirectory(editor)
 add_subdirectory(geometry)
 add_subdirectory(storage)
diff --git a/coding/CMakeLists.txt b/coding/CMakeLists.txt
index 0ea5e28e91..4cdcf7a30f 100644
--- a/coding/CMakeLists.txt
+++ b/coding/CMakeLists.txt
@@ -1,13 +1,15 @@
 include_directories(${PROJECT_SOURCE_DIR}/3party/tomcrypt/src/headers)
 
 set(
-    HEADERS
+    SRC
+    base64.cpp
     base64.hpp
     bit_streams.hpp
     buffer_reader.hpp
     byte_stream.hpp
     coder.hpp
     coder_util.hpp
+    compressed_bit_vector.cpp
     compressed_bit_vector.hpp
     constants.hpp
     dd_vector.hpp
@@ -15,33 +17,48 @@ set(
     diff_patch_common.hpp
     elias_coder.hpp
     endianness.hpp
+    file_container.cpp
     file_container.hpp
+    file_name_utils.cpp
     file_name_utils.hpp
+    file_reader.cpp
     file_reader.hpp
     file_sort.hpp
+    file_writer.cpp
     file_writer.hpp
     fixed_bits_ddvector.hpp
+    hex.cpp
     hex.hpp
+    huffman.cpp
     huffman.hpp
     matrix_traversal.hpp
     memory_region.hpp
+    mmap_reader.cpp
     mmap_reader.hpp
+    multilang_utf8_string.cpp
     multilang_utf8_string.hpp
     parse_xml.hpp
+    png_memory_encoder.cpp
     png_memory_encoder.hpp
     polymorph_reader.hpp
     read_write_utils.hpp
+    reader.cpp
     reader.hpp
     reader_cache.hpp
+    reader_streambuf.cpp
     reader_streambuf.hpp
     reader_wrapper.hpp
+    reader_writer_ops.cpp
     reader_writer_ops.hpp
+    sha2.cpp
     sha2.hpp
+    simple_dense_coding.cpp
     simple_dense_coding.hpp
     streams.hpp
     streams_common.hpp
     streams_sink.hpp
     succinct_mapper.hpp
+    uri.cpp
     uri.hpp
     url_encode.hpp
     value_opt_string.hpp
@@ -49,39 +66,16 @@ set(
     var_serial_vector.hpp
     varint.hpp
     varint_misc.hpp
+#    varint_vector.cpp
 #    varint_vector.hpp
     write_to_sink.hpp
     writer.hpp
+    zip_creator.cpp
     zip_creator.hpp
+    zip_reader.cpp
     zip_reader.hpp
 )
 
-set(
-    SOURCES
-    base64.cpp
-    compressed_bit_vector.cpp
-    file_container.cpp
-    file_name_utils.cpp
-    file_reader.cpp
-    file_writer.cpp
-    hex.cpp
-    huffman.cpp
-    mmap_reader.cpp
-    multilang_utf8_string.cpp
-    png_memory_encoder.cpp
-    reader.cpp
-    reader_streambuf.cpp
-    reader_writer_ops.cpp
-    sha2.cpp
-    simple_dense_coding.cpp
-    uri.cpp
-#    varint_vector.cpp
-    zip_creator.cpp
-    zip_reader.cpp
-)
+omim_add_library(coding ${SRC})
 
-set(SRC ${HEADERS} ${SOURCES})
-
-omim_add_library(coding "${SRC}")
-
-add_subdirectory(coding_tests)
+#add_subdirectory(coding_tests)
diff --git a/coding/coding_tests/CMakeLists.txt b/coding/coding_tests/CMakeLists.txt
index fd9387f3c8..5608fa86a3 100644
--- a/coding/coding_tests/CMakeLists.txt
+++ b/coding/coding_tests/CMakeLists.txt
@@ -1,17 +1,11 @@
 #add_definitions(-DOMIM_UNIT_TEST_DISABLE_PLATFORM_INIT)
 
 set(
-    HEADERS
-    coder_test.hpp
-    reader_test.hpp
-)
-
-
-set(
-    SOURCES
+    SRC
     base64_for_user_id_test.cpp
     base64_test.cpp
     bit_streams_test.cpp
+    coder_test.hpp
     coder_util_test.cpp
     compressed_bit_vector_test.cpp
     dd_vector_test.cpp
@@ -31,6 +25,7 @@ set(
     png_decoder_test.cpp
     reader_cache_test.cpp
     reader_test.cpp
+    reader_test.hpp
     reader_writer_ops_test.cpp
     sha2_test.cpp
     simple_dense_coding_test.cpp
@@ -48,6 +43,5 @@ set(
     ${PROJECT_SOURCE_DIR}/testing/testingmain.cpp
 )
 
-set(SRC ${HEADERS} ${SOURCES})
-
-omim_add_test(coding_tests "${SRC}" coding)
+omim_add_test(coding_tests ${SRC})
+omim_link_libraries(coding_test coding)
diff --git a/editor/CMakeLists.txt b/editor/CMakeLists.txt
new file mode 100644
index 0000000000..0a2a052dd5
--- /dev/null
+++ b/editor/CMakeLists.txt
@@ -0,0 +1,33 @@
+#add_subdirectory(editor_tests)
+
+
+set(
+    SRC
+    changeset_wrapper.cpp
+    changeset_wrapper.hpp
+    config_loader.cpp
+    config_loader.hpp
+    editor_config.cpp
+    editor_config.hpp
+    editor_notes.cpp
+    editor_notes.hpp
+    editor_storage.cpp
+    editor_storage.hpp
+    opening_hours_ui.cpp
+    opening_hours_ui.hpp
+    osm_auth.cpp
+    osm_auth.hpp
+    osm_feature_matcher.cpp
+    osm_feature_matcher.hpp
+    server_api.cpp
+    server_api.hpp
+    ui2oh.cpp
+    ui2oh.hpp
+    user_stats.cpp
+    user_stats.hpp
+    xml_feature.cpp
+    xml_feature.hpp
+    yes_no_unknown.hpp
+)
+
+omim_add_library(editor ${SRC})
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index d4dba0e2a7..3566649ec6 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -1,5 +1,7 @@
 #add_subdirectory(storage_tests)
 
+include_directories(${PROJECT_SOURCE_DIR}/3party/jansson/src)
+
 set(
     SRC
     app_store.hpp
@@ -29,7 +31,6 @@ set(
     storage_defines.hpp
     storage_helpers.cpp
     storage_helpers.hpp
-
 )
 
 omim_add_library(storage ${SRC})