From d0dc1d0a249f38fde404205e55c9d5d773c7b32b Mon Sep 17 00:00:00 2001
From: Gianluca <gianluca.finocchiaro@lightstreamer.com>
Date: Fri, 23 Feb 2024 12:34:39 +0100
Subject: [PATCH] Checkpoint

---
 buildSrc/build.gradle                         | 11 +++
 .../lightstreamer-kafka-connector.gradle      | 74 ++-----------------
 connector/.classpath                          | 32 ++++++++
 connector/.project                            | 34 +++++++++
 connector/build.gradle                        | 67 +++++++++++++++++
 {src => connector/src}/clients/Producer.java  |  0
 .../src}/clients/consumer/Listeners.java      |  0
 .../src}/clients/consumer/LsClient.java       |  0
 .../src}/clients/kafka-producer.java          |  0
 {src => connector/src}/clients/lsclient.java  |  0
 .../src}/clients/producer/Producer.java       |  0
 .../clients/producer/avro-config.properties   |  0
 .../clients/producer/simple-config.properties |  0
 .../src}/connector/dist/README.md             |  0
 .../src}/connector/dist/adapters.bcp.xml      |  0
 .../src}/connector/dist/adapters.xml          |  2 +-
 .../src}/connector/dist/log4j.properties      |  0
 .../src}/connector/dist/user-key.avsc         |  0
 .../src}/connector/dist/user-value.avsc       |  0
 .../src}/docs/adapters-example.xml            |  0
 .../src}/docs/fields-mapping.xml              |  0
 {src => connector/src}/docs/stock.json        |  0
 .../adapters/ConnectorDataAdapter.java        |  0
 .../adapters/ConnectorMetadataAdapter.java    |  3 +-
 .../adapters/ConsumerLoopConfigurator.java    |  0
 .../kafka_connector/adapters/Loop.java        |  0
 .../adapters/commons/Either.java              |  0
 .../adapters/commons/LogFactory.java          |  0
 .../adapters/commons/MetadataListener.java    |  0
 .../commons/NonNullKeyProperties.java         |  0
 .../adapters/config/AbstractConfig.java       |  0
 .../config/BrokerAuthenticationConfigs.java   |  0
 .../adapters/config/ConfigException.java      |  0
 .../adapters/config/ConnectorConfig.java      |  0
 .../adapters/config/EncryptionConfigs.java    |  0
 .../adapters/config/GlobalConfig.java         |  0
 .../adapters/config/InfoItem.java             |  0
 .../config/SchemaRegistryConfigs.java         |  0
 .../adapters/config/TopicsConfig.java         |  0
 .../config/nested/AuthenticationConfigs.java  |  0
 .../adapters/config/nested/GssapiConfigs.java |  0
 .../config/nested/KeystoreConfigs.java        |  0
 .../adapters/config/nested/TlsConfigs.java    |  0
 .../adapters/config/specs/ConfigTypes.java    |  0
 .../adapters/config/specs/ConfigsSpec.java    |  0
 .../consumers/AbstractConsumerLoop.java       |  0
 .../adapters/consumers/ConsumerLoop.java      |  0
 .../adapters/mapping/ExpressionException.java |  0
 .../adapters/mapping/Fields.java              |  0
 .../mapping/ItemExpressionEvaluator.java      |  0
 .../adapters/mapping/Items.java               |  0
 .../adapters/mapping/RecordMapper.java        |  0
 .../AbstractLocalSchemaDeserializer.java      |  0
 .../mapping/selectors/BaseSelector.java       |  0
 .../mapping/selectors/KeySelector.java        |  0
 .../selectors/KeySelectorSupplier.java        |  0
 .../mapping/selectors/MetaSelector.java       |  0
 .../selectors/MetaSelectorSupplier.java       |  0
 .../adapters/mapping/selectors/Schema.java    |  0
 .../adapters/mapping/selectors/Selector.java  |  0
 .../selectors/SelectorExpressionParser.java   |  0
 .../mapping/selectors/SelectorSupplier.java   |  0
 .../adapters/mapping/selectors/Selectors.java |  0
 .../adapters/mapping/selectors/Value.java     |  0
 .../mapping/selectors/ValueException.java     |  0
 .../mapping/selectors/ValueSelector.java      |  0
 .../selectors/ValueSelectorSupplier.java      |  0
 .../mapping/selectors/ValuesContainer.java    |  0
 .../avro/GenericRecordDeserializer.java       |  0
 .../avro/GenericRecordSelectorsSuppliers.java |  0
 .../selectors/json/JsonNodeDeserializer.java  |  0
 .../json/JsonNodeSelectorsSuppliers.java      |  0
 .../string/StringSelectorSuppliers.java       |  0
 .../pub/KafkaConnectorMetadataAdapter.java    |  6 +-
 .../adapters/ConnectorAdapterSetTest.java     |  0
 .../ConsumerLoopConfiguratorTest.java         |  0
 .../BrokerAuthenticationConfigsTest.java      |  0
 .../adapters/config/ConnectorConfigTest.java  |  0
 .../config/EncryptionConfigsTest.java         |  0
 .../adapters/config/GlobalConfigTest.java     |  0
 .../config/SchemaRegistryConfigsTest.java     |  0
 .../adapters/config/TopicsConfigTest.java     |  0
 .../adapters/config/specs/ConfigSpecTest.java |  0
 .../adapters/consumers/ConsumerLoopTest.java  |  0
 .../adapters/mapping/ItemTemplatesTest.java   |  0
 .../adapters/mapping/ItemTest.java            |  0
 .../mapping/RecordMapperAvroTest.java         |  0
 .../mapping/RecordMapperJsonTest.java         |  0
 .../mapping/RecordMapperStringTest.java       |  0
 .../mapping/selectors/MetaSelectorTest.java   |  0
 .../mapping/selectors/SelectorsTest.java      |  0
 .../adapters/mapping/selectors/ValueTest.java |  0
 .../avro/GenericRecordDeserializerTest.java   |  0
 .../avro/GenericRecordSelectorTest.java       |  0
 .../json/JsonNodeDeserializerTest.java        |  0
 .../selectors/json/JsonNodeSelectorTest.java  |  0
 .../selectors/string/StringSelectorsTest.java |  0
 .../test_utils/ConnectorConfigProvider.java   |  0
 .../adapters/test_utils/ConsumerRecords.java  |  0
 .../test_utils/GenericRecordProvider.java     |  0
 .../adapters/test_utils/JsonNodeProvider.java |  0
 .../test_utils/SelectorsSuppliers.java        |  0
 .../src}/test/resources/array.avsc            |  0
 .../src}/test/resources/document.avsc         |  0
 .../src}/test/resources/flights.json          |  0
 .../src}/test/resources/multiarray.avsc       |  0
 .../test/resources/should-expand-items.csv    |  0
 .../test/resources/should-matches-items.csv   |  0
 .../src}/test/resources/value.avsc            |  0
 gradle.properties                             |  1 +
 settings.gradle                               |  1 +
 111 files changed, 156 insertions(+), 75 deletions(-)
 create mode 100644 buildSrc/build.gradle
 rename build.gradle => buildSrc/src/main/groovy/lightstreamer-kafka-connector.gradle (51%)
 create mode 100644 connector/.classpath
 create mode 100644 connector/.project
 create mode 100644 connector/build.gradle
 rename {src => connector/src}/clients/Producer.java (100%)
 rename {src => connector/src}/clients/consumer/Listeners.java (100%)
 rename {src => connector/src}/clients/consumer/LsClient.java (100%)
 rename {src => connector/src}/clients/kafka-producer.java (100%)
 rename {src => connector/src}/clients/lsclient.java (100%)
 rename {src => connector/src}/clients/producer/Producer.java (100%)
 rename {src => connector/src}/clients/producer/avro-config.properties (100%)
 rename {src => connector/src}/clients/producer/simple-config.properties (100%)
 rename {src => connector/src}/connector/dist/README.md (100%)
 rename {src => connector/src}/connector/dist/adapters.bcp.xml (100%)
 rename {src => connector/src}/connector/dist/adapters.xml (97%)
 rename {src => connector/src}/connector/dist/log4j.properties (100%)
 rename {src => connector/src}/connector/dist/user-key.avsc (100%)
 rename {src => connector/src}/connector/dist/user-value.avsc (100%)
 rename {src => connector/src}/docs/adapters-example.xml (100%)
 rename {src => connector/src}/docs/fields-mapping.xml (100%)
 rename {src => connector/src}/docs/stock.json (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorDataAdapter.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorMetadataAdapter.java (96%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfigurator.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/Loop.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/commons/Either.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/commons/LogFactory.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/commons/MetadataListener.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/commons/NonNullKeyProperties.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/AbstractConfig.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigs.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/ConfigException.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfig.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigs.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfig.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/InfoItem.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigs.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfig.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/AuthenticationConfigs.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/GssapiConfigs.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/KeystoreConfigs.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/TlsConfigs.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigTypes.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigsSpec.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/consumers/AbstractConsumerLoop.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoop.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ExpressionException.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Fields.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemExpressionEvaluator.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Items.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapper.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/AbstractLocalSchemaDeserializer.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/BaseSelector.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelector.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelectorSupplier.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelector.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorSupplier.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Schema.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selector.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorExpressionParser.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorSupplier.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selectors.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Value.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueException.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelector.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelectorSupplier.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValuesContainer.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializer.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorsSuppliers.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializer.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorsSuppliers.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorSuppliers.java (100%)
 rename {src => connector/src}/main/java/com/lightstreamer/kafka_connector/adapters/pub/KafkaConnectorMetadataAdapter.java (97%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/ConnectorAdapterSetTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfiguratorTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigsTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfigTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigsTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfigTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigsTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfigTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigSpecTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoopTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTemplatesTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperAvroTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperJsonTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperStringTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorsTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializerTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializerTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorsTest.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConnectorConfigProvider.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConsumerRecords.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/GenericRecordProvider.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/JsonNodeProvider.java (100%)
 rename {src => connector/src}/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/SelectorsSuppliers.java (100%)
 rename {src => connector/src}/test/resources/array.avsc (100%)
 rename {src => connector/src}/test/resources/document.avsc (100%)
 rename {src => connector/src}/test/resources/flights.json (100%)
 rename {src => connector/src}/test/resources/multiarray.avsc (100%)
 rename {src => connector/src}/test/resources/should-expand-items.csv (100%)
 rename {src => connector/src}/test/resources/should-matches-items.csv (100%)
 rename {src => connector/src}/test/resources/value.avsc (100%)
 create mode 100644 gradle.properties

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 00000000..6a2033a2
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,11 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
+}
\ No newline at end of file
diff --git a/build.gradle b/buildSrc/src/main/groovy/lightstreamer-kafka-connector.gradle
similarity index 51%
rename from build.gradle
rename to buildSrc/src/main/groovy/lightstreamer-kafka-connector.gradle
index 0dd2cb38..fa789727 100644
--- a/build.gradle
+++ b/buildSrc/src/main/groovy/lightstreamer-kafka-connector.gradle
@@ -1,11 +1,11 @@
 plugins {
     id 'java-library'
-    id 'eclipse'
-    id 'distribution'
-    id "com.github.davidmc24.gradle.plugin.avro" version "1.9.1"
-    id("com.diffplug.spotless") version "6.25.0"
+    id 'java-library-distribution'
+    id("com.diffplug.spotless")
 }
 
+group = 'com.lightstreamer.kafka_connector'
+
 spotless {
     format 'misc', {
         target '*.gradle'
@@ -47,8 +47,6 @@ spotless {
     }
 }
 
-version = '0.1.0'
-
 repositories {
     mavenCentral()
     maven {
@@ -61,14 +59,6 @@ dependencies {
     testImplementation('org.junit.jupiter:junit-jupiter')
     testImplementation "com.google.truth:truth:1.2.0"
     testImplementation "com.google.truth.extensions:truth-java8-extension:1.2.0"
-
-    implementation group: 'com.lightstreamer', name: 'ls-adapter-inprocess', version: '8.0.0'
-    implementation group: 'org.slf4j', name: 'slf4j-reload4j', 'version': '2.0.10'
-
-    implementation group:'org.apache.kafka', name:'kafka-clients', version:'7.5.3-ccs'
-    implementation group:'io.confluent', name: 'kafka-avro-serializer', version:'7.5.3'
-    implementation group:'io.confluent', name: 'kafka-json-serializer', version:'7.5.3'
-    implementation group:'io.confluent', name: 'kafka-json-schema-serializer', version:'7.5.3'
 }
 
 java {
@@ -79,58 +69,4 @@ java {
 
 tasks.named('test') {
     useJUnitPlatform()
-}
-
-task deployAdapters(type: Copy) {
-    dependsOn 'cleanDeploy'
-
-    into "deploy"
-
-    from (jar) {
-        into "connector/lib"
-    }
-
-    from (configurations.runtimeClasspath) {
-        into "connector/lib"
-        exclude "ls-adapter-inprocess*"
-        exclude "jsr305*"
-    }
-
-    from ("examples/quickstart") {
-        into "connector"
-    }
-}
-
-task deploy(type: Copy) {
-    dependsOn 'deployAdapters'
-    into "deploy/conf"
-    from ("examples/conf")
-}
-
-task cleanDeploy(type: Delete) {
-    delete "deploy"
-}
-
-sourceSets.main.java.srcDirs += ['src/clients/java']
-
-distributions {
-    connector {
-        distributionBaseName =  rootProject.name
-
-        contents {
-            from(jar) {
-                into "lib"
-            }
-
-            from (configurations.runtimeClasspath) {
-                into "lib"
-                exclude "ls-adapter-inprocess*"
-                exclude "jsr305*"
-            }
-        }
-    }
-}
-
-task distribuite {
-    dependsOn connectorDistZip
-}
+}
\ No newline at end of file
diff --git a/connector/.classpath b/connector/.classpath
new file mode 100644
index 00000000..31e14eb8
--- /dev/null
+++ b/connector/.classpath
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="bin/test" path="src/test/resources">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/test" path="src/test/java">
+		<attributes>
+			<attribute name="gradle_scope" value="test"/>
+			<attribute name="gradle_used_by_scope" value="test"/>
+			<attribute name="test" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="src/main/resources">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="bin/main" path="src/main/java">
+		<attributes>
+			<attribute name="gradle_scope" value="main"/>
+			<attribute name="gradle_used_by_scope" value="main,test"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/connector/.project b/connector/.project
new file mode 100644
index 00000000..458a704c
--- /dev/null
+++ b/connector/.project
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>connector</name>
+	<comment>Project connector created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1708629776379</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
diff --git a/connector/build.gradle b/connector/build.gradle
new file mode 100644
index 00000000..9a182190
--- /dev/null
+++ b/connector/build.gradle
@@ -0,0 +1,67 @@
+plugins {
+    id 'lightstreamer-kafka-connector'
+    id "com.github.davidmc24.gradle.plugin.avro" version "1.9.1"
+}
+
+dependencies {
+    implementation group: 'com.lightstreamer', name: 'ls-adapter-inprocess', version: '8.0.0'
+    implementation group: 'org.slf4j', name: 'slf4j-reload4j', 'version': '2.0.10'
+    implementation group: 'org.apache.kafka', name:'kafka-clients', version:'7.5.3-ccs'
+    implementation group: 'io.confluent', name: 'kafka-avro-serializer', version:'7.5.3'
+    implementation group: 'io.confluent', name: 'kafka-json-serializer', version:'7.5.3'
+    implementation group: 'io.confluent', name: 'kafka-json-schema-serializer', version:'7.5.3'
+}
+
+task deployAdapters(type: Copy) {
+    dependsOn 'cleanDeploy'
+
+    into "deploy"
+
+    from (jar) {
+        into "connector/lib"
+    }
+
+    from (configurations.runtimeClasspath) {
+        into "connector/lib"
+        exclude "ls-adapter-inprocess*"
+        exclude "jsr305*"
+    }
+
+    from ("examples/quickstart") {
+        into "connector"
+    }
+}
+
+task deploy(type: Copy) {
+    dependsOn 'deployAdapters'
+    into "deploy/conf"
+    from ("examples/conf")
+}
+
+task cleanDeploy(type: Delete) {
+    delete "deploy"
+}
+
+sourceSets.main.java.srcDirs += ['src/clients/java']
+
+distributions {
+    connector {
+        distributionBaseName =  rootProject.name
+
+        contents {
+            from(jar) {
+                into "lib"
+            }
+
+            from (configurations.runtimeClasspath) {
+                into "lib"
+                exclude "ls-adapter-inprocess*"
+                exclude "jsr305*"
+            }
+        }
+    }
+}
+
+task distribuite {
+    dependsOn connectorDistZip
+}
diff --git a/src/clients/Producer.java b/connector/src/clients/Producer.java
similarity index 100%
rename from src/clients/Producer.java
rename to connector/src/clients/Producer.java
diff --git a/src/clients/consumer/Listeners.java b/connector/src/clients/consumer/Listeners.java
similarity index 100%
rename from src/clients/consumer/Listeners.java
rename to connector/src/clients/consumer/Listeners.java
diff --git a/src/clients/consumer/LsClient.java b/connector/src/clients/consumer/LsClient.java
similarity index 100%
rename from src/clients/consumer/LsClient.java
rename to connector/src/clients/consumer/LsClient.java
diff --git a/src/clients/kafka-producer.java b/connector/src/clients/kafka-producer.java
similarity index 100%
rename from src/clients/kafka-producer.java
rename to connector/src/clients/kafka-producer.java
diff --git a/src/clients/lsclient.java b/connector/src/clients/lsclient.java
similarity index 100%
rename from src/clients/lsclient.java
rename to connector/src/clients/lsclient.java
diff --git a/src/clients/producer/Producer.java b/connector/src/clients/producer/Producer.java
similarity index 100%
rename from src/clients/producer/Producer.java
rename to connector/src/clients/producer/Producer.java
diff --git a/src/clients/producer/avro-config.properties b/connector/src/clients/producer/avro-config.properties
similarity index 100%
rename from src/clients/producer/avro-config.properties
rename to connector/src/clients/producer/avro-config.properties
diff --git a/src/clients/producer/simple-config.properties b/connector/src/clients/producer/simple-config.properties
similarity index 100%
rename from src/clients/producer/simple-config.properties
rename to connector/src/clients/producer/simple-config.properties
diff --git a/src/connector/dist/README.md b/connector/src/connector/dist/README.md
similarity index 100%
rename from src/connector/dist/README.md
rename to connector/src/connector/dist/README.md
diff --git a/src/connector/dist/adapters.bcp.xml b/connector/src/connector/dist/adapters.bcp.xml
similarity index 100%
rename from src/connector/dist/adapters.bcp.xml
rename to connector/src/connector/dist/adapters.bcp.xml
diff --git a/src/connector/dist/adapters.xml b/connector/src/connector/dist/adapters.xml
similarity index 97%
rename from src/connector/dist/adapters.xml
rename to connector/src/connector/dist/adapters.xml
index e93a6eb2..06142675 100644
--- a/src/connector/dist/adapters.xml
+++ b/connector/src/connector/dist/adapters.xml
@@ -125,7 +125,7 @@
 
         <param name="group.id">test</param>
 
-        <param name="enable">true</param>
+        <param name="enable">disable</param>
 
         <!-- TOPIC MAPPING SECTION -->
 
diff --git a/src/connector/dist/log4j.properties b/connector/src/connector/dist/log4j.properties
similarity index 100%
rename from src/connector/dist/log4j.properties
rename to connector/src/connector/dist/log4j.properties
diff --git a/src/connector/dist/user-key.avsc b/connector/src/connector/dist/user-key.avsc
similarity index 100%
rename from src/connector/dist/user-key.avsc
rename to connector/src/connector/dist/user-key.avsc
diff --git a/src/connector/dist/user-value.avsc b/connector/src/connector/dist/user-value.avsc
similarity index 100%
rename from src/connector/dist/user-value.avsc
rename to connector/src/connector/dist/user-value.avsc
diff --git a/src/docs/adapters-example.xml b/connector/src/docs/adapters-example.xml
similarity index 100%
rename from src/docs/adapters-example.xml
rename to connector/src/docs/adapters-example.xml
diff --git a/src/docs/fields-mapping.xml b/connector/src/docs/fields-mapping.xml
similarity index 100%
rename from src/docs/fields-mapping.xml
rename to connector/src/docs/fields-mapping.xml
diff --git a/src/docs/stock.json b/connector/src/docs/stock.json
similarity index 100%
rename from src/docs/stock.json
rename to connector/src/docs/stock.json
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorDataAdapter.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorDataAdapter.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorDataAdapter.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorDataAdapter.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorMetadataAdapter.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorMetadataAdapter.java
similarity index 96%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorMetadataAdapter.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorMetadataAdapter.java
index 776a338c..b2e083af 100644
--- a/src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorMetadataAdapter.java
+++ b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/ConnectorMetadataAdapter.java
@@ -29,5 +29,6 @@ public void onUnsubscription(String user, String sessionID, TableInfo[] tables)
             throws CreditsException, NotificationException {}
 
     @Override
-    public void onUnsubscription(String sessionID, TableInfo[] tables) throws NotificationException {}
+    public void onUnsubscription(String sessionID, TableInfo[] tables)
+            throws NotificationException {}
 }
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfigurator.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfigurator.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfigurator.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfigurator.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/Loop.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/Loop.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/Loop.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/Loop.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/Either.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/Either.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/commons/Either.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/Either.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/LogFactory.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/LogFactory.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/commons/LogFactory.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/LogFactory.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/MetadataListener.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/MetadataListener.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/commons/MetadataListener.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/MetadataListener.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/NonNullKeyProperties.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/NonNullKeyProperties.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/commons/NonNullKeyProperties.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/commons/NonNullKeyProperties.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/AbstractConfig.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/AbstractConfig.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/AbstractConfig.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/AbstractConfig.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigs.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigs.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigs.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigs.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/ConfigException.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/ConfigException.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/ConfigException.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/ConfigException.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfig.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfig.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfig.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfig.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigs.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigs.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigs.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigs.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfig.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfig.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfig.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfig.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/InfoItem.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/InfoItem.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/InfoItem.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/InfoItem.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigs.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigs.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigs.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigs.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfig.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfig.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfig.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfig.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/AuthenticationConfigs.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/AuthenticationConfigs.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/AuthenticationConfigs.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/AuthenticationConfigs.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/GssapiConfigs.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/GssapiConfigs.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/GssapiConfigs.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/GssapiConfigs.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/KeystoreConfigs.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/KeystoreConfigs.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/KeystoreConfigs.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/KeystoreConfigs.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/TlsConfigs.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/TlsConfigs.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/TlsConfigs.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/nested/TlsConfigs.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigTypes.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigTypes.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigTypes.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigTypes.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigsSpec.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigsSpec.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigsSpec.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigsSpec.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/consumers/AbstractConsumerLoop.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/consumers/AbstractConsumerLoop.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/consumers/AbstractConsumerLoop.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/consumers/AbstractConsumerLoop.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoop.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoop.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoop.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoop.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ExpressionException.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ExpressionException.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ExpressionException.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ExpressionException.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Fields.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Fields.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Fields.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Fields.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemExpressionEvaluator.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemExpressionEvaluator.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemExpressionEvaluator.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemExpressionEvaluator.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Items.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Items.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Items.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/Items.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapper.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapper.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapper.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapper.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/AbstractLocalSchemaDeserializer.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/AbstractLocalSchemaDeserializer.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/AbstractLocalSchemaDeserializer.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/AbstractLocalSchemaDeserializer.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/BaseSelector.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/BaseSelector.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/BaseSelector.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/BaseSelector.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelector.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelector.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelector.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelector.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelectorSupplier.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelectorSupplier.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelectorSupplier.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/KeySelectorSupplier.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelector.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelector.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelector.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelector.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorSupplier.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorSupplier.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorSupplier.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorSupplier.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Schema.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Schema.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Schema.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Schema.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selector.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selector.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selector.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selector.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorExpressionParser.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorExpressionParser.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorExpressionParser.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorExpressionParser.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorSupplier.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorSupplier.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorSupplier.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorSupplier.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selectors.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selectors.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selectors.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Selectors.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Value.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Value.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Value.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/Value.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueException.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueException.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueException.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueException.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelector.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelector.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelector.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelector.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelectorSupplier.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelectorSupplier.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelectorSupplier.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueSelectorSupplier.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValuesContainer.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValuesContainer.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValuesContainer.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValuesContainer.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializer.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializer.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializer.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializer.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorsSuppliers.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorsSuppliers.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorsSuppliers.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorsSuppliers.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializer.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializer.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializer.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializer.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorsSuppliers.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorsSuppliers.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorsSuppliers.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorsSuppliers.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorSuppliers.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorSuppliers.java
similarity index 100%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorSuppliers.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorSuppliers.java
diff --git a/src/main/java/com/lightstreamer/kafka_connector/adapters/pub/KafkaConnectorMetadataAdapter.java b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/pub/KafkaConnectorMetadataAdapter.java
similarity index 97%
rename from src/main/java/com/lightstreamer/kafka_connector/adapters/pub/KafkaConnectorMetadataAdapter.java
rename to connector/src/main/java/com/lightstreamer/kafka_connector/adapters/pub/KafkaConnectorMetadataAdapter.java
index 2189f915..ae7f9e6a 100644
--- a/src/main/java/com/lightstreamer/kafka_connector/adapters/pub/KafkaConnectorMetadataAdapter.java
+++ b/connector/src/main/java/com/lightstreamer/kafka_connector/adapters/pub/KafkaConnectorMetadataAdapter.java
@@ -23,7 +23,6 @@
 import com.lightstreamer.interfaces.metadata.Mode;
 import com.lightstreamer.interfaces.metadata.NotificationException;
 import com.lightstreamer.interfaces.metadata.TableInfo;
-import com.lightstreamer.kafka_connector.adapters.ConnectorMetadataAdapter;
 import com.lightstreamer.kafka_connector.adapters.commons.MetadataListener;
 import com.lightstreamer.kafka_connector.adapters.config.ConfigException;
 import com.lightstreamer.kafka_connector.adapters.config.GlobalConfig;
@@ -65,8 +64,7 @@ public final void init(@SuppressWarnings("rawtypes") Map params, File configDir)
         doInit(params, configDir);
     }
 
-    protected void doInit(Map params, File configDir) throws MetadataProviderException {
-    }
+    protected void doInit(Map params, File configDir) throws MetadataProviderException {}
 
     // Used only for unit testing.
     public final Optional<Set<String>> itemsBySession(String sessionId) {
@@ -76,7 +74,7 @@ public final Optional<Set<String>> itemsBySession(String sessionId) {
     private void configureLogging(File configDir) throws ConfigException {
         String logConfigFile = globalConfig.getFile(GlobalConfig.LOGGING_CONFIGURATION_PATH);
         PropertyConfigurator.configure(logConfigFile);
-        this.log = LoggerFactory.getLogger(ConnectorMetadataAdapter.class);
+        this.log = LoggerFactory.getLogger(KafkaConnectorMetadataAdapter.class);
     }
 
     public static final MetadataListener listener(String dataProviderName, boolean enabled) {
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/ConnectorAdapterSetTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/ConnectorAdapterSetTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/ConnectorAdapterSetTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/ConnectorAdapterSetTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfiguratorTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfiguratorTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfiguratorTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/ConsumerLoopConfiguratorTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigsTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigsTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigsTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/BrokerAuthenticationConfigsTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfigTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfigTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfigTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/ConnectorConfigTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigsTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigsTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigsTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/EncryptionConfigsTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfigTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfigTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfigTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/GlobalConfigTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigsTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigsTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigsTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/SchemaRegistryConfigsTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfigTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfigTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfigTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/TopicsConfigTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigSpecTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigSpecTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigSpecTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/config/specs/ConfigSpecTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoopTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoopTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoopTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/consumers/ConsumerLoopTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTemplatesTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTemplatesTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTemplatesTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTemplatesTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/ItemTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperAvroTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperAvroTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperAvroTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperAvroTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperJsonTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperJsonTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperJsonTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperJsonTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperStringTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperStringTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperStringTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/RecordMapperStringTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/MetaSelectorTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorsTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorsTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorsTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/SelectorsTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/ValueTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializerTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializerTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializerTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordDeserializerTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/avro/GenericRecordSelectorTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializerTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializerTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializerTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeDeserializerTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/json/JsonNodeSelectorTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorsTest.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorsTest.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorsTest.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/mapping/selectors/string/StringSelectorsTest.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConnectorConfigProvider.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConnectorConfigProvider.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConnectorConfigProvider.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConnectorConfigProvider.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConsumerRecords.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConsumerRecords.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConsumerRecords.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/ConsumerRecords.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/GenericRecordProvider.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/GenericRecordProvider.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/GenericRecordProvider.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/GenericRecordProvider.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/JsonNodeProvider.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/JsonNodeProvider.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/JsonNodeProvider.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/JsonNodeProvider.java
diff --git a/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/SelectorsSuppliers.java b/connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/SelectorsSuppliers.java
similarity index 100%
rename from src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/SelectorsSuppliers.java
rename to connector/src/test/java/com/lightstreamer/kafka_connector/adapters/test_utils/SelectorsSuppliers.java
diff --git a/src/test/resources/array.avsc b/connector/src/test/resources/array.avsc
similarity index 100%
rename from src/test/resources/array.avsc
rename to connector/src/test/resources/array.avsc
diff --git a/src/test/resources/document.avsc b/connector/src/test/resources/document.avsc
similarity index 100%
rename from src/test/resources/document.avsc
rename to connector/src/test/resources/document.avsc
diff --git a/src/test/resources/flights.json b/connector/src/test/resources/flights.json
similarity index 100%
rename from src/test/resources/flights.json
rename to connector/src/test/resources/flights.json
diff --git a/src/test/resources/multiarray.avsc b/connector/src/test/resources/multiarray.avsc
similarity index 100%
rename from src/test/resources/multiarray.avsc
rename to connector/src/test/resources/multiarray.avsc
diff --git a/src/test/resources/should-expand-items.csv b/connector/src/test/resources/should-expand-items.csv
similarity index 100%
rename from src/test/resources/should-expand-items.csv
rename to connector/src/test/resources/should-expand-items.csv
diff --git a/src/test/resources/should-matches-items.csv b/connector/src/test/resources/should-matches-items.csv
similarity index 100%
rename from src/test/resources/should-matches-items.csv
rename to connector/src/test/resources/should-matches-items.csv
diff --git a/src/test/resources/value.avsc b/connector/src/test/resources/value.avsc
similarity index 100%
rename from src/test/resources/value.avsc
rename to connector/src/test/resources/value.avsc
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 00000000..3f63f85a
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1 @@
+version = 0.1.0
diff --git a/settings.gradle b/settings.gradle
index 0e233977..eaa28396 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1,2 @@
 rootProject.name = 'lightstreamer-kafka-connector'
+include 'connector'