diff --git a/CMakeLists.txt b/CMakeLists.txt
index 309b72b4d6..e54c429758 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})
+include_directories(${CMAKE_HOME_DIRECTORY} ${PROJECT_SOURCE_DIR}/3party/jansson/src)
 
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
 set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
@@ -54,3 +54,4 @@ endfunction()
 
 add_subdirectory(base)
 add_subdirectory(geometry)
+add_subdirectory(storage)
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
new file mode 100644
index 0000000000..d4dba0e2a7
--- /dev/null
+++ b/storage/CMakeLists.txt
@@ -0,0 +1,35 @@
+#add_subdirectory(storage_tests)
+
+set(
+    SRC
+    app_store.hpp
+    country.cpp
+    country.hpp
+    country_decl.cpp
+    country_decl.hpp
+    country_info_getter.cpp
+    country_info_getter.hpp
+    country_name_getter.cpp
+    country_name_getter.hpp
+    country_polygon.hpp
+    country_tree.hpp
+    downloader_search_params.hpp
+    downloading_policy.cpp
+    downloading_policy.hpp
+    http_map_files_downloader.cpp
+    http_map_files_downloader.hpp
+    index.cpp
+    index.hpp
+    map_files_downloader.hpp
+    queued_country.cpp
+    queued_country.hpp
+    storage.cpp
+    storage.hpp
+    storage_defines.cpp
+    storage_defines.hpp
+    storage_helpers.cpp
+    storage_helpers.hpp
+
+)
+
+omim_add_library(storage ${SRC})