diff --git a/OsmAnd-java/.classpath b/OsmAnd-java/.classpath deleted file mode 100644 index b6ceacea39..0000000000 --- a/OsmAnd-java/.classpath +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/OsmAnd-java/.gitignore b/OsmAnd-java/.gitignore index 2d0ecbd161..be4a9667ee 100644 --- a/OsmAnd-java/.gitignore +++ b/OsmAnd-java/.gitignore @@ -1,11 +1,10 @@ bin -c-src -OsmAnd-core.jar -protobuf-src/com -OsmAnd-core-android.jar +build src/net/osmand/core/jni/* result.* - +.settings +.project +.classpath # Android Studio /.idea *.iml diff --git a/OsmAnd-java/.project b/OsmAnd-java/.project deleted file mode 100644 index 60d41e0594..0000000000 --- a/OsmAnd-java/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - OsmAnd-java - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - - - OSMAND_TRUNK - $%7BPARENT-1-PROJECT_LOC%7D - - - diff --git a/OsmAnd-java/.settings/org.eclipse.jdt.core.prefs b/OsmAnd-java/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index d17b6724d1..0000000000 --- a/OsmAnd-java/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/OsmAnd-java/build.gradle b/OsmAnd-java/build.gradle index eb7b6077bf..aee1a8ce84 100644 --- a/OsmAnd-java/build.gradle +++ b/OsmAnd-java/build.gradle @@ -1,21 +1,3 @@ -apply plugin: 'java' -apply plugin: 'application' -mainClassName = "net.osmand.util.GeoPointParserUtil" -compileJava.options.encoding = 'UTF-8' - -tasks.withType(JavaCompile) { - sourceCompatibility = "1.7" - targetCompatibility = "1.7" -} - -sourceSets { - main { - java { - srcDirs = ["src"] - } - } -} - configurations { android } @@ -31,6 +13,10 @@ artifacts { } dependencies { - compile fileTree(dir: "libs", include: ["*.jar"]) + testImplementation 'junit:junit:4.12' + testImplementation 'com.google.code.gson:gson:2.8.2' + testImplementation 'org.hamcrest:hamcrest-core:1.3' + + implementation fileTree(dir: "libs", include: ["*.jar"]) } diff --git a/OsmAnd-java/run_tests.sh b/OsmAnd-java/run_tests.sh deleted file mode 100755 index 2b2eec9feb..0000000000 --- a/OsmAnd-java/run_tests.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -if [ ! -d bin ]; - then - echo "Building OsmAnd-java..."; - ant build -fi -echo "Starting tests..." -ant junits -echo "Results can be found in result.txt file." \ No newline at end of file diff --git a/OsmAnd-java/src/com/google/openlocationcode/OpenLocationCode.java b/OsmAnd-java/src/main/java/com/google/openlocationcode/OpenLocationCode.java similarity index 100% rename from OsmAnd-java/src/com/google/openlocationcode/OpenLocationCode.java rename to OsmAnd-java/src/main/java/com/google/openlocationcode/OpenLocationCode.java diff --git a/OsmAnd-java/src/com/google/protobuf/AbstractMessage.java b/OsmAnd-java/src/main/java/com/google/protobuf/AbstractMessage.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/AbstractMessage.java rename to OsmAnd-java/src/main/java/com/google/protobuf/AbstractMessage.java diff --git a/OsmAnd-java/src/com/google/protobuf/AbstractMessageLite.java b/OsmAnd-java/src/main/java/com/google/protobuf/AbstractMessageLite.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/AbstractMessageLite.java rename to OsmAnd-java/src/main/java/com/google/protobuf/AbstractMessageLite.java diff --git a/OsmAnd-java/src/com/google/protobuf/AbstractParser.java b/OsmAnd-java/src/main/java/com/google/protobuf/AbstractParser.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/AbstractParser.java rename to OsmAnd-java/src/main/java/com/google/protobuf/AbstractParser.java diff --git a/OsmAnd-java/src/com/google/protobuf/BlockingRpcChannel.java b/OsmAnd-java/src/main/java/com/google/protobuf/BlockingRpcChannel.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/BlockingRpcChannel.java rename to OsmAnd-java/src/main/java/com/google/protobuf/BlockingRpcChannel.java diff --git a/OsmAnd-java/src/com/google/protobuf/BlockingService.java b/OsmAnd-java/src/main/java/com/google/protobuf/BlockingService.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/BlockingService.java rename to OsmAnd-java/src/main/java/com/google/protobuf/BlockingService.java diff --git a/OsmAnd-java/src/com/google/protobuf/BoundedByteString.java b/OsmAnd-java/src/main/java/com/google/protobuf/BoundedByteString.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/BoundedByteString.java rename to OsmAnd-java/src/main/java/com/google/protobuf/BoundedByteString.java diff --git a/OsmAnd-java/src/com/google/protobuf/ByteString.java b/OsmAnd-java/src/main/java/com/google/protobuf/ByteString.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/ByteString.java rename to OsmAnd-java/src/main/java/com/google/protobuf/ByteString.java diff --git a/OsmAnd-java/src/com/google/protobuf/CodedInputStream.java b/OsmAnd-java/src/main/java/com/google/protobuf/CodedInputStream.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/CodedInputStream.java rename to OsmAnd-java/src/main/java/com/google/protobuf/CodedInputStream.java diff --git a/OsmAnd-java/src/com/google/protobuf/CodedInputStream.java.rej b/OsmAnd-java/src/main/java/com/google/protobuf/CodedInputStream.java.rej similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/CodedInputStream.java.rej rename to OsmAnd-java/src/main/java/com/google/protobuf/CodedInputStream.java.rej diff --git a/OsmAnd-java/src/com/google/protobuf/CodedOutputStream.java b/OsmAnd-java/src/main/java/com/google/protobuf/CodedOutputStream.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/CodedOutputStream.java rename to OsmAnd-java/src/main/java/com/google/protobuf/CodedOutputStream.java diff --git a/OsmAnd-java/src/com/google/protobuf/CodedOutputStream.java.rej b/OsmAnd-java/src/main/java/com/google/protobuf/CodedOutputStream.java.rej similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/CodedOutputStream.java.rej rename to OsmAnd-java/src/main/java/com/google/protobuf/CodedOutputStream.java.rej diff --git a/OsmAnd-java/src/com/google/protobuf/DescriptorProtos.java b/OsmAnd-java/src/main/java/com/google/protobuf/DescriptorProtos.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/DescriptorProtos.java rename to OsmAnd-java/src/main/java/com/google/protobuf/DescriptorProtos.java diff --git a/OsmAnd-java/src/com/google/protobuf/Descriptors.java b/OsmAnd-java/src/main/java/com/google/protobuf/Descriptors.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/Descriptors.java rename to OsmAnd-java/src/main/java/com/google/protobuf/Descriptors.java diff --git a/OsmAnd-java/src/com/google/protobuf/DynamicMessage.java b/OsmAnd-java/src/main/java/com/google/protobuf/DynamicMessage.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/DynamicMessage.java rename to OsmAnd-java/src/main/java/com/google/protobuf/DynamicMessage.java diff --git a/OsmAnd-java/src/com/google/protobuf/ExtensionRegistry.java b/OsmAnd-java/src/main/java/com/google/protobuf/ExtensionRegistry.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/ExtensionRegistry.java rename to OsmAnd-java/src/main/java/com/google/protobuf/ExtensionRegistry.java diff --git a/OsmAnd-java/src/com/google/protobuf/ExtensionRegistryLite.java b/OsmAnd-java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/ExtensionRegistryLite.java rename to OsmAnd-java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java diff --git a/OsmAnd-java/src/com/google/protobuf/FieldSet.java b/OsmAnd-java/src/main/java/com/google/protobuf/FieldSet.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/FieldSet.java rename to OsmAnd-java/src/main/java/com/google/protobuf/FieldSet.java diff --git a/OsmAnd-java/src/com/google/protobuf/GeneratedMessage.java b/OsmAnd-java/src/main/java/com/google/protobuf/GeneratedMessage.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/GeneratedMessage.java rename to OsmAnd-java/src/main/java/com/google/protobuf/GeneratedMessage.java diff --git a/OsmAnd-java/src/com/google/protobuf/GeneratedMessageLite.java b/OsmAnd-java/src/main/java/com/google/protobuf/GeneratedMessageLite.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/GeneratedMessageLite.java rename to OsmAnd-java/src/main/java/com/google/protobuf/GeneratedMessageLite.java diff --git a/OsmAnd-java/src/com/google/protobuf/Internal.java b/OsmAnd-java/src/main/java/com/google/protobuf/Internal.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/Internal.java rename to OsmAnd-java/src/main/java/com/google/protobuf/Internal.java diff --git a/OsmAnd-java/src/com/google/protobuf/InvalidProtocolBufferException.java b/OsmAnd-java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/InvalidProtocolBufferException.java rename to OsmAnd-java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java diff --git a/OsmAnd-java/src/com/google/protobuf/LazyField.java b/OsmAnd-java/src/main/java/com/google/protobuf/LazyField.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/LazyField.java rename to OsmAnd-java/src/main/java/com/google/protobuf/LazyField.java diff --git a/OsmAnd-java/src/com/google/protobuf/LazyStringArrayList.java b/OsmAnd-java/src/main/java/com/google/protobuf/LazyStringArrayList.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/LazyStringArrayList.java rename to OsmAnd-java/src/main/java/com/google/protobuf/LazyStringArrayList.java diff --git a/OsmAnd-java/src/com/google/protobuf/LazyStringList.java b/OsmAnd-java/src/main/java/com/google/protobuf/LazyStringList.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/LazyStringList.java rename to OsmAnd-java/src/main/java/com/google/protobuf/LazyStringList.java diff --git a/OsmAnd-java/src/com/google/protobuf/LiteralByteString.java b/OsmAnd-java/src/main/java/com/google/protobuf/LiteralByteString.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/LiteralByteString.java rename to OsmAnd-java/src/main/java/com/google/protobuf/LiteralByteString.java diff --git a/OsmAnd-java/src/com/google/protobuf/Message.java b/OsmAnd-java/src/main/java/com/google/protobuf/Message.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/Message.java rename to OsmAnd-java/src/main/java/com/google/protobuf/Message.java diff --git a/OsmAnd-java/src/com/google/protobuf/MessageLite.java b/OsmAnd-java/src/main/java/com/google/protobuf/MessageLite.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/MessageLite.java rename to OsmAnd-java/src/main/java/com/google/protobuf/MessageLite.java diff --git a/OsmAnd-java/src/com/google/protobuf/MessageLiteOrBuilder.java b/OsmAnd-java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/MessageLiteOrBuilder.java rename to OsmAnd-java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java diff --git a/OsmAnd-java/src/com/google/protobuf/MessageOrBuilder.java b/OsmAnd-java/src/main/java/com/google/protobuf/MessageOrBuilder.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/MessageOrBuilder.java rename to OsmAnd-java/src/main/java/com/google/protobuf/MessageOrBuilder.java diff --git a/OsmAnd-java/src/com/google/protobuf/Parser.java b/OsmAnd-java/src/main/java/com/google/protobuf/Parser.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/Parser.java rename to OsmAnd-java/src/main/java/com/google/protobuf/Parser.java diff --git a/OsmAnd-java/src/com/google/protobuf/ProtocolMessageEnum.java b/OsmAnd-java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/ProtocolMessageEnum.java rename to OsmAnd-java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java diff --git a/OsmAnd-java/src/com/google/protobuf/RepeatedFieldBuilder.java b/OsmAnd-java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/RepeatedFieldBuilder.java rename to OsmAnd-java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java diff --git a/OsmAnd-java/src/com/google/protobuf/RopeByteString.java b/OsmAnd-java/src/main/java/com/google/protobuf/RopeByteString.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/RopeByteString.java rename to OsmAnd-java/src/main/java/com/google/protobuf/RopeByteString.java diff --git a/OsmAnd-java/src/com/google/protobuf/RpcCallback.java b/OsmAnd-java/src/main/java/com/google/protobuf/RpcCallback.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/RpcCallback.java rename to OsmAnd-java/src/main/java/com/google/protobuf/RpcCallback.java diff --git a/OsmAnd-java/src/com/google/protobuf/RpcChannel.java b/OsmAnd-java/src/main/java/com/google/protobuf/RpcChannel.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/RpcChannel.java rename to OsmAnd-java/src/main/java/com/google/protobuf/RpcChannel.java diff --git a/OsmAnd-java/src/com/google/protobuf/RpcController.java b/OsmAnd-java/src/main/java/com/google/protobuf/RpcController.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/RpcController.java rename to OsmAnd-java/src/main/java/com/google/protobuf/RpcController.java diff --git a/OsmAnd-java/src/com/google/protobuf/RpcUtil.java b/OsmAnd-java/src/main/java/com/google/protobuf/RpcUtil.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/RpcUtil.java rename to OsmAnd-java/src/main/java/com/google/protobuf/RpcUtil.java diff --git a/OsmAnd-java/src/com/google/protobuf/Service.java b/OsmAnd-java/src/main/java/com/google/protobuf/Service.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/Service.java rename to OsmAnd-java/src/main/java/com/google/protobuf/Service.java diff --git a/OsmAnd-java/src/com/google/protobuf/ServiceException.java b/OsmAnd-java/src/main/java/com/google/protobuf/ServiceException.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/ServiceException.java rename to OsmAnd-java/src/main/java/com/google/protobuf/ServiceException.java diff --git a/OsmAnd-java/src/com/google/protobuf/SingleFieldBuilder.java b/OsmAnd-java/src/main/java/com/google/protobuf/SingleFieldBuilder.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/SingleFieldBuilder.java rename to OsmAnd-java/src/main/java/com/google/protobuf/SingleFieldBuilder.java diff --git a/OsmAnd-java/src/com/google/protobuf/SmallSortedMap.java b/OsmAnd-java/src/main/java/com/google/protobuf/SmallSortedMap.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/SmallSortedMap.java rename to OsmAnd-java/src/main/java/com/google/protobuf/SmallSortedMap.java diff --git a/OsmAnd-java/src/com/google/protobuf/TextFormat.java b/OsmAnd-java/src/main/java/com/google/protobuf/TextFormat.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/TextFormat.java rename to OsmAnd-java/src/main/java/com/google/protobuf/TextFormat.java diff --git a/OsmAnd-java/src/com/google/protobuf/UninitializedMessageException.java b/OsmAnd-java/src/main/java/com/google/protobuf/UninitializedMessageException.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/UninitializedMessageException.java rename to OsmAnd-java/src/main/java/com/google/protobuf/UninitializedMessageException.java diff --git a/OsmAnd-java/src/com/google/protobuf/UnknownFieldSet.java b/OsmAnd-java/src/main/java/com/google/protobuf/UnknownFieldSet.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/UnknownFieldSet.java rename to OsmAnd-java/src/main/java/com/google/protobuf/UnknownFieldSet.java diff --git a/OsmAnd-java/src/com/google/protobuf/UnmodifiableLazyStringList.java b/OsmAnd-java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/UnmodifiableLazyStringList.java rename to OsmAnd-java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java diff --git a/OsmAnd-java/src/com/google/protobuf/Utf8.java b/OsmAnd-java/src/main/java/com/google/protobuf/Utf8.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/Utf8.java rename to OsmAnd-java/src/main/java/com/google/protobuf/Utf8.java diff --git a/OsmAnd-java/src/com/google/protobuf/WireFormat.java b/OsmAnd-java/src/main/java/com/google/protobuf/WireFormat.java similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/WireFormat.java rename to OsmAnd-java/src/main/java/com/google/protobuf/WireFormat.java diff --git a/OsmAnd-java/src/com/google/protobuf/WireFormat.java.rej b/OsmAnd-java/src/main/java/com/google/protobuf/WireFormat.java.rej similarity index 100% rename from OsmAnd-java/src/com/google/protobuf/WireFormat.java.rej rename to OsmAnd-java/src/main/java/com/google/protobuf/WireFormat.java.rej diff --git a/OsmAnd-java/src/com/jwetherell/openmap/common/Ellipsoid.java b/OsmAnd-java/src/main/java/com/jwetherell/openmap/common/Ellipsoid.java similarity index 100% rename from OsmAnd-java/src/com/jwetherell/openmap/common/Ellipsoid.java rename to OsmAnd-java/src/main/java/com/jwetherell/openmap/common/Ellipsoid.java diff --git a/OsmAnd-java/src/com/jwetherell/openmap/common/GreatCircle.java b/OsmAnd-java/src/main/java/com/jwetherell/openmap/common/GreatCircle.java similarity index 100% rename from OsmAnd-java/src/com/jwetherell/openmap/common/GreatCircle.java rename to OsmAnd-java/src/main/java/com/jwetherell/openmap/common/GreatCircle.java diff --git a/OsmAnd-java/src/com/jwetherell/openmap/common/LatLonPoint.java b/OsmAnd-java/src/main/java/com/jwetherell/openmap/common/LatLonPoint.java similarity index 100% rename from OsmAnd-java/src/com/jwetherell/openmap/common/LatLonPoint.java rename to OsmAnd-java/src/main/java/com/jwetherell/openmap/common/LatLonPoint.java diff --git a/OsmAnd-java/src/com/jwetherell/openmap/common/MGRSPoint.java b/OsmAnd-java/src/main/java/com/jwetherell/openmap/common/MGRSPoint.java similarity index 100% rename from OsmAnd-java/src/com/jwetherell/openmap/common/MGRSPoint.java rename to OsmAnd-java/src/main/java/com/jwetherell/openmap/common/MGRSPoint.java diff --git a/OsmAnd-java/src/com/jwetherell/openmap/common/MoreMath.java b/OsmAnd-java/src/main/java/com/jwetherell/openmap/common/MoreMath.java similarity index 100% rename from OsmAnd-java/src/com/jwetherell/openmap/common/MoreMath.java rename to OsmAnd-java/src/main/java/com/jwetherell/openmap/common/MoreMath.java diff --git a/OsmAnd-java/src/com/jwetherell/openmap/common/ProjMath.java b/OsmAnd-java/src/main/java/com/jwetherell/openmap/common/ProjMath.java similarity index 100% rename from OsmAnd-java/src/com/jwetherell/openmap/common/ProjMath.java rename to OsmAnd-java/src/main/java/com/jwetherell/openmap/common/ProjMath.java diff --git a/OsmAnd-java/src/com/jwetherell/openmap/common/UTMPoint.java b/OsmAnd-java/src/main/java/com/jwetherell/openmap/common/UTMPoint.java similarity index 100% rename from OsmAnd-java/src/com/jwetherell/openmap/common/UTMPoint.java rename to OsmAnd-java/src/main/java/com/jwetherell/openmap/common/UTMPoint.java diff --git a/OsmAnd-java/src/com/jwetherell/openmap/common/ZonedUTMPoint.java b/OsmAnd-java/src/main/java/com/jwetherell/openmap/common/ZonedUTMPoint.java similarity index 100% rename from OsmAnd-java/src/com/jwetherell/openmap/common/ZonedUTMPoint.java rename to OsmAnd-java/src/main/java/com/jwetherell/openmap/common/ZonedUTMPoint.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/GeomMinSizeFilter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/GeomMinSizeFilter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/GeomMinSizeFilter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/GeomMinSizeFilter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/IGeometryFilter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/IGeometryFilter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/IGeometryFilter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/IGeometryFilter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/ITagConverter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/ITagConverter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/ITagConverter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/ITagConverter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/IUserDataConverter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/IUserDataConverter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/IUserDataConverter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/IUserDataConverter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/JtsAdapter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/JtsAdapter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/JtsAdapter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/JtsAdapter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/MvtReader.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/MvtReader.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/MvtReader.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/MvtReader.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/RoundingFilter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/RoundingFilter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/RoundingFilter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/RoundingFilter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/TagIgnoreConverter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/TagIgnoreConverter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/TagIgnoreConverter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/TagIgnoreConverter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/TagKeyValueMapConverter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/TagKeyValueMapConverter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/TagKeyValueMapConverter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/TagKeyValueMapConverter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/TileGeomResult.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/TileGeomResult.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/TileGeomResult.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/TileGeomResult.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/UserDataIgnoreConverter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/UserDataIgnoreConverter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/UserDataIgnoreConverter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/UserDataIgnoreConverter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/UserDataKeyValueMapConverter.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/UserDataKeyValueMapConverter.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/adapt/jts/UserDataKeyValueMapConverter.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/adapt/jts/UserDataKeyValueMapConverter.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/builder/MvtLayerBuild.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/builder/MvtLayerBuild.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/builder/MvtLayerBuild.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/builder/MvtLayerBuild.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/builder/MvtLayerParams.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/builder/MvtLayerParams.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/builder/MvtLayerParams.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/builder/MvtLayerParams.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/builder/MvtLayerProps.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/builder/MvtLayerProps.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/builder/MvtLayerProps.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/builder/MvtLayerProps.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/GeomCmd.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/GeomCmd.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/GeomCmd.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/GeomCmd.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/GeomCmdHdr.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/GeomCmdHdr.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/GeomCmdHdr.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/GeomCmdHdr.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/MvtUtil.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/MvtUtil.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/MvtUtil.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/MvtUtil.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/MvtValue.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/MvtValue.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/MvtValue.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/MvtValue.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/ZigZag.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/ZigZag.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/encoding/ZigZag.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/encoding/ZigZag.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/util/JtsGeomStats.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/util/JtsGeomStats.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/util/JtsGeomStats.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/util/JtsGeomStats.java diff --git a/OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/util/Vec2d.java b/OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/util/Vec2d.java similarity index 100% rename from OsmAnd-java/src/com/wdtinc/mapbox_vector_tile/util/Vec2d.java rename to OsmAnd-java/src/main/java/com/wdtinc/mapbox_vector_tile/util/Vec2d.java diff --git a/OsmAnd-java/src/net/osmand/CallbackWithObject.java b/OsmAnd-java/src/main/java/net/osmand/CallbackWithObject.java similarity index 100% rename from OsmAnd-java/src/net/osmand/CallbackWithObject.java rename to OsmAnd-java/src/main/java/net/osmand/CallbackWithObject.java diff --git a/OsmAnd-java/src/net/osmand/Collator.java b/OsmAnd-java/src/main/java/net/osmand/Collator.java similarity index 100% rename from OsmAnd-java/src/net/osmand/Collator.java rename to OsmAnd-java/src/main/java/net/osmand/Collator.java diff --git a/OsmAnd-java/src/net/osmand/CollatorStringMatcher.java b/OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java similarity index 100% rename from OsmAnd-java/src/net/osmand/CollatorStringMatcher.java rename to OsmAnd-java/src/main/java/net/osmand/CollatorStringMatcher.java diff --git a/OsmAnd-java/src/net/osmand/GeoidAltitudeCorrection.java b/OsmAnd-java/src/main/java/net/osmand/GeoidAltitudeCorrection.java similarity index 100% rename from OsmAnd-java/src/net/osmand/GeoidAltitudeCorrection.java rename to OsmAnd-java/src/main/java/net/osmand/GeoidAltitudeCorrection.java diff --git a/OsmAnd-java/src/net/osmand/IProgress.java b/OsmAnd-java/src/main/java/net/osmand/IProgress.java similarity index 100% rename from OsmAnd-java/src/net/osmand/IProgress.java rename to OsmAnd-java/src/main/java/net/osmand/IProgress.java diff --git a/OsmAnd-java/src/net/osmand/IndexConstants.java b/OsmAnd-java/src/main/java/net/osmand/IndexConstants.java similarity index 100% rename from OsmAnd-java/src/net/osmand/IndexConstants.java rename to OsmAnd-java/src/main/java/net/osmand/IndexConstants.java diff --git a/OsmAnd-java/src/net/osmand/Location.java b/OsmAnd-java/src/main/java/net/osmand/Location.java similarity index 100% rename from OsmAnd-java/src/net/osmand/Location.java rename to OsmAnd-java/src/main/java/net/osmand/Location.java diff --git a/OsmAnd-java/src/net/osmand/LocationConvert.java b/OsmAnd-java/src/main/java/net/osmand/LocationConvert.java similarity index 100% rename from OsmAnd-java/src/net/osmand/LocationConvert.java rename to OsmAnd-java/src/main/java/net/osmand/LocationConvert.java diff --git a/OsmAnd-java/src/net/osmand/NativeLibrary.java b/OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java similarity index 100% rename from OsmAnd-java/src/net/osmand/NativeLibrary.java rename to OsmAnd-java/src/main/java/net/osmand/NativeLibrary.java diff --git a/OsmAnd-java/src/net/osmand/OsmAndCollator.java b/OsmAnd-java/src/main/java/net/osmand/OsmAndCollator.java similarity index 100% rename from OsmAnd-java/src/net/osmand/OsmAndCollator.java rename to OsmAnd-java/src/main/java/net/osmand/OsmAndCollator.java diff --git a/OsmAnd-java/src/net/osmand/PlatformUtil.java b/OsmAnd-java/src/main/java/net/osmand/PlatformUtil.java similarity index 100% rename from OsmAnd-java/src/net/osmand/PlatformUtil.java rename to OsmAnd-java/src/main/java/net/osmand/PlatformUtil.java diff --git a/OsmAnd-java/src/net/osmand/RenderingContext.java b/OsmAnd-java/src/main/java/net/osmand/RenderingContext.java similarity index 100% rename from OsmAnd-java/src/net/osmand/RenderingContext.java rename to OsmAnd-java/src/main/java/net/osmand/RenderingContext.java diff --git a/OsmAnd-java/src/net/osmand/Reshaper.java b/OsmAnd-java/src/main/java/net/osmand/Reshaper.java similarity index 100% rename from OsmAnd-java/src/net/osmand/Reshaper.java rename to OsmAnd-java/src/main/java/net/osmand/Reshaper.java diff --git a/OsmAnd-java/src/net/osmand/ResultMatcher.java b/OsmAnd-java/src/main/java/net/osmand/ResultMatcher.java similarity index 100% rename from OsmAnd-java/src/net/osmand/ResultMatcher.java rename to OsmAnd-java/src/main/java/net/osmand/ResultMatcher.java diff --git a/OsmAnd-java/src/net/osmand/StateChangedListener.java b/OsmAnd-java/src/main/java/net/osmand/StateChangedListener.java similarity index 100% rename from OsmAnd-java/src/net/osmand/StateChangedListener.java rename to OsmAnd-java/src/main/java/net/osmand/StateChangedListener.java diff --git a/OsmAnd-java/src/net/osmand/StringMatcher.java b/OsmAnd-java/src/main/java/net/osmand/StringMatcher.java similarity index 100% rename from OsmAnd-java/src/net/osmand/StringMatcher.java rename to OsmAnd-java/src/main/java/net/osmand/StringMatcher.java diff --git a/OsmAnd-java/src/net/osmand/TspAnt.java b/OsmAnd-java/src/main/java/net/osmand/TspAnt.java similarity index 100% rename from OsmAnd-java/src/net/osmand/TspAnt.java rename to OsmAnd-java/src/main/java/net/osmand/TspAnt.java diff --git a/OsmAnd-java/src/net/osmand/TspHeldKarp.java b/OsmAnd-java/src/main/java/net/osmand/TspHeldKarp.java similarity index 100% rename from OsmAnd-java/src/net/osmand/TspHeldKarp.java rename to OsmAnd-java/src/main/java/net/osmand/TspHeldKarp.java diff --git a/OsmAnd-java/src/net/osmand/TspTest.java b/OsmAnd-java/src/main/java/net/osmand/TspTest.java similarity index 100% rename from OsmAnd-java/src/net/osmand/TspTest.java rename to OsmAnd-java/src/main/java/net/osmand/TspTest.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryIndexPart.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryIndexPart.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryIndexPart.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryIndexPart.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryInspector.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryInspector.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryInspector.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspectorNative.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryInspectorNative.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryInspectorNative.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryInspectorNative.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapAddressReaderAdapter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryMapAddressReaderAdapter.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapAddressReaderAdapter.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapDataObject.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapDataObject.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryMapDataObject.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapDataObject.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexFilter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexFilter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryMapIndexFilter.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexFilter.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryMapIndexReader.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapIndexReader.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryMapPoiReaderAdapter.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapPoiReaderAdapter.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapRouteReaderAdapter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryMapRouteReaderAdapter.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapRouteReaderAdapter.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryMapTransportReaderAdapter.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapTransportReaderAdapter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryMapTransportReaderAdapter.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryMapTransportReaderAdapter.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryVectorTileReader.java b/OsmAnd-java/src/main/java/net/osmand/binary/BinaryVectorTileReader.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/BinaryVectorTileReader.java rename to OsmAnd-java/src/main/java/net/osmand/binary/BinaryVectorTileReader.java diff --git a/OsmAnd-java/src/net/osmand/binary/CachedOsmandIndexes.java b/OsmAnd-java/src/main/java/net/osmand/binary/CachedOsmandIndexes.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/CachedOsmandIndexes.java rename to OsmAnd-java/src/main/java/net/osmand/binary/CachedOsmandIndexes.java diff --git a/OsmAnd-java/src/net/osmand/binary/CommonWords.java b/OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/CommonWords.java rename to OsmAnd-java/src/main/java/net/osmand/binary/CommonWords.java diff --git a/OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java b/OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/GeocodingUtilities.java rename to OsmAnd-java/src/main/java/net/osmand/binary/GeocodingUtilities.java diff --git a/OsmAnd-java/src/net/osmand/binary/MapZooms.java b/OsmAnd-java/src/main/java/net/osmand/binary/MapZooms.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/MapZooms.java rename to OsmAnd-java/src/main/java/net/osmand/binary/MapZooms.java diff --git a/OsmAnd-java/src/net/osmand/binary/OsmandIndex.java b/OsmAnd-java/src/main/java/net/osmand/binary/OsmandIndex.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/OsmandIndex.java rename to OsmAnd-java/src/main/java/net/osmand/binary/OsmandIndex.java diff --git a/OsmAnd-java/src/net/osmand/binary/OsmandOdb.java b/OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/OsmandOdb.java rename to OsmAnd-java/src/main/java/net/osmand/binary/OsmandOdb.java diff --git a/OsmAnd-java/src/net/osmand/binary/RouteDataObject.java b/OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/RouteDataObject.java rename to OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java diff --git a/OsmAnd-java/src/net/osmand/binary/VectorTile.java b/OsmAnd-java/src/main/java/net/osmand/binary/VectorTile.java similarity index 100% rename from OsmAnd-java/src/net/osmand/binary/VectorTile.java rename to OsmAnd-java/src/main/java/net/osmand/binary/VectorTile.java diff --git a/OsmAnd-java/src/net/osmand/data/Amenity.java b/OsmAnd-java/src/main/java/net/osmand/data/Amenity.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/Amenity.java rename to OsmAnd-java/src/main/java/net/osmand/data/Amenity.java diff --git a/OsmAnd-java/src/net/osmand/data/Building.java b/OsmAnd-java/src/main/java/net/osmand/data/Building.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/Building.java rename to OsmAnd-java/src/main/java/net/osmand/data/Building.java diff --git a/OsmAnd-java/src/net/osmand/data/City.java b/OsmAnd-java/src/main/java/net/osmand/data/City.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/City.java rename to OsmAnd-java/src/main/java/net/osmand/data/City.java diff --git a/OsmAnd-java/src/net/osmand/data/DataTileManager.java b/OsmAnd-java/src/main/java/net/osmand/data/DataTileManager.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/DataTileManager.java rename to OsmAnd-java/src/main/java/net/osmand/data/DataTileManager.java diff --git a/OsmAnd-java/src/net/osmand/data/GeometryTile.java b/OsmAnd-java/src/main/java/net/osmand/data/GeometryTile.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/GeometryTile.java rename to OsmAnd-java/src/main/java/net/osmand/data/GeometryTile.java diff --git a/OsmAnd-java/src/net/osmand/data/LatLon.java b/OsmAnd-java/src/main/java/net/osmand/data/LatLon.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/LatLon.java rename to OsmAnd-java/src/main/java/net/osmand/data/LatLon.java diff --git a/OsmAnd-java/src/net/osmand/data/MapObject.java b/OsmAnd-java/src/main/java/net/osmand/data/MapObject.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/MapObject.java rename to OsmAnd-java/src/main/java/net/osmand/data/MapObject.java diff --git a/OsmAnd-java/src/net/osmand/data/Postcode.java b/OsmAnd-java/src/main/java/net/osmand/data/Postcode.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/Postcode.java rename to OsmAnd-java/src/main/java/net/osmand/data/Postcode.java diff --git a/OsmAnd-java/src/net/osmand/data/QuadPoint.java b/OsmAnd-java/src/main/java/net/osmand/data/QuadPoint.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/QuadPoint.java rename to OsmAnd-java/src/main/java/net/osmand/data/QuadPoint.java diff --git a/OsmAnd-java/src/net/osmand/data/QuadPointDouble.java b/OsmAnd-java/src/main/java/net/osmand/data/QuadPointDouble.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/QuadPointDouble.java rename to OsmAnd-java/src/main/java/net/osmand/data/QuadPointDouble.java diff --git a/OsmAnd-java/src/net/osmand/data/QuadRect.java b/OsmAnd-java/src/main/java/net/osmand/data/QuadRect.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/QuadRect.java rename to OsmAnd-java/src/main/java/net/osmand/data/QuadRect.java diff --git a/OsmAnd-java/src/net/osmand/data/QuadTree.java b/OsmAnd-java/src/main/java/net/osmand/data/QuadTree.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/QuadTree.java rename to OsmAnd-java/src/main/java/net/osmand/data/QuadTree.java diff --git a/OsmAnd-java/src/net/osmand/data/RotatedTileBox.java b/OsmAnd-java/src/main/java/net/osmand/data/RotatedTileBox.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/RotatedTileBox.java rename to OsmAnd-java/src/main/java/net/osmand/data/RotatedTileBox.java diff --git a/OsmAnd-java/src/net/osmand/data/Street.java b/OsmAnd-java/src/main/java/net/osmand/data/Street.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/Street.java rename to OsmAnd-java/src/main/java/net/osmand/data/Street.java diff --git a/OsmAnd-java/src/net/osmand/data/TransportRoute.java b/OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/TransportRoute.java rename to OsmAnd-java/src/main/java/net/osmand/data/TransportRoute.java diff --git a/OsmAnd-java/src/net/osmand/data/TransportStop.java b/OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java similarity index 100% rename from OsmAnd-java/src/net/osmand/data/TransportStop.java rename to OsmAnd-java/src/main/java/net/osmand/data/TransportStop.java diff --git a/OsmAnd-java/src/net/osmand/map/IMapLocationListener.java b/OsmAnd-java/src/main/java/net/osmand/map/IMapLocationListener.java similarity index 100% rename from OsmAnd-java/src/net/osmand/map/IMapLocationListener.java rename to OsmAnd-java/src/main/java/net/osmand/map/IMapLocationListener.java diff --git a/OsmAnd-java/src/net/osmand/map/ITileSource.java b/OsmAnd-java/src/main/java/net/osmand/map/ITileSource.java similarity index 100% rename from OsmAnd-java/src/net/osmand/map/ITileSource.java rename to OsmAnd-java/src/main/java/net/osmand/map/ITileSource.java diff --git a/OsmAnd-java/src/net/osmand/map/MapTileDownloader.java b/OsmAnd-java/src/main/java/net/osmand/map/MapTileDownloader.java similarity index 100% rename from OsmAnd-java/src/net/osmand/map/MapTileDownloader.java rename to OsmAnd-java/src/main/java/net/osmand/map/MapTileDownloader.java diff --git a/OsmAnd-java/src/net/osmand/map/OsmandRegions.java b/OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java similarity index 100% rename from OsmAnd-java/src/net/osmand/map/OsmandRegions.java rename to OsmAnd-java/src/main/java/net/osmand/map/OsmandRegions.java diff --git a/OsmAnd-java/src/net/osmand/map/TileSourceManager.java b/OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java similarity index 100% rename from OsmAnd-java/src/net/osmand/map/TileSourceManager.java rename to OsmAnd-java/src/main/java/net/osmand/map/TileSourceManager.java diff --git a/OsmAnd-java/src/net/osmand/map/WorldRegion.java b/OsmAnd-java/src/main/java/net/osmand/map/WorldRegion.java similarity index 100% rename from OsmAnd-java/src/net/osmand/map/WorldRegion.java rename to OsmAnd-java/src/main/java/net/osmand/map/WorldRegion.java diff --git a/OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java b/OsmAnd-java/src/main/java/net/osmand/osm/AbstractPoiType.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/AbstractPoiType.java rename to OsmAnd-java/src/main/java/net/osmand/osm/AbstractPoiType.java diff --git a/OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java b/OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/MapPoiTypes.java rename to OsmAnd-java/src/main/java/net/osmand/osm/MapPoiTypes.java diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/main/java/net/osmand/osm/MapRenderingTypes.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java rename to OsmAnd-java/src/main/java/net/osmand/osm/MapRenderingTypes.java diff --git a/OsmAnd-java/src/net/osmand/osm/PoiCategory.java b/OsmAnd-java/src/main/java/net/osmand/osm/PoiCategory.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/PoiCategory.java rename to OsmAnd-java/src/main/java/net/osmand/osm/PoiCategory.java diff --git a/OsmAnd-java/src/net/osmand/osm/PoiFilter.java b/OsmAnd-java/src/main/java/net/osmand/osm/PoiFilter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/PoiFilter.java rename to OsmAnd-java/src/main/java/net/osmand/osm/PoiFilter.java diff --git a/OsmAnd-java/src/net/osmand/osm/PoiType.java b/OsmAnd-java/src/main/java/net/osmand/osm/PoiType.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/PoiType.java rename to OsmAnd-java/src/main/java/net/osmand/osm/PoiType.java diff --git a/OsmAnd-java/src/net/osmand/osm/edit/Entity.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/Entity.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/edit/Entity.java rename to OsmAnd-java/src/main/java/net/osmand/osm/edit/Entity.java diff --git a/OsmAnd-java/src/net/osmand/osm/edit/EntityInfo.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/EntityInfo.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/edit/EntityInfo.java rename to OsmAnd-java/src/main/java/net/osmand/osm/edit/EntityInfo.java diff --git a/OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/EntityParser.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/edit/EntityParser.java rename to OsmAnd-java/src/main/java/net/osmand/osm/edit/EntityParser.java diff --git a/OsmAnd-java/src/net/osmand/osm/edit/Node.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/Node.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/edit/Node.java rename to OsmAnd-java/src/main/java/net/osmand/osm/edit/Node.java diff --git a/OsmAnd-java/src/net/osmand/osm/edit/OSMSettings.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/OSMSettings.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/edit/OSMSettings.java rename to OsmAnd-java/src/main/java/net/osmand/osm/edit/OSMSettings.java diff --git a/OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/edit/OsmMapUtils.java rename to OsmAnd-java/src/main/java/net/osmand/osm/edit/OsmMapUtils.java diff --git a/OsmAnd-java/src/net/osmand/osm/edit/Relation.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/Relation.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/edit/Relation.java rename to OsmAnd-java/src/main/java/net/osmand/osm/edit/Relation.java diff --git a/OsmAnd-java/src/net/osmand/osm/edit/Way.java b/OsmAnd-java/src/main/java/net/osmand/osm/edit/Way.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/edit/Way.java rename to OsmAnd-java/src/main/java/net/osmand/osm/edit/Way.java diff --git a/OsmAnd-java/src/net/osmand/osm/io/Base64.java b/OsmAnd-java/src/main/java/net/osmand/osm/io/Base64.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/io/Base64.java rename to OsmAnd-java/src/main/java/net/osmand/osm/io/Base64.java diff --git a/OsmAnd-java/src/net/osmand/osm/io/IOsmStorageFilter.java b/OsmAnd-java/src/main/java/net/osmand/osm/io/IOsmStorageFilter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/io/IOsmStorageFilter.java rename to OsmAnd-java/src/main/java/net/osmand/osm/io/IOsmStorageFilter.java diff --git a/OsmAnd-java/src/net/osmand/osm/io/NetworkUtils.java b/OsmAnd-java/src/main/java/net/osmand/osm/io/NetworkUtils.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/io/NetworkUtils.java rename to OsmAnd-java/src/main/java/net/osmand/osm/io/NetworkUtils.java diff --git a/OsmAnd-java/src/net/osmand/osm/io/OsmBaseStorage.java b/OsmAnd-java/src/main/java/net/osmand/osm/io/OsmBaseStorage.java similarity index 100% rename from OsmAnd-java/src/net/osmand/osm/io/OsmBaseStorage.java rename to OsmAnd-java/src/main/java/net/osmand/osm/io/OsmBaseStorage.java diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRule.java b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRule.java similarity index 100% rename from OsmAnd-java/src/net/osmand/render/RenderingRule.java rename to OsmAnd-java/src/main/java/net/osmand/render/RenderingRule.java diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleProperty.java similarity index 100% rename from OsmAnd-java/src/net/osmand/render/RenderingRuleProperty.java rename to OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleProperty.java diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRuleSearchRequest.java b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleSearchRequest.java similarity index 100% rename from OsmAnd-java/src/net/osmand/render/RenderingRuleSearchRequest.java rename to OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleSearchRequest.java diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleStorageProperties.java similarity index 100% rename from OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java rename to OsmAnd-java/src/main/java/net/osmand/render/RenderingRuleStorageProperties.java diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesStorage.java similarity index 100% rename from OsmAnd-java/src/net/osmand/render/RenderingRulesStorage.java rename to OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesStorage.java diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRulesStoragePrinter.java b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesStoragePrinter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/render/RenderingRulesStoragePrinter.java rename to OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesStoragePrinter.java diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRulesTransformer.java b/OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesTransformer.java similarity index 100% rename from OsmAnd-java/src/net/osmand/render/RenderingRulesTransformer.java rename to OsmAnd-java/src/main/java/net/osmand/render/RenderingRulesTransformer.java diff --git a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java b/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java rename to OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlanner.java diff --git a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlannerOld.java b/OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlannerOld.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/BinaryRoutePlannerOld.java rename to OsmAnd-java/src/main/java/net/osmand/router/BinaryRoutePlannerOld.java diff --git a/OsmAnd-java/src/net/osmand/router/GeneralRouter.java b/OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/GeneralRouter.java rename to OsmAnd-java/src/main/java/net/osmand/router/GeneralRouter.java diff --git a/OsmAnd-java/src/net/osmand/router/PrecalculatedRouteDirection.java b/OsmAnd-java/src/main/java/net/osmand/router/PrecalculatedRouteDirection.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/PrecalculatedRouteDirection.java rename to OsmAnd-java/src/main/java/net/osmand/router/PrecalculatedRouteDirection.java diff --git a/OsmAnd-java/src/net/osmand/router/RouteCalculationProgress.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteCalculationProgress.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/RouteCalculationProgress.java rename to OsmAnd-java/src/main/java/net/osmand/router/RouteCalculationProgress.java diff --git a/OsmAnd-java/src/net/osmand/router/RoutePlannerFrontEnd.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/RoutePlannerFrontEnd.java rename to OsmAnd-java/src/main/java/net/osmand/router/RoutePlannerFrontEnd.java diff --git a/OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/RouteResultPreparation.java rename to OsmAnd-java/src/main/java/net/osmand/router/RouteResultPreparation.java diff --git a/OsmAnd-java/src/net/osmand/router/RouteSegmentResult.java b/OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/RouteSegmentResult.java rename to OsmAnd-java/src/main/java/net/osmand/router/RouteSegmentResult.java diff --git a/OsmAnd-java/src/net/osmand/router/RoutingConfiguration.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/RoutingConfiguration.java rename to OsmAnd-java/src/main/java/net/osmand/router/RoutingConfiguration.java diff --git a/OsmAnd-java/src/net/osmand/router/RoutingContext.java b/OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/RoutingContext.java rename to OsmAnd-java/src/main/java/net/osmand/router/RoutingContext.java diff --git a/OsmAnd-java/src/net/osmand/router/TestRouting.java b/OsmAnd-java/src/main/java/net/osmand/router/TestRouting.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/TestRouting.java rename to OsmAnd-java/src/main/java/net/osmand/router/TestRouting.java diff --git a/OsmAnd-java/src/net/osmand/router/TurnType.java b/OsmAnd-java/src/main/java/net/osmand/router/TurnType.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/TurnType.java rename to OsmAnd-java/src/main/java/net/osmand/router/TurnType.java diff --git a/OsmAnd-java/src/net/osmand/router/VehicleRouter.java b/OsmAnd-java/src/main/java/net/osmand/router/VehicleRouter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/router/VehicleRouter.java rename to OsmAnd-java/src/main/java/net/osmand/router/VehicleRouter.java diff --git a/OsmAnd-java/src/net/osmand/search/SearchUICore.java b/OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java similarity index 100% rename from OsmAnd-java/src/net/osmand/search/SearchUICore.java rename to OsmAnd-java/src/main/java/net/osmand/search/SearchUICore.java diff --git a/OsmAnd-java/src/net/osmand/search/core/CustomSearchPoiFilter.java b/OsmAnd-java/src/main/java/net/osmand/search/core/CustomSearchPoiFilter.java similarity index 100% rename from OsmAnd-java/src/net/osmand/search/core/CustomSearchPoiFilter.java rename to OsmAnd-java/src/main/java/net/osmand/search/core/CustomSearchPoiFilter.java diff --git a/OsmAnd-java/src/net/osmand/search/core/ObjectType.java b/OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java similarity index 100% rename from OsmAnd-java/src/net/osmand/search/core/ObjectType.java rename to OsmAnd-java/src/main/java/net/osmand/search/core/ObjectType.java diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchCoreAPI.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreAPI.java similarity index 100% rename from OsmAnd-java/src/net/osmand/search/core/SearchCoreAPI.java rename to OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreAPI.java diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java similarity index 100% rename from OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java rename to OsmAnd-java/src/main/java/net/osmand/search/core/SearchCoreFactory.java diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchPhrase.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchPhrase.java similarity index 100% rename from OsmAnd-java/src/net/osmand/search/core/SearchPhrase.java rename to OsmAnd-java/src/main/java/net/osmand/search/core/SearchPhrase.java diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchResult.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java similarity index 100% rename from OsmAnd-java/src/net/osmand/search/core/SearchResult.java rename to OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchSettings.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchSettings.java similarity index 100% rename from OsmAnd-java/src/net/osmand/search/core/SearchSettings.java rename to OsmAnd-java/src/main/java/net/osmand/search/core/SearchSettings.java diff --git a/OsmAnd-java/src/net/osmand/search/core/SearchWord.java b/OsmAnd-java/src/main/java/net/osmand/search/core/SearchWord.java similarity index 100% rename from OsmAnd-java/src/net/osmand/search/core/SearchWord.java rename to OsmAnd-java/src/main/java/net/osmand/search/core/SearchWord.java diff --git a/OsmAnd-java/src/net/osmand/util/Algorithms.java b/OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java similarity index 100% rename from OsmAnd-java/src/net/osmand/util/Algorithms.java rename to OsmAnd-java/src/main/java/net/osmand/util/Algorithms.java diff --git a/OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java b/OsmAnd-java/src/main/java/net/osmand/util/GeoPointParserUtil.java similarity index 100% rename from OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java rename to OsmAnd-java/src/main/java/net/osmand/util/GeoPointParserUtil.java diff --git a/OsmAnd-java/src/net/osmand/util/GeoPolylineParserUtil.java b/OsmAnd-java/src/main/java/net/osmand/util/GeoPolylineParserUtil.java similarity index 100% rename from OsmAnd-java/src/net/osmand/util/GeoPolylineParserUtil.java rename to OsmAnd-java/src/main/java/net/osmand/util/GeoPolylineParserUtil.java diff --git a/OsmAnd-java/src/net/osmand/util/LIFOBlockingDeque.java b/OsmAnd-java/src/main/java/net/osmand/util/LIFOBlockingDeque.java similarity index 100% rename from OsmAnd-java/src/net/osmand/util/LIFOBlockingDeque.java rename to OsmAnd-java/src/main/java/net/osmand/util/LIFOBlockingDeque.java diff --git a/OsmAnd-java/src/net/osmand/util/LocationParser.java b/OsmAnd-java/src/main/java/net/osmand/util/LocationParser.java similarity index 100% rename from OsmAnd-java/src/net/osmand/util/LocationParser.java rename to OsmAnd-java/src/main/java/net/osmand/util/LocationParser.java diff --git a/OsmAnd-java/src/net/osmand/util/MapAlgorithms.java b/OsmAnd-java/src/main/java/net/osmand/util/MapAlgorithms.java similarity index 100% rename from OsmAnd-java/src/net/osmand/util/MapAlgorithms.java rename to OsmAnd-java/src/main/java/net/osmand/util/MapAlgorithms.java diff --git a/OsmAnd-java/src/net/osmand/util/MapUtils.java b/OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java similarity index 100% rename from OsmAnd-java/src/net/osmand/util/MapUtils.java rename to OsmAnd-java/src/main/java/net/osmand/util/MapUtils.java diff --git a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java b/OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java similarity index 100% rename from OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java rename to OsmAnd-java/src/main/java/net/osmand/util/OpeningHoursParser.java diff --git a/OsmAnd-java/src/net/osmand/util/SunriseSunset.java b/OsmAnd-java/src/main/java/net/osmand/util/SunriseSunset.java similarity index 100% rename from OsmAnd-java/src/net/osmand/util/SunriseSunset.java rename to OsmAnd-java/src/main/java/net/osmand/util/SunriseSunset.java diff --git a/OsmAnd-java/test/java/net/osmand/router/RouteResultPreparationTest.java b/OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationTest.java similarity index 100% rename from OsmAnd-java/test/java/net/osmand/router/RouteResultPreparationTest.java rename to OsmAnd-java/src/test/java/net/osmand/router/RouteResultPreparationTest.java diff --git a/OsmAnd-java/test/java/net/osmand/router/RouteTestingTest.java b/OsmAnd-java/src/test/java/net/osmand/router/RouteTestingTest.java similarity index 100% rename from OsmAnd-java/test/java/net/osmand/router/RouteTestingTest.java rename to OsmAnd-java/src/test/java/net/osmand/router/RouteTestingTest.java diff --git a/OsmAnd-java/test/java/net/osmand/router/TestEntry.java b/OsmAnd-java/src/test/java/net/osmand/router/TestEntry.java similarity index 100% rename from OsmAnd-java/test/java/net/osmand/router/TestEntry.java rename to OsmAnd-java/src/test/java/net/osmand/router/TestEntry.java diff --git a/OsmAnd-java/test/java/net/osmand/search/LocationSearchTest.java b/OsmAnd-java/src/test/java/net/osmand/search/LocationSearchTest.java similarity index 100% rename from OsmAnd-java/test/java/net/osmand/search/LocationSearchTest.java rename to OsmAnd-java/src/test/java/net/osmand/search/LocationSearchTest.java diff --git a/OsmAnd-java/test/java/net/osmand/search/SearchCoreUITest.java b/OsmAnd-java/src/test/java/net/osmand/search/SearchCoreUITest.java similarity index 100% rename from OsmAnd-java/test/java/net/osmand/search/SearchCoreUITest.java rename to OsmAnd-java/src/test/java/net/osmand/search/SearchCoreUITest.java diff --git a/OsmAnd-java/test/java/net/osmand/util/GeoPolylineParserUtilTest.java b/OsmAnd-java/src/test/java/net/osmand/util/GeoPolylineParserUtilTest.java similarity index 100% rename from OsmAnd-java/test/java/net/osmand/util/GeoPolylineParserUtilTest.java rename to OsmAnd-java/src/test/java/net/osmand/util/GeoPolylineParserUtilTest.java diff --git a/OsmAnd-java/test/resources/test_routing.json b/OsmAnd-java/src/test/resources/test_routing.json similarity index 100% rename from OsmAnd-java/test/resources/test_routing.json rename to OsmAnd-java/src/test/resources/test_routing.json diff --git a/OsmAnd-java/test/resources/test_turn_lanes.json b/OsmAnd-java/src/test/resources/test_turn_lanes.json similarity index 100% rename from OsmAnd-java/test/resources/test_turn_lanes.json rename to OsmAnd-java/src/test/resources/test_turn_lanes.json diff --git a/OsmAnd-java/test-results/.gitignore b/OsmAnd-java/test-results/.gitignore deleted file mode 100644 index 6722cd96e7..0000000000 --- a/OsmAnd-java/test-results/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.xml diff --git a/OsmAnd-java/test/libs/gson-2.6.2.jar b/OsmAnd-java/test/libs/gson-2.6.2.jar deleted file mode 100644 index 9d78626d85..0000000000 Binary files a/OsmAnd-java/test/libs/gson-2.6.2.jar and /dev/null differ diff --git a/OsmAnd-java/test/libs/hamcrest-core-1.3.jar b/OsmAnd-java/test/libs/hamcrest-core-1.3.jar deleted file mode 100644 index 9d5fe16e3d..0000000000 Binary files a/OsmAnd-java/test/libs/hamcrest-core-1.3.jar and /dev/null differ diff --git a/OsmAnd-java/test/libs/junit-4.12.jar b/OsmAnd-java/test/libs/junit-4.12.jar deleted file mode 100644 index 3a7fc266c3..0000000000 Binary files a/OsmAnd-java/test/libs/junit-4.12.jar and /dev/null differ