From 08dca5bb265c1612f74ade8ec899409fe605de85 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 30 Apr 2012 01:51:51 +0200
Subject: [PATCH] Update Cpp structure

---
 OsmAnd/.cproject                              |   2 +-
 OsmAnd/jni/Android.mk                         |   2 +-
 Osmand-kernel/.cproject                       | 106 ++++++++++++++++++
 Osmand-kernel/.project                        |  13 +++
 Osmand-kernel/Android.mk                      |   4 +
 .../cpufeatures_proxy/Android.mk              |   2 +-
 .../cpufeatures_proxy/cpuCheck.cpp            |   0
 .../jni => Osmand-kernel}/expat/Android.mk    |   2 +-
 .../jni => Osmand-kernel}/expat/expat_library |   0
 .../jni => Osmand-kernel}/freetype/Android.mk |   4 +-
 .../freetype/freetype_library                 |   0
 {OsmAnd/jni => Osmand-kernel}/gif/Android.mk  |   4 +-
 {OsmAnd/jni => Osmand-kernel}/gif/gif_library |   0
 .../jni-prebuilt/.gitignore                   |   0
 {OsmAnd/jni => Osmand-kernel}/jpeg/Android.mk |   4 +-
 .../jni => Osmand-kernel}/jpeg/jpeg_library   |   0
 .../jni => Osmand-kernel}/osmand/Android.mk   |   0
 .../osmand/binaryRead.cpp                     |   0
 .../jni => Osmand-kernel}/osmand/common.cpp   |   0
 {OsmAnd/jni => Osmand-kernel}/osmand/common.h |   0
 .../osmand/mapObjects.cpp                     |   0
 .../jni => Osmand-kernel}/osmand/mapObjects.h |   0
 .../osmand/multipolygons.h                    |   0
 .../osmand/proto/osmand_odb.pb.h              |   0
 .../osmand/renderRules.cpp                    |   0
 .../osmand/renderRules.h                      |   0
 .../osmand/rendering.cpp                      |   0
 .../jni => Osmand-kernel}/osmand/textdraw.cpp |   0
 {OsmAnd/jni => Osmand-kernel}/osmand/utf8.cpp |   0
 {OsmAnd/jni => Osmand-kernel}/png/Android.mk  |   4 +-
 {OsmAnd/jni => Osmand-kernel}/png/png_library |   0
 .../jni => Osmand-kernel}/protobuf/Android.mk |   4 +-
 .../jni => Osmand-kernel}/protobuf/config.h   |   0
 .../protobuf/google/protobuf/descriptor.cc    |   0
 .../protobuf/google/protobuf/descriptor.h     |   0
 .../protobuf/google/protobuf/descriptor.pb.cc |   0
 .../protobuf/google/protobuf/descriptor.pb.h  |   0
 .../protobuf/google/protobuf/descriptor.proto |   0
 .../google/protobuf/descriptor_database.cc    |   0
 .../google/protobuf/descriptor_database.h     |   0
 .../protobuf/descriptor_database_unittest.cc  |   0
 .../google/protobuf/descriptor_unittest.cc    |   0
 .../google/protobuf/dynamic_message.cc        |   0
 .../google/protobuf/dynamic_message.h         |   0
 .../protobuf/dynamic_message_unittest.cc      |   0
 .../protobuf/google/protobuf/extension_set.cc |   0
 .../protobuf/google/protobuf/extension_set.h  |   0
 .../google/protobuf/extension_set_heavy.cc    |   0
 .../google/protobuf/extension_set_unittest.cc |   0
 .../protobuf/generated_message_reflection.cc  |   0
 .../protobuf/generated_message_reflection.h   |   0
 .../generated_message_reflection_unittest.cc  |   0
 .../google/protobuf/generated_message_util.cc |   0
 .../google/protobuf/generated_message_util.h  |   0
 .../google/protobuf/io/coded_stream.cc        |   0
 .../google/protobuf/io/coded_stream.h         |   0
 .../google/protobuf/io/coded_stream_inl.h     |   0
 .../protobuf/io/coded_stream_unittest.cc      |   0
 .../google/protobuf/io/gzip_stream.cc         |   0
 .../protobuf/google/protobuf/io/gzip_stream.h |   0
 .../protobuf/io/gzip_stream_unittest.sh       |   0
 .../google/protobuf/io/package_info.h         |   0
 .../protobuf/google/protobuf/io/printer.cc    |   0
 .../protobuf/google/protobuf/io/printer.h     |   0
 .../google/protobuf/io/printer_unittest.cc    |   0
 .../protobuf/google/protobuf/io/tokenizer.cc  |   0
 .../protobuf/google/protobuf/io/tokenizer.h   |   0
 .../google/protobuf/io/tokenizer_unittest.cc  |   0
 .../google/protobuf/io/zero_copy_stream.cc    |   0
 .../google/protobuf/io/zero_copy_stream.h     |   0
 .../protobuf/io/zero_copy_stream_impl.cc      |   0
 .../protobuf/io/zero_copy_stream_impl.h       |   0
 .../protobuf/io/zero_copy_stream_impl_lite.cc |   0
 .../protobuf/io/zero_copy_stream_impl_lite.h  |   0
 .../protobuf/io/zero_copy_stream_unittest.cc  |   0
 .../protobuf/google/protobuf/lite_unittest.cc |   0
 .../protobuf/google/protobuf/message.cc       |   0
 .../protobuf/google/protobuf/message.h        |   0
 .../protobuf/google/protobuf/message_lite.cc  |   0
 .../protobuf/google/protobuf/message_lite.h   |   0
 .../google/protobuf/message_unittest.cc       |   0
 .../protobuf/google/protobuf/package_info.h   |   0
 .../google/protobuf/reflection_ops.cc         |   0
 .../protobuf/google/protobuf/reflection_ops.h |   0
 .../protobuf/reflection_ops_unittest.cc       |   0
 .../google/protobuf/repeated_field.cc         |   0
 .../protobuf/google/protobuf/repeated_field.h |   0
 .../protobuf/repeated_field_unittest.cc       |   0
 .../protobuf/google/protobuf/service.cc       |   0
 .../protobuf/google/protobuf/service.h        |   0
 .../protobuf/google/protobuf/stubs/common.cc  |   0
 .../protobuf/google/protobuf/stubs/common.h   |   0
 .../google/protobuf/stubs/common_unittest.cc  |   0
 .../protobuf/google/protobuf/stubs/hash.cc    |   0
 .../protobuf/google/protobuf/stubs/hash.h     |   0
 .../protobuf/google/protobuf/stubs/map-util.h |   0
 .../protobuf/google/protobuf/stubs/once.cc    |   0
 .../protobuf/google/protobuf/stubs/once.h     |   0
 .../google/protobuf/stubs/once_unittest.cc    |   0
 .../google/protobuf/stubs/stl_util-inl.h      |   0
 .../protobuf/stubs/structurally_valid.cc      |   0
 .../stubs/structurally_valid_unittest.cc      |   0
 .../protobuf/google/protobuf/stubs/strutil.cc |   0
 .../protobuf/google/protobuf/stubs/strutil.h  |   0
 .../google/protobuf/stubs/strutil_unittest.cc |   0
 .../google/protobuf/stubs/substitute.cc       |   0
 .../google/protobuf/stubs/substitute.h        |   0
 .../protobuf/google/protobuf/test_util.cc     |   0
 .../protobuf/google/protobuf/test_util.h      |   0
 .../google/protobuf/test_util_lite.cc         |   0
 .../protobuf/google/protobuf/test_util_lite.h |   0
 .../protobuf/google/protobuf/text_format.cc   |   0
 .../protobuf/google/protobuf/text_format.h    |   0
 .../google/protobuf/text_format_unittest.cc   |   0
 .../google/protobuf/unknown_field_set.cc      |   0
 .../google/protobuf/unknown_field_set.h       |   0
 .../protobuf/unknown_field_set_unittest.cc    |   0
 .../protobuf/google/protobuf/wire_format.cc   |   0
 .../protobuf/google/protobuf/wire_format.h    |   0
 .../google/protobuf/wire_format_lite.cc       |   0
 .../google/protobuf/wire_format_lite.h        |   0
 .../google/protobuf/wire_format_lite_inl.h    |   0
 .../google/protobuf/wire_format_unittest.cc   |   0
 {OsmAnd/jni => Osmand-kernel}/skia/Android.mk |   4 +-
 .../jni => Osmand-kernel}/skia/FakeHost.mk    |   0
 .../skia/FontHostConfiguration_android.cpp    |   0
 .../skia/cutils/properties.h                  |   0
 .../jni => Osmand-kernel}/skia/skia_library   |   0
 .../jni => Osmand-kernel}/skia/utils/misc.h   |   0
 129 files changed, 139 insertions(+), 16 deletions(-)
 create mode 100644 Osmand-kernel/.cproject
 create mode 100644 Osmand-kernel/.project
 create mode 100755 Osmand-kernel/Android.mk
 rename {OsmAnd/jni => Osmand-kernel}/cpufeatures_proxy/Android.mk (88%)
 rename {OsmAnd/jni => Osmand-kernel}/cpufeatures_proxy/cpuCheck.cpp (100%)
 rename {OsmAnd/jni => Osmand-kernel}/expat/Android.mk (92%)
 rename {OsmAnd/jni => Osmand-kernel}/expat/expat_library (100%)
 rename {OsmAnd/jni => Osmand-kernel}/freetype/Android.mk (96%)
 rename {OsmAnd/jni => Osmand-kernel}/freetype/freetype_library (100%)
 rename {OsmAnd/jni => Osmand-kernel}/gif/Android.mk (90%)
 rename {OsmAnd/jni => Osmand-kernel}/gif/gif_library (100%)
 rename {OsmAnd => Osmand-kernel}/jni-prebuilt/.gitignore (100%)
 rename {OsmAnd/jni => Osmand-kernel}/jpeg/Android.mk (97%)
 rename {OsmAnd/jni => Osmand-kernel}/jpeg/jpeg_library (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/Android.mk (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/binaryRead.cpp (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/common.cpp (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/common.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/mapObjects.cpp (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/mapObjects.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/multipolygons.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/proto/osmand_odb.pb.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/renderRules.cpp (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/renderRules.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/rendering.cpp (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/textdraw.cpp (100%)
 rename {OsmAnd/jni => Osmand-kernel}/osmand/utf8.cpp (100%)
 rename {OsmAnd/jni => Osmand-kernel}/png/Android.mk (96%)
 rename {OsmAnd/jni => Osmand-kernel}/png/png_library (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/Android.mk (95%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/config.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/descriptor.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/descriptor.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/descriptor.pb.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/descriptor.pb.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/descriptor.proto (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/descriptor_database.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/descriptor_database.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/descriptor_database_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/descriptor_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/dynamic_message.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/dynamic_message.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/dynamic_message_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/extension_set.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/extension_set.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/extension_set_heavy.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/extension_set_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/generated_message_reflection.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/generated_message_reflection.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/generated_message_reflection_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/generated_message_util.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/generated_message_util.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/coded_stream.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/coded_stream.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/coded_stream_inl.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/coded_stream_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/gzip_stream.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/gzip_stream.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/gzip_stream_unittest.sh (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/package_info.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/printer.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/printer.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/printer_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/tokenizer.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/tokenizer.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/tokenizer_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/zero_copy_stream.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/zero_copy_stream.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/zero_copy_stream_impl.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/zero_copy_stream_impl.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/io/zero_copy_stream_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/lite_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/message.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/message.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/message_lite.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/message_lite.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/message_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/package_info.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/reflection_ops.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/reflection_ops.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/reflection_ops_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/repeated_field.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/repeated_field.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/repeated_field_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/service.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/service.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/common.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/common.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/common_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/hash.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/hash.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/map-util.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/once.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/once.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/once_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/stl_util-inl.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/structurally_valid.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/structurally_valid_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/strutil.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/strutil.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/strutil_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/substitute.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/stubs/substitute.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/test_util.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/test_util.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/test_util_lite.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/test_util_lite.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/text_format.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/text_format.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/text_format_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/unknown_field_set.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/unknown_field_set.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/unknown_field_set_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/wire_format.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/wire_format.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/wire_format_lite.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/wire_format_lite.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/wire_format_lite_inl.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/protobuf/google/protobuf/wire_format_unittest.cc (100%)
 rename {OsmAnd/jni => Osmand-kernel}/skia/Android.mk (99%)
 rename {OsmAnd/jni => Osmand-kernel}/skia/FakeHost.mk (100%)
 rename {OsmAnd/jni => Osmand-kernel}/skia/FontHostConfiguration_android.cpp (100%)
 rename {OsmAnd/jni => Osmand-kernel}/skia/cutils/properties.h (100%)
 rename {OsmAnd/jni => Osmand-kernel}/skia/skia_library (100%)
 rename {OsmAnd/jni => Osmand-kernel}/skia/utils/misc.h (100%)

diff --git a/OsmAnd/.cproject b/OsmAnd/.cproject
index d39c0c2ad8..8f6765b984 100644
--- a/OsmAnd/.cproject
+++ b/OsmAnd/.cproject
@@ -61,7 +61,7 @@
 						</toolChain>
 					</folderInfo>
 					<sourceEntries>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="jni/osmand"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk
index 9bff14a26a..e8ce00c5d7 100755
--- a/OsmAnd/jni/Android.mk
+++ b/OsmAnd/jni/Android.mk
@@ -1,4 +1,4 @@
-OSMAND_MAKEFILES := $(all-subdir-makefiles)
+OSMAND_MAKEFILES := ../Osmand-kernel/Android.mk
 
 # Protect from previous builds
 ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
diff --git a/Osmand-kernel/.cproject b/Osmand-kernel/.cproject
new file mode 100644
index 0000000000..8f6765b984
--- /dev/null
+++ b/Osmand-kernel/.cproject
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?>
+
+<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="com.android.toolchain.gcc.128294115">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.android.toolchain.gcc.128294115" moduleId="org.eclipse.cdt.core.settings" name="Default">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="OsmAnd" buildProperties="" description="" id="com.android.toolchain.gcc.128294115" name="Default" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="com.android.toolchain.gcc.128294115.2018451624" name="/" resourcePath="">
+						<toolChain id="com.android.toolchain.gcc.88177390" name="com.android.toolchain.gcc" superClass="com.android.toolchain.gcc">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.android.targetPlatform.998053113" name="Android Platform" osList="all" superClass="com.android.targetPlatform"/>
+							<builder arguments="${ANDROID_NDK}/ndk-build" command="sh" enableCleanBuild="false" enabledIncrementalBuild="true" id="com.android.builder.1130188873" incrementalBuildTarget="V=1" keepEnvironmentInBuildfile="false" managedBuildOn="false" superClass="com.android.builder">
+								<outputEntries>
+									<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="outputPath" name="libs"/>
+								</outputEntries>
+							</builder>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.2094589046" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="com.android.tool.compiler.g++.1543637239" name="Android G++" superClass="com.android.tool.compiler.g++">
+								<option id="gnu.cpp.compiler.option.include.paths.757537552" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="/home/victor/projects/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include"/>
+									<listOptionValue builtIn="false" value="/home/victor/projects/android/external/skia/include/core"/>
+									<listOptionValue builtIn="false" value="/home/victor/projects/android/frameworks/base/include"/>
+									<listOptionValue builtIn="false" value="/home/victor/projects/android/external/skia/include/effects"/>
+									<listOptionValue builtIn="false" value="/home/victor/projects/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/libs/armeabi/include"/>
+									<listOptionValue builtIn="false" value="/home/victor/projects/android-ndk-r6b/platforms/android-8/arch-arm/usr/include/linux/"/>
+									<listOptionValue builtIn="false" value="/home/victor/projects/android-ndk-r6b/sources/cxx-stl/system/include"/>
+									<listOptionValue builtIn="false" value="/home/victor/projects/android-ndk-r6b/sources/cxx-stl/stlport/stlport"/>
+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/OsmAnd/jni/protobuf}&quot;"/>
+								</option>
+								<inputType id="com.android.tool.compiler.g++.input.478508689" superClass="com.android.tool.compiler.g++.input"/>
+							</tool>
+							<tool id="com.android.tool.compiler.c.1571517563" name="Android GCC" superClass="com.android.tool.compiler.c">
+								<option id="gnu.c.compiler.option.include.paths.741601891" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+									<listOptionValue builtIn="false" value="/home/victor/projects/android-ndk-r6b/sources/cxx-stl/gnu-libstdc++/include"/>
+								</option>
+								<inputType id="com.android.tool.compiler.c.input.1589735828" superClass="com.android.tool.compiler.c.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.1072970274" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1246211237" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+								<option id="gnu.cpp.link.option.paths.266312846" name="Library search path (-L)" superClass="gnu.cpp.link.option.paths"/>
+								<option id="gnu.cpp.link.option.libs.743028931" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs"/>
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.2067702743" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.160853213" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.2064867964" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="OsmAnd.null.100587230" name="OsmAnd"/>
+	</storageModule>
+	<storageModule moduleId="refreshScope" versionNumber="1">
+		<resource resourceType="PROJECT" workspacePath="/OsmAnd"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.128294115;com.android.toolchain.gcc.128294115.2047610242;com.android.tool.compiler.g++.592567664;com.android.tool.compiler.g++.input.893364443">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.128294115;com.android.toolchain.gcc.128294115.724578803;com.android.tool.compiler.c.1707562195;com.android.tool.compiler.c.input.1747499585">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.128294115;com.android.toolchain.gcc.128294115.2047610242;com.android.tool.compiler.c.720867356;com.android.tool.compiler.c.input.1326523466">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.128294115;com.android.toolchain.gcc.128294115.1436946720;com.android.tool.compiler.g++.1800289881;com.android.tool.compiler.g++.input.1857432244">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.128294115;com.android.toolchain.gcc.128294115.1436946720;com.android.tool.compiler.c.935108432;com.android.tool.compiler.c.input.446006655">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.128294115;com.android.toolchain.gcc.128294115.2018451624;com.android.tool.compiler.g++.1543637239;com.android.tool.compiler.g++.input.478508689">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.128294115;com.android.toolchain.gcc.128294115.724578803;com.android.tool.compiler.g++.1036636492;com.android.tool.compiler.g++.input.325212280">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="com.android.toolchain.gcc.128294115;com.android.toolchain.gcc.128294115.2018451624;com.android.tool.compiler.c.1571517563;com.android.tool.compiler.c.input.1589735828">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerFileProfile"/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+</cproject>
diff --git a/Osmand-kernel/.project b/Osmand-kernel/.project
new file mode 100644
index 0000000000..3370cd4380
--- /dev/null
+++ b/Osmand-kernel/.project
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Osmand-kernel</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+	</natures>
+</projectDescription>
diff --git a/Osmand-kernel/Android.mk b/Osmand-kernel/Android.mk
new file mode 100755
index 0000000000..8035975a1b
--- /dev/null
+++ b/Osmand-kernel/Android.mk
@@ -0,0 +1,4 @@
+OSMAND_MAKEFILES := $(all-subdir-makefiles)
+# By default, include makefiles only once
+include $(OSMAND_MAKEFILES)
+
diff --git a/OsmAnd/jni/cpufeatures_proxy/Android.mk b/Osmand-kernel/cpufeatures_proxy/Android.mk
similarity index 88%
rename from OsmAnd/jni/cpufeatures_proxy/Android.mk
rename to Osmand-kernel/cpufeatures_proxy/Android.mk
index ecf9552b43..6c016c1cc7 100755
--- a/OsmAnd/jni/cpufeatures_proxy/Android.mk
+++ b/Osmand-kernel/cpufeatures_proxy/Android.mk
@@ -15,7 +15,7 @@ LOCAL_STATIC_LIBRARIES := cpufeatures
 include $(BUILD_SHARED_LIBRARY)
 else
 LOCAL_SRC_FILES := \
-	../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so
+	../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so
 LOCAL_STATIC_LIBRARIES := cpufeatures
 include $(PREBUILT_SHARED_LIBRARY)
 endif
diff --git a/OsmAnd/jni/cpufeatures_proxy/cpuCheck.cpp b/Osmand-kernel/cpufeatures_proxy/cpuCheck.cpp
similarity index 100%
rename from OsmAnd/jni/cpufeatures_proxy/cpuCheck.cpp
rename to Osmand-kernel/cpufeatures_proxy/cpuCheck.cpp
diff --git a/OsmAnd/jni/expat/Android.mk b/Osmand-kernel/expat/Android.mk
similarity index 92%
rename from OsmAnd/jni/expat/Android.mk
rename to Osmand-kernel/expat/Android.mk
index dfe6be4ea0..5ee5a86a86 100755
--- a/OsmAnd/jni/expat/Android.mk
+++ b/Osmand-kernel/expat/Android.mk
@@ -33,6 +33,6 @@ include $(BUILD_STATIC_LIBRARY)
 
 else
 LOCAL_SRC_FILES := \
-	../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
+	../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
 include $(PREBUILT_STATIC_LIBRARY)
 endif
diff --git a/OsmAnd/jni/expat/expat_library b/Osmand-kernel/expat/expat_library
similarity index 100%
rename from OsmAnd/jni/expat/expat_library
rename to Osmand-kernel/expat/expat_library
diff --git a/OsmAnd/jni/freetype/Android.mk b/Osmand-kernel/freetype/Android.mk
similarity index 96%
rename from OsmAnd/jni/freetype/Android.mk
rename to Osmand-kernel/freetype/Android.mk
index 10cd1b7432..8493fa6edc 100755
--- a/OsmAnd/jni/freetype/Android.mk
+++ b/Osmand-kernel/freetype/Android.mk
@@ -63,6 +63,6 @@ include $(BUILD_STATIC_LIBRARY)
 
 else
 LOCAL_SRC_FILES := \
-	../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
+	../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
 include $(PREBUILT_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif
diff --git a/OsmAnd/jni/freetype/freetype_library b/Osmand-kernel/freetype/freetype_library
similarity index 100%
rename from OsmAnd/jni/freetype/freetype_library
rename to Osmand-kernel/freetype/freetype_library
diff --git a/OsmAnd/jni/gif/Android.mk b/Osmand-kernel/gif/Android.mk
similarity index 90%
rename from OsmAnd/jni/gif/Android.mk
rename to Osmand-kernel/gif/Android.mk
index d1d224dfd1..05327ff419 100755
--- a/OsmAnd/jni/gif/Android.mk
+++ b/Osmand-kernel/gif/Android.mk
@@ -30,6 +30,6 @@ include $(BUILD_STATIC_LIBRARY)
 
 else
 LOCAL_SRC_FILES := \
-	../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
+	../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
 include $(PREBUILT_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif
diff --git a/OsmAnd/jni/gif/gif_library b/Osmand-kernel/gif/gif_library
similarity index 100%
rename from OsmAnd/jni/gif/gif_library
rename to Osmand-kernel/gif/gif_library
diff --git a/OsmAnd/jni-prebuilt/.gitignore b/Osmand-kernel/jni-prebuilt/.gitignore
similarity index 100%
rename from OsmAnd/jni-prebuilt/.gitignore
rename to Osmand-kernel/jni-prebuilt/.gitignore
diff --git a/OsmAnd/jni/jpeg/Android.mk b/Osmand-kernel/jpeg/Android.mk
similarity index 97%
rename from OsmAnd/jni/jpeg/Android.mk
rename to Osmand-kernel/jpeg/Android.mk
index 0ea59ca05b..11ddb18f9a 100755
--- a/OsmAnd/jni/jpeg/Android.mk
+++ b/Osmand-kernel/jpeg/Android.mk
@@ -86,6 +86,6 @@ include $(BUILD_STATIC_LIBRARY)
 
 else
 LOCAL_SRC_FILES := \
-	../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
+	../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
 include $(PREBUILT_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif
diff --git a/OsmAnd/jni/jpeg/jpeg_library b/Osmand-kernel/jpeg/jpeg_library
similarity index 100%
rename from OsmAnd/jni/jpeg/jpeg_library
rename to Osmand-kernel/jpeg/jpeg_library
diff --git a/OsmAnd/jni/osmand/Android.mk b/Osmand-kernel/osmand/Android.mk
similarity index 100%
rename from OsmAnd/jni/osmand/Android.mk
rename to Osmand-kernel/osmand/Android.mk
diff --git a/OsmAnd/jni/osmand/binaryRead.cpp b/Osmand-kernel/osmand/binaryRead.cpp
similarity index 100%
rename from OsmAnd/jni/osmand/binaryRead.cpp
rename to Osmand-kernel/osmand/binaryRead.cpp
diff --git a/OsmAnd/jni/osmand/common.cpp b/Osmand-kernel/osmand/common.cpp
similarity index 100%
rename from OsmAnd/jni/osmand/common.cpp
rename to Osmand-kernel/osmand/common.cpp
diff --git a/OsmAnd/jni/osmand/common.h b/Osmand-kernel/osmand/common.h
similarity index 100%
rename from OsmAnd/jni/osmand/common.h
rename to Osmand-kernel/osmand/common.h
diff --git a/OsmAnd/jni/osmand/mapObjects.cpp b/Osmand-kernel/osmand/mapObjects.cpp
similarity index 100%
rename from OsmAnd/jni/osmand/mapObjects.cpp
rename to Osmand-kernel/osmand/mapObjects.cpp
diff --git a/OsmAnd/jni/osmand/mapObjects.h b/Osmand-kernel/osmand/mapObjects.h
similarity index 100%
rename from OsmAnd/jni/osmand/mapObjects.h
rename to Osmand-kernel/osmand/mapObjects.h
diff --git a/OsmAnd/jni/osmand/multipolygons.h b/Osmand-kernel/osmand/multipolygons.h
similarity index 100%
rename from OsmAnd/jni/osmand/multipolygons.h
rename to Osmand-kernel/osmand/multipolygons.h
diff --git a/OsmAnd/jni/osmand/proto/osmand_odb.pb.h b/Osmand-kernel/osmand/proto/osmand_odb.pb.h
similarity index 100%
rename from OsmAnd/jni/osmand/proto/osmand_odb.pb.h
rename to Osmand-kernel/osmand/proto/osmand_odb.pb.h
diff --git a/OsmAnd/jni/osmand/renderRules.cpp b/Osmand-kernel/osmand/renderRules.cpp
similarity index 100%
rename from OsmAnd/jni/osmand/renderRules.cpp
rename to Osmand-kernel/osmand/renderRules.cpp
diff --git a/OsmAnd/jni/osmand/renderRules.h b/Osmand-kernel/osmand/renderRules.h
similarity index 100%
rename from OsmAnd/jni/osmand/renderRules.h
rename to Osmand-kernel/osmand/renderRules.h
diff --git a/OsmAnd/jni/osmand/rendering.cpp b/Osmand-kernel/osmand/rendering.cpp
similarity index 100%
rename from OsmAnd/jni/osmand/rendering.cpp
rename to Osmand-kernel/osmand/rendering.cpp
diff --git a/OsmAnd/jni/osmand/textdraw.cpp b/Osmand-kernel/osmand/textdraw.cpp
similarity index 100%
rename from OsmAnd/jni/osmand/textdraw.cpp
rename to Osmand-kernel/osmand/textdraw.cpp
diff --git a/OsmAnd/jni/osmand/utf8.cpp b/Osmand-kernel/osmand/utf8.cpp
similarity index 100%
rename from OsmAnd/jni/osmand/utf8.cpp
rename to Osmand-kernel/osmand/utf8.cpp
diff --git a/OsmAnd/jni/png/Android.mk b/Osmand-kernel/png/Android.mk
similarity index 96%
rename from OsmAnd/jni/png/Android.mk
rename to Osmand-kernel/png/Android.mk
index bfbd30057b..69156321cb 100755
--- a/OsmAnd/jni/png/Android.mk
+++ b/Osmand-kernel/png/Android.mk
@@ -63,6 +63,6 @@ include $(BUILD_STATIC_LIBRARY)
 
 else
 LOCAL_SRC_FILES := \
-	../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
+	../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
 include $(PREBUILT_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif
diff --git a/OsmAnd/jni/png/png_library b/Osmand-kernel/png/png_library
similarity index 100%
rename from OsmAnd/jni/png/png_library
rename to Osmand-kernel/png/png_library
diff --git a/OsmAnd/jni/protobuf/Android.mk b/Osmand-kernel/protobuf/Android.mk
similarity index 95%
rename from OsmAnd/jni/protobuf/Android.mk
rename to Osmand-kernel/protobuf/Android.mk
index c18c97cc80..d2c7f1d7c0 100644
--- a/OsmAnd/jni/protobuf/Android.mk
+++ b/Osmand-kernel/protobuf/Android.mk
@@ -40,6 +40,6 @@ include $(BUILD_STATIC_LIBRARY)
 
 else
 LOCAL_SRC_FILES := \
-	../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
+	../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
 include $(PREBUILT_STATIC_LIBRARY)
-endif
\ No newline at end of file
+endif
diff --git a/OsmAnd/jni/protobuf/config.h b/Osmand-kernel/protobuf/config.h
similarity index 100%
rename from OsmAnd/jni/protobuf/config.h
rename to Osmand-kernel/protobuf/config.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.cc
rename to Osmand-kernel/protobuf/google/protobuf/descriptor.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.h b/Osmand-kernel/protobuf/google/protobuf/descriptor.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.h
rename to Osmand-kernel/protobuf/google/protobuf/descriptor.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.pb.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor.pb.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.pb.cc
rename to Osmand-kernel/protobuf/google/protobuf/descriptor.pb.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.pb.h b/Osmand-kernel/protobuf/google/protobuf/descriptor.pb.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.pb.h
rename to Osmand-kernel/protobuf/google/protobuf/descriptor.pb.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor.proto b/Osmand-kernel/protobuf/google/protobuf/descriptor.proto
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/descriptor.proto
rename to Osmand-kernel/protobuf/google/protobuf/descriptor.proto
diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor_database.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor_database.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/descriptor_database.cc
rename to Osmand-kernel/protobuf/google/protobuf/descriptor_database.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor_database.h b/Osmand-kernel/protobuf/google/protobuf/descriptor_database.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/descriptor_database.h
rename to Osmand-kernel/protobuf/google/protobuf/descriptor_database.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor_database_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor_database_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/descriptor_database_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/descriptor_database_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/descriptor_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/descriptor_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/descriptor_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/descriptor_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/dynamic_message.cc b/Osmand-kernel/protobuf/google/protobuf/dynamic_message.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/dynamic_message.cc
rename to Osmand-kernel/protobuf/google/protobuf/dynamic_message.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/dynamic_message.h b/Osmand-kernel/protobuf/google/protobuf/dynamic_message.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/dynamic_message.h
rename to Osmand-kernel/protobuf/google/protobuf/dynamic_message.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/dynamic_message_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/dynamic_message_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/dynamic_message_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/dynamic_message_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/extension_set.cc b/Osmand-kernel/protobuf/google/protobuf/extension_set.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/extension_set.cc
rename to Osmand-kernel/protobuf/google/protobuf/extension_set.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/extension_set.h b/Osmand-kernel/protobuf/google/protobuf/extension_set.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/extension_set.h
rename to Osmand-kernel/protobuf/google/protobuf/extension_set.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/extension_set_heavy.cc b/Osmand-kernel/protobuf/google/protobuf/extension_set_heavy.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/extension_set_heavy.cc
rename to Osmand-kernel/protobuf/google/protobuf/extension_set_heavy.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/extension_set_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/extension_set_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/extension_set_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/extension_set_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection.cc b/Osmand-kernel/protobuf/google/protobuf/generated_message_reflection.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection.cc
rename to Osmand-kernel/protobuf/google/protobuf/generated_message_reflection.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection.h b/Osmand-kernel/protobuf/google/protobuf/generated_message_reflection.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection.h
rename to Osmand-kernel/protobuf/google/protobuf/generated_message_reflection.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/generated_message_reflection_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_reflection_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/generated_message_reflection_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_util.cc b/Osmand-kernel/protobuf/google/protobuf/generated_message_util.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_util.cc
rename to Osmand-kernel/protobuf/google/protobuf/generated_message_util.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/generated_message_util.h b/Osmand-kernel/protobuf/google/protobuf/generated_message_util.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/generated_message_util.h
rename to Osmand-kernel/protobuf/google/protobuf/generated_message_util.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.cc b/Osmand-kernel/protobuf/google/protobuf/io/coded_stream.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/coded_stream.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.h b/Osmand-kernel/protobuf/google/protobuf/io/coded_stream.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/coded_stream.h
rename to Osmand-kernel/protobuf/google/protobuf/io/coded_stream.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream_inl.h b/Osmand-kernel/protobuf/google/protobuf/io/coded_stream_inl.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/coded_stream_inl.h
rename to Osmand-kernel/protobuf/google/protobuf/io/coded_stream_inl.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/coded_stream_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/io/coded_stream_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/coded_stream_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/coded_stream_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream.cc b/Osmand-kernel/protobuf/google/protobuf/io/gzip_stream.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/gzip_stream.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream.h b/Osmand-kernel/protobuf/google/protobuf/io/gzip_stream.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream.h
rename to Osmand-kernel/protobuf/google/protobuf/io/gzip_stream.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream_unittest.sh b/Osmand-kernel/protobuf/google/protobuf/io/gzip_stream_unittest.sh
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/gzip_stream_unittest.sh
rename to Osmand-kernel/protobuf/google/protobuf/io/gzip_stream_unittest.sh
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/package_info.h b/Osmand-kernel/protobuf/google/protobuf/io/package_info.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/package_info.h
rename to Osmand-kernel/protobuf/google/protobuf/io/package_info.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/printer.cc b/Osmand-kernel/protobuf/google/protobuf/io/printer.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/printer.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/printer.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/printer.h b/Osmand-kernel/protobuf/google/protobuf/io/printer.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/printer.h
rename to Osmand-kernel/protobuf/google/protobuf/io/printer.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/printer_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/io/printer_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/printer_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/printer_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/tokenizer.cc b/Osmand-kernel/protobuf/google/protobuf/io/tokenizer.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/tokenizer.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/tokenizer.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/tokenizer.h b/Osmand-kernel/protobuf/google/protobuf/io/tokenizer.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/tokenizer.h
rename to Osmand-kernel/protobuf/google/protobuf/io/tokenizer.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/tokenizer_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/io/tokenizer_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/tokenizer_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/tokenizer_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream.cc b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream.h b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream.h
rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl.cc b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl.h b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl.h
rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h
rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_impl_lite.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/io/zero_copy_stream_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/io/zero_copy_stream_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/lite_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/lite_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/lite_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/lite_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/message.cc b/Osmand-kernel/protobuf/google/protobuf/message.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/message.cc
rename to Osmand-kernel/protobuf/google/protobuf/message.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/message.h b/Osmand-kernel/protobuf/google/protobuf/message.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/message.h
rename to Osmand-kernel/protobuf/google/protobuf/message.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/message_lite.cc b/Osmand-kernel/protobuf/google/protobuf/message_lite.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/message_lite.cc
rename to Osmand-kernel/protobuf/google/protobuf/message_lite.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/message_lite.h b/Osmand-kernel/protobuf/google/protobuf/message_lite.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/message_lite.h
rename to Osmand-kernel/protobuf/google/protobuf/message_lite.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/message_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/message_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/message_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/message_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/package_info.h b/Osmand-kernel/protobuf/google/protobuf/package_info.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/package_info.h
rename to Osmand-kernel/protobuf/google/protobuf/package_info.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/reflection_ops.cc b/Osmand-kernel/protobuf/google/protobuf/reflection_ops.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/reflection_ops.cc
rename to Osmand-kernel/protobuf/google/protobuf/reflection_ops.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/reflection_ops.h b/Osmand-kernel/protobuf/google/protobuf/reflection_ops.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/reflection_ops.h
rename to Osmand-kernel/protobuf/google/protobuf/reflection_ops.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/reflection_ops_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/reflection_ops_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/reflection_ops_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/reflection_ops_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/repeated_field.cc b/Osmand-kernel/protobuf/google/protobuf/repeated_field.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/repeated_field.cc
rename to Osmand-kernel/protobuf/google/protobuf/repeated_field.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/repeated_field.h b/Osmand-kernel/protobuf/google/protobuf/repeated_field.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/repeated_field.h
rename to Osmand-kernel/protobuf/google/protobuf/repeated_field.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/repeated_field_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/repeated_field_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/repeated_field_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/repeated_field_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/service.cc b/Osmand-kernel/protobuf/google/protobuf/service.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/service.cc
rename to Osmand-kernel/protobuf/google/protobuf/service.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/service.h b/Osmand-kernel/protobuf/google/protobuf/service.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/service.h
rename to Osmand-kernel/protobuf/google/protobuf/service.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/common.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/common.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/common.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/common.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/common.h b/Osmand-kernel/protobuf/google/protobuf/stubs/common.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/common.h
rename to Osmand-kernel/protobuf/google/protobuf/stubs/common.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/common_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/common_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/common_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/common_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/hash.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/hash.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/hash.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/hash.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/hash.h b/Osmand-kernel/protobuf/google/protobuf/stubs/hash.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/hash.h
rename to Osmand-kernel/protobuf/google/protobuf/stubs/hash.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/map-util.h b/Osmand-kernel/protobuf/google/protobuf/stubs/map-util.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/map-util.h
rename to Osmand-kernel/protobuf/google/protobuf/stubs/map-util.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/once.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/once.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/once.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/once.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/once.h b/Osmand-kernel/protobuf/google/protobuf/stubs/once.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/once.h
rename to Osmand-kernel/protobuf/google/protobuf/stubs/once.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/once_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/once_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/once_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/once_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/stl_util-inl.h b/Osmand-kernel/protobuf/google/protobuf/stubs/stl_util-inl.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/stl_util-inl.h
rename to Osmand-kernel/protobuf/google/protobuf/stubs/stl_util-inl.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/structurally_valid.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/structurally_valid.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/structurally_valid.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/structurally_valid.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/structurally_valid_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/structurally_valid_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/structurally_valid_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/structurally_valid_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/strutil.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/strutil.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/strutil.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/strutil.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/strutil.h b/Osmand-kernel/protobuf/google/protobuf/stubs/strutil.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/strutil.h
rename to Osmand-kernel/protobuf/google/protobuf/stubs/strutil.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/strutil_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/strutil_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/strutil_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/strutil_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/substitute.cc b/Osmand-kernel/protobuf/google/protobuf/stubs/substitute.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/substitute.cc
rename to Osmand-kernel/protobuf/google/protobuf/stubs/substitute.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/stubs/substitute.h b/Osmand-kernel/protobuf/google/protobuf/stubs/substitute.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/stubs/substitute.h
rename to Osmand-kernel/protobuf/google/protobuf/stubs/substitute.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/test_util.cc b/Osmand-kernel/protobuf/google/protobuf/test_util.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/test_util.cc
rename to Osmand-kernel/protobuf/google/protobuf/test_util.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/test_util.h b/Osmand-kernel/protobuf/google/protobuf/test_util.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/test_util.h
rename to Osmand-kernel/protobuf/google/protobuf/test_util.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/test_util_lite.cc b/Osmand-kernel/protobuf/google/protobuf/test_util_lite.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/test_util_lite.cc
rename to Osmand-kernel/protobuf/google/protobuf/test_util_lite.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/test_util_lite.h b/Osmand-kernel/protobuf/google/protobuf/test_util_lite.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/test_util_lite.h
rename to Osmand-kernel/protobuf/google/protobuf/test_util_lite.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/text_format.cc b/Osmand-kernel/protobuf/google/protobuf/text_format.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/text_format.cc
rename to Osmand-kernel/protobuf/google/protobuf/text_format.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/text_format.h b/Osmand-kernel/protobuf/google/protobuf/text_format.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/text_format.h
rename to Osmand-kernel/protobuf/google/protobuf/text_format.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/text_format_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/text_format_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/text_format_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/text_format_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/unknown_field_set.cc b/Osmand-kernel/protobuf/google/protobuf/unknown_field_set.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/unknown_field_set.cc
rename to Osmand-kernel/protobuf/google/protobuf/unknown_field_set.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/unknown_field_set.h b/Osmand-kernel/protobuf/google/protobuf/unknown_field_set.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/unknown_field_set.h
rename to Osmand-kernel/protobuf/google/protobuf/unknown_field_set.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/unknown_field_set_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/unknown_field_set_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/unknown_field_set_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/unknown_field_set_unittest.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format.cc b/Osmand-kernel/protobuf/google/protobuf/wire_format.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/wire_format.cc
rename to Osmand-kernel/protobuf/google/protobuf/wire_format.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format.h b/Osmand-kernel/protobuf/google/protobuf/wire_format.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/wire_format.h
rename to Osmand-kernel/protobuf/google/protobuf/wire_format.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format_lite.cc b/Osmand-kernel/protobuf/google/protobuf/wire_format_lite.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/wire_format_lite.cc
rename to Osmand-kernel/protobuf/google/protobuf/wire_format_lite.cc
diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format_lite.h b/Osmand-kernel/protobuf/google/protobuf/wire_format_lite.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/wire_format_lite.h
rename to Osmand-kernel/protobuf/google/protobuf/wire_format_lite.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format_lite_inl.h b/Osmand-kernel/protobuf/google/protobuf/wire_format_lite_inl.h
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/wire_format_lite_inl.h
rename to Osmand-kernel/protobuf/google/protobuf/wire_format_lite_inl.h
diff --git a/OsmAnd/jni/protobuf/google/protobuf/wire_format_unittest.cc b/Osmand-kernel/protobuf/google/protobuf/wire_format_unittest.cc
similarity index 100%
rename from OsmAnd/jni/protobuf/google/protobuf/wire_format_unittest.cc
rename to Osmand-kernel/protobuf/google/protobuf/wire_format_unittest.cc
diff --git a/OsmAnd/jni/skia/Android.mk b/Osmand-kernel/skia/Android.mk
similarity index 99%
rename from OsmAnd/jni/skia/Android.mk
rename to Osmand-kernel/skia/Android.mk
index e1480c621d..aaaf839a2a 100755
--- a/OsmAnd/jni/skia/Android.mk
+++ b/Osmand-kernel/skia/Android.mk
@@ -330,10 +330,10 @@ include $(BUILD_STATIC_LIBRARY)
 
 else
 LOCAL_SRC_FILES := \
-	../../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
+	../jni-prebuilt/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).a
 include $(PREBUILT_STATIC_LIBRARY)
 endif
 
 # Fix some errors
 BUILD_HOST_EXECUTABLE := $(LOCAL_PATH)/FakeHost.mk
-BUILD_HOST_STATIC_LIBRARY := $(LOCAL_PATH)/FakeHost.mk 
\ No newline at end of file
+BUILD_HOST_STATIC_LIBRARY := $(LOCAL_PATH)/FakeHost.mk 
diff --git a/OsmAnd/jni/skia/FakeHost.mk b/Osmand-kernel/skia/FakeHost.mk
similarity index 100%
rename from OsmAnd/jni/skia/FakeHost.mk
rename to Osmand-kernel/skia/FakeHost.mk
diff --git a/OsmAnd/jni/skia/FontHostConfiguration_android.cpp b/Osmand-kernel/skia/FontHostConfiguration_android.cpp
similarity index 100%
rename from OsmAnd/jni/skia/FontHostConfiguration_android.cpp
rename to Osmand-kernel/skia/FontHostConfiguration_android.cpp
diff --git a/OsmAnd/jni/skia/cutils/properties.h b/Osmand-kernel/skia/cutils/properties.h
similarity index 100%
rename from OsmAnd/jni/skia/cutils/properties.h
rename to Osmand-kernel/skia/cutils/properties.h
diff --git a/OsmAnd/jni/skia/skia_library b/Osmand-kernel/skia/skia_library
similarity index 100%
rename from OsmAnd/jni/skia/skia_library
rename to Osmand-kernel/skia/skia_library
diff --git a/OsmAnd/jni/skia/utils/misc.h b/Osmand-kernel/skia/utils/misc.h
similarity index 100%
rename from OsmAnd/jni/skia/utils/misc.h
rename to Osmand-kernel/skia/utils/misc.h