diff --git a/data/test.png b/data/test.png
deleted file mode 100644
index 1fef701490..0000000000
Binary files a/data/test.png and /dev/null differ
diff --git a/map_server/main.cpp b/map_server/main.cpp
index 7ea64532fa..0ba4626ab5 100644
--- a/map_server/main.cpp
+++ b/map_server/main.cpp
@@ -1,7 +1,7 @@
 #include "render_context.hpp"
-#include "../map_server_utils/viewport.hpp"
-#include "../map_server_utils/request.hpp"
-#include "../map_server_utils/response.hpp"
+#include "viewport.hpp"
+#include "request.hpp"
+#include "response.hpp"
 
 #include "../graphics/resource_manager.hpp"
 
diff --git a/map_server/map_server.pro b/map_server/map_server.pro
index 87cc8bfa73..9d1988ef8f 100644
--- a/map_server/map_server.pro
+++ b/map_server/map_server.pro
@@ -4,7 +4,7 @@ CONFIG   -= app_bundle
 TEMPLATE = app
 
 DEPENDENCIES = map gui search storage indexer graphics platform anim geometry coding base \
-               map_server_utils bzip2 freetype expat fribidi tomcrypt jansson protobuf
+               bzip2 freetype expat fribidi tomcrypt jansson protobuf
 
 ROOT_DIR = ..
 include($$ROOT_DIR/common.pri)
@@ -19,7 +19,16 @@ macx* {
 }
 
 SOURCES += main.cpp \
-    render_context.cpp
+    render_context.cpp \
+    request.cpp \
+    response.cpp \
+    response_impl/response_cout.cpp \
+    viewport.cpp \
 
 HEADERS += \
-    render_context.hpp
+    render_context.hpp \
+    request.hpp \
+    response.hpp \
+    viewport.hpp \
+    response_impl/response_cout.hpp \
+
diff --git a/map_server/map_server_tests/generate_map_tests.cpp b/map_server/map_server_tests/generate_map_tests.cpp
index 14dbf45ba4..b9bf4e7189 100644
--- a/map_server/map_server_tests/generate_map_tests.cpp
+++ b/map_server/map_server_tests/generate_map_tests.cpp
@@ -5,8 +5,8 @@
 
 #include "../../platform/platform.hpp"
 
-#include "../../map_server_utils/request.hpp"
-#include "../../map_server_utils/viewport.hpp"
+#include "../../map_server/request.hpp"
+#include "../../map_server/viewport.hpp"
 
 #include <QtCore/QProcess>
 #include <QtCore/QByteArray>
diff --git a/map_server/map_server_tests/map_server_tests.pro b/map_server/map_server_tests/map_server_tests.pro
index 6c591e2b3d..87c4ce5a72 100644
--- a/map_server/map_server_tests/map_server_tests.pro
+++ b/map_server/map_server_tests/map_server_tests.pro
@@ -11,7 +11,7 @@ CONFIG   -= app_bundle
 TEMPLATE = app
 
 DEPENDENCIES = qt_tstfrm map indexer graphics platform geometry coding base expat freetype fribidi protobuf tomcrypt \
-               map_server_utils jansson
+               jansson
 
 ROOT_DIR = ../..
 include($$ROOT_DIR/common.pri)
diff --git a/map_server/map_server_tests/utils_tests.cpp b/map_server/map_server_tests/utils_tests.cpp
index e5e90c7792..a887b1ce81 100644
--- a/map_server/map_server_tests/utils_tests.cpp
+++ b/map_server/map_server_tests/utils_tests.cpp
@@ -5,9 +5,9 @@
 #include "../../platform/platform.hpp"
 #include "../../coding/reader.hpp"
 
-#include "../../map_server_utils/request.hpp"
-#include "../../map_server_utils/response.hpp"
-#include "../../map_server_utils/viewport.hpp"
+#include "../../map_server/request.hpp"
+#include "../../map_server/response.hpp"
+#include "../../map_server/viewport.hpp"
 
 #include "../../std/iostream.hpp"
 
diff --git a/map_server_utils/request.cpp b/map_server/request.cpp
similarity index 100%
rename from map_server_utils/request.cpp
rename to map_server/request.cpp
diff --git a/map_server_utils/request.hpp b/map_server/request.hpp
similarity index 100%
rename from map_server_utils/request.hpp
rename to map_server/request.hpp
diff --git a/map_server_utils/response.cpp b/map_server/response.cpp
similarity index 100%
rename from map_server_utils/response.cpp
rename to map_server/response.cpp
diff --git a/map_server_utils/response.hpp b/map_server/response.hpp
similarity index 100%
rename from map_server_utils/response.hpp
rename to map_server/response.hpp
diff --git a/map_server_utils/response_impl/response_cout.cpp b/map_server/response_impl/response_cout.cpp
similarity index 100%
rename from map_server_utils/response_impl/response_cout.cpp
rename to map_server/response_impl/response_cout.cpp
diff --git a/map_server_utils/response_impl/response_cout.hpp b/map_server/response_impl/response_cout.hpp
similarity index 100%
rename from map_server_utils/response_impl/response_cout.hpp
rename to map_server/response_impl/response_cout.hpp
diff --git a/map_server_utils/viewport.cpp b/map_server/viewport.cpp
similarity index 100%
rename from map_server_utils/viewport.cpp
rename to map_server/viewport.cpp
diff --git a/map_server_utils/viewport.hpp b/map_server/viewport.hpp
similarity index 100%
rename from map_server_utils/viewport.hpp
rename to map_server/viewport.hpp
diff --git a/map_server_utils/map_server_utils.pro b/map_server_utils/map_server_utils.pro
deleted file mode 100644
index 8eaa324fd2..0000000000
--- a/map_server_utils/map_server_utils.pro
+++ /dev/null
@@ -1,27 +0,0 @@
-#-------------------------------------------------
-#
-# Project created by QtCreator 2013-07-13T21:44:19
-#
-#-------------------------------------------------
-TARGET = map_server_utils
-TEMPLATE = lib
-CONFIG += staticlib warn_on
-
-ROOT_DIR = ..
-include($$ROOT_DIR/common.pri)
-
-INCLUDEPATH += $$ROOT_DIR/3party/jansson/src
-
-DEPENDENCIES = platform base jansson
-
-SOURCES += \
-    viewport.cpp \
-    response.cpp \
-    request.cpp \
-    response_impl/response_cout.cpp
-
-HEADERS += \
-    viewport.hpp \
-    response.hpp \
-    request.hpp \
-    response_impl/response_cout.hpp
diff --git a/omim.pro b/omim.pro
index 4bd2fb8439..983be89a5d 100644
--- a/omim.pro
+++ b/omim.pro
@@ -36,9 +36,7 @@ SUBDIRS = 3party \
           graphics/graphics_tests \
           gui/gui_tests \
           qt \
-          map_server_utils \
-          map_server \
-          map_server/map_server_tests
+          map_server map_server/map_server_tests \
 } else {
   # libraries which are used on mobile devices
   SUBDIRS = 3party \