diff --git a/libs/traffxml/CMakeLists.txt b/libs/traffxml/CMakeLists.txt
index fe4fae5f9..937805518 100644
--- a/libs/traffxml/CMakeLists.txt
+++ b/libs/traffxml/CMakeLists.txt
@@ -19,7 +19,3 @@ target_link_libraries(${PROJECT_NAME}
   pugixml
   coding
 )
-
-if (NOT SKIP_QT_GUI)
-  omim_add_tool_subdirectory(traff_assessment_tool)
-endif()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 6a8e916f0..a2492d55e 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -7,5 +7,6 @@ omim_add_tool_subdirectory(topography_generator)
 omim_add_tool_subdirectory(track_generator)
 if (NOT SKIP_QT_GUI)
   omim_add_tool_subdirectory(skin_generator)
+  omim_add_tool_subdirectory(traff_assessment_tool)
 endif()
 
diff --git a/libs/traffxml/traff_assessment_tool/CMakeLists.txt b/tools/traff_assessment_tool/CMakeLists.txt
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/CMakeLists.txt
rename to tools/traff_assessment_tool/CMakeLists.txt
diff --git a/libs/traffxml/traff_assessment_tool/Info.plist b/tools/traff_assessment_tool/Info.plist
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/Info.plist
rename to tools/traff_assessment_tool/Info.plist
diff --git a/libs/traffxml/traff_assessment_tool/main.cpp b/tools/traff_assessment_tool/main.cpp
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/main.cpp
rename to tools/traff_assessment_tool/main.cpp
diff --git a/libs/traffxml/traff_assessment_tool/mainwindow.cpp b/tools/traff_assessment_tool/mainwindow.cpp
similarity index 97%
rename from libs/traffxml/traff_assessment_tool/mainwindow.cpp
rename to tools/traff_assessment_tool/mainwindow.cpp
index 3bb37d106..9a4d4682b 100644
--- a/libs/traffxml/traff_assessment_tool/mainwindow.cpp
+++ b/tools/traff_assessment_tool/mainwindow.cpp
@@ -1,10 +1,10 @@
-#include "traffxml/traff_assessment_tool/mainwindow.hpp"
+#include "traff_assessment_tool/mainwindow.hpp"
 
-#include "traffxml/traff_assessment_tool/map_widget.hpp"
-#include "traffxml/traff_assessment_tool/points_controller_delegate_base.hpp"
-#include "traffxml/traff_assessment_tool/traffic_drawer_delegate_base.hpp"
-#include "traffxml/traff_assessment_tool/traffic_panel.hpp"
-#include "traffxml/traff_assessment_tool/trafficmodeinitdlg.h"
+#include "traff_assessment_tool/map_widget.hpp"
+#include "traff_assessment_tool/points_controller_delegate_base.hpp"
+#include "traff_assessment_tool/traffic_drawer_delegate_base.hpp"
+#include "traff_assessment_tool/traffic_panel.hpp"
+#include "traff_assessment_tool/trafficmodeinitdlg.h"
 
 #include "map/framework.hpp"
 
diff --git a/libs/traffxml/traff_assessment_tool/mainwindow.hpp b/tools/traff_assessment_tool/mainwindow.hpp
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/mainwindow.hpp
rename to tools/traff_assessment_tool/mainwindow.hpp
diff --git a/libs/traffxml/traff_assessment_tool/map_widget.cpp b/tools/traff_assessment_tool/map_widget.cpp
similarity index 90%
rename from libs/traffxml/traff_assessment_tool/map_widget.cpp
rename to tools/traff_assessment_tool/map_widget.cpp
index 97232c054..59601ae88 100644
--- a/libs/traffxml/traff_assessment_tool/map_widget.cpp
+++ b/tools/traff_assessment_tool/map_widget.cpp
@@ -1,4 +1,4 @@
-#include "traffxml/traff_assessment_tool/map_widget.hpp"
+#include "traff_assessment_tool/map_widget.hpp"
 
 #include "qt/qt_common/helpers.hpp"
 
diff --git a/libs/traffxml/traff_assessment_tool/map_widget.hpp b/tools/traff_assessment_tool/map_widget.hpp
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/map_widget.hpp
rename to tools/traff_assessment_tool/map_widget.hpp
diff --git a/libs/traffxml/traff_assessment_tool/points_controller_delegate_base.hpp b/tools/traff_assessment_tool/points_controller_delegate_base.hpp
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/points_controller_delegate_base.hpp
rename to tools/traff_assessment_tool/points_controller_delegate_base.hpp
diff --git a/libs/traffxml/traff_assessment_tool/traffic_drawer_delegate_base.hpp b/tools/traff_assessment_tool/traffic_drawer_delegate_base.hpp
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/traffic_drawer_delegate_base.hpp
rename to tools/traff_assessment_tool/traffic_drawer_delegate_base.hpp
diff --git a/libs/traffxml/traff_assessment_tool/traffic_model.cpp b/tools/traff_assessment_tool/traffic_model.cpp
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/traffic_model.cpp
rename to tools/traff_assessment_tool/traffic_model.cpp
diff --git a/libs/traffxml/traff_assessment_tool/traffic_model.hpp b/tools/traff_assessment_tool/traffic_model.hpp
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/traffic_model.hpp
rename to tools/traff_assessment_tool/traffic_model.hpp
diff --git a/libs/traffxml/traff_assessment_tool/traffic_panel.cpp b/tools/traff_assessment_tool/traffic_panel.cpp
similarity index 98%
rename from libs/traffxml/traff_assessment_tool/traffic_panel.cpp
rename to tools/traff_assessment_tool/traffic_panel.cpp
index caeb2670d..377e1a13e 100644
--- a/libs/traffxml/traff_assessment_tool/traffic_panel.cpp
+++ b/tools/traff_assessment_tool/traffic_panel.cpp
@@ -1,4 +1,4 @@
-#include "traffxml/traff_assessment_tool/traffic_panel.hpp"
+#include "traff_assessment_tool/traffic_panel.hpp"
 
 #include <QtCore/QAbstractTableModel>
 #include <QtWidgets/QBoxLayout>
diff --git a/libs/traffxml/traff_assessment_tool/traffic_panel.hpp b/tools/traff_assessment_tool/traffic_panel.hpp
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/traffic_panel.hpp
rename to tools/traff_assessment_tool/traffic_panel.hpp
diff --git a/libs/traffxml/traff_assessment_tool/trafficmodeinitdlg.cpp b/tools/traff_assessment_tool/trafficmodeinitdlg.cpp
similarity index 96%
rename from libs/traffxml/traff_assessment_tool/trafficmodeinitdlg.cpp
rename to tools/traff_assessment_tool/trafficmodeinitdlg.cpp
index e6eab99cf..b017b4179 100644
--- a/libs/traffxml/traff_assessment_tool/trafficmodeinitdlg.cpp
+++ b/tools/traff_assessment_tool/trafficmodeinitdlg.cpp
@@ -1,4 +1,4 @@
-#include "traffxml/traff_assessment_tool/trafficmodeinitdlg.h"
+#include "traff_assessment_tool/trafficmodeinitdlg.h"
 #include "ui_trafficmodeinitdlg.h"
 
 #include "platform/settings.hpp"
diff --git a/libs/traffxml/traff_assessment_tool/trafficmodeinitdlg.h b/tools/traff_assessment_tool/trafficmodeinitdlg.h
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/trafficmodeinitdlg.h
rename to tools/traff_assessment_tool/trafficmodeinitdlg.h
diff --git a/libs/traffxml/traff_assessment_tool/trafficmodeinitdlg.ui b/tools/traff_assessment_tool/trafficmodeinitdlg.ui
similarity index 100%
rename from libs/traffxml/traff_assessment_tool/trafficmodeinitdlg.ui
rename to tools/traff_assessment_tool/trafficmodeinitdlg.ui