diff --git a/search/mwm_traits.cpp b/platform/mwm_traits.cpp
similarity index 93%
rename from search/mwm_traits.cpp
rename to platform/mwm_traits.cpp
index 23200fc06a..3d9cdc47df 100644
--- a/search/mwm_traits.cpp
+++ b/platform/mwm_traits.cpp
@@ -1,8 +1,8 @@
-#include "search/mwm_traits.hpp"
+#include "mwm_traits.hpp"
 
 #include "base/logging.hpp"
 
-namespace search
+namespace version
 {
 MwmTraits::MwmTraits(version::Format versionFormat) : m_versionFormat(versionFormat) {}
 
@@ -41,4 +41,4 @@ string DebugPrint(MwmTraits::HouseToStreetTableFormat format)
     return "Unknown";
   }
 }
-}  // namespace search
+}  // namespace version
diff --git a/search/mwm_traits.hpp b/platform/mwm_traits.hpp
similarity index 97%
rename from search/mwm_traits.hpp
rename to platform/mwm_traits.hpp
index 2d30443937..8f559018b8 100644
--- a/search/mwm_traits.hpp
+++ b/platform/mwm_traits.hpp
@@ -4,7 +4,7 @@
 
 #include "std/string.hpp"
 
-namespace search
+namespace version
 {
 // This is a wrapper around mwm's version.  Allows users to get
 // information about versions of some data structures in mwm.
@@ -50,4 +50,4 @@ private:
 
 string DebugPrint(MwmTraits::SearchIndexFormat format);
 string DebugPrint(MwmTraits::HouseToStreetTableFormat format);
-}  // namespace search
+}  // namespace version
diff --git a/platform/platform.pro b/platform/platform.pro
index b3e4954d45..24ff9fb2d6 100644
--- a/platform/platform.pro
+++ b/platform/platform.pro
@@ -70,6 +70,7 @@ HEADERS += \
     local_country_file_utils.hpp \
     location.hpp \
     measurement_utils.hpp \
+    mwm_traits.hpp \
     mwm_version.hpp \
     platform.hpp \
     preferred_languages.hpp \
@@ -86,6 +87,7 @@ SOURCES += \
     local_country_file.cpp \
     local_country_file_utils.cpp \
     measurement_utils.cpp \
+    mwm_traits.cpp \
     mwm_version.cpp \
     platform.cpp \
     preferred_languages.cpp \
diff --git a/search/retrieval.cpp b/search/retrieval.cpp
index 8a32619333..d174dc53f7 100644
--- a/search/retrieval.cpp
+++ b/search/retrieval.cpp
@@ -3,7 +3,6 @@
 #include "cancel_exception.hpp"
 #include "feature_offset_match.hpp"
 #include "interval_set.hpp"
-#include "mwm_traits.hpp"
 #include "search_index_values.hpp"
 #include "search_string_utils.hpp"
 #include "search_trie.hpp"
@@ -15,6 +14,7 @@
 #include "indexer/scales.hpp"
 #include "indexer/trie_reader.hpp"
 
+#include "platform/mwm_traits.hpp"
 #include "platform/mwm_version.hpp"
 
 #include "coding/compressed_bit_vector.hpp"
@@ -435,16 +435,16 @@ unique_ptr<coding::CompressedBitVector> Retrieval::RetrieveAddressFeatures(
     MwmSet::MwmId const & id, MwmValue & value, my::Cancellable const & cancellable,
     SearchQueryParams const & params)
 {
-  MwmTraits mwmTraits(value.GetMwmVersion().format);
+  version::MwmTraits mwmTraits(value.GetMwmVersion().format);
 
   if (mwmTraits.GetSearchIndexFormat() ==
-      MwmTraits::SearchIndexFormat::FeaturesWithRankAndCenter)
+      version::MwmTraits::SearchIndexFormat::FeaturesWithRankAndCenter)
   {
     using TValue = FeatureWithRankAndCenter;
     return RetrieveAddressFeaturesImpl<TValue>(id, value, cancellable, params);
   }
   else if (mwmTraits.GetSearchIndexFormat() ==
-           MwmTraits::SearchIndexFormat::CompressedBitVector)
+           version::MwmTraits::SearchIndexFormat::CompressedBitVector)
   {
     using TValue = FeatureIndexValue;
     return RetrieveAddressFeaturesImpl<TValue>(id, value, cancellable, params);
diff --git a/search/search.pro b/search/search.pro
index 3b01f26030..8027ff058b 100644
--- a/search/search.pro
+++ b/search/search.pro
@@ -25,7 +25,6 @@ HEADERS += \
     latlon_match.hpp \
     locality.hpp \
     locality_finder.hpp \
-    mwm_traits.hpp \
     params.hpp \
     projection_on_street.hpp \
     query_saver.hpp \
@@ -73,7 +72,6 @@ SOURCES += \
     latlon_match.cpp \
     locality.cpp \
     locality_finder.cpp \
-    mwm_traits.cpp \
     params.cpp \
     projection_on_street.cpp \
     query_saver.cpp \
diff --git a/search/search_query.cpp b/search/search_query.cpp
index ff6201a02c..d6482013ea 100644
--- a/search/search_query.cpp
+++ b/search/search_query.cpp
@@ -7,7 +7,6 @@
 #include "search/indexed_value.hpp"
 #include "search/latlon_match.hpp"
 #include "search/locality.hpp"
-#include "search/mwm_traits.hpp"
 #include "search/region.hpp"
 #include "search/search_common.hpp"
 #include "search/search_delimiters.hpp"
@@ -28,6 +27,7 @@
 #include "indexer/scales.hpp"
 #include "indexer/trie_reader.hpp"
 
+#include "platform/mwm_traits.hpp"
 #include "platform/mwm_version.hpp"
 #include "platform/preferred_languages.hpp"
 
@@ -1640,16 +1640,16 @@ void Query::SearchLocality(MwmValue const * pMwm, Locality & res1, Region & res2
 
   auto codingParams = trie::GetCodingParams(pMwm->GetHeader().GetDefCodingParams());
 
-  MwmTraits mwmTraits(pMwm->GetHeader().GetFormat());
+  version::MwmTraits mwmTraits(pMwm->GetHeader().GetFormat());
 
   if (mwmTraits.GetSearchIndexFormat() ==
-      MwmTraits::SearchIndexFormat::FeaturesWithRankAndCenter)
+      version::MwmTraits::SearchIndexFormat::FeaturesWithRankAndCenter)
   {
     using TValue = FeatureWithRankAndCenter;
     SearchLocalityImpl<TValue>(this, pMwm, res1, res2, params, codingParams);
   }
   else if (mwmTraits.GetSearchIndexFormat() ==
-           MwmTraits::SearchIndexFormat::CompressedBitVector)
+           version::MwmTraits::SearchIndexFormat::CompressedBitVector)
   {
     using TValue = FeatureIndexValue;
     SearchLocalityImpl<TValue>(this, pMwm, res1, res2, params, codingParams);
diff --git a/search/v2/house_to_street_table.cpp b/search/v2/house_to_street_table.cpp
index 5c854dc855..351e431f1c 100644
--- a/search/v2/house_to_street_table.cpp
+++ b/search/v2/house_to_street_table.cpp
@@ -1,9 +1,9 @@
 #include "search/v2/house_to_street_table.hpp"
 
-#include "search/mwm_traits.hpp"
-
 #include "indexer/index.hpp"
 
+#include "platform/mwm_traits.hpp"
+
 #include "coding/fixed_bits_ddvector.hpp"
 #include "coding/reader.hpp"
 
@@ -48,14 +48,14 @@ public:
 
 unique_ptr<HouseToStreetTable> HouseToStreetTable::Load(MwmValue & value)
 {
-  MwmTraits traits(value.GetMwmVersion().format);
+  version::MwmTraits traits(value.GetMwmVersion().format);
   auto const format = traits.GetHouseToStreetTableFormat();
 
   unique_ptr<HouseToStreetTable> result;
 
   try
   {
-    if (format == MwmTraits::HouseToStreetTableFormat::Fixed3BitsDDVector)
+    if (format == version::MwmTraits::HouseToStreetTableFormat::Fixed3BitsDDVector)
       result.reset(new Fixed3BitsTable(value));
   }
   catch (Reader::OpenException const & ex)