diff --git a/bundles/io.github.linkedfactory.kvin/bnd.bnd b/bundles/io.github.linkedfactory.core/bnd.bnd
similarity index 100%
rename from bundles/io.github.linkedfactory.kvin/bnd.bnd
rename to bundles/io.github.linkedfactory.core/bnd.bnd
diff --git a/bundles/io.github.linkedfactory.kvin/pom.xml b/bundles/io.github.linkedfactory.core/pom.xml
similarity index 98%
rename from bundles/io.github.linkedfactory.kvin/pom.xml
rename to bundles/io.github.linkedfactory.core/pom.xml
index 51baf5da..b29d6ac0 100644
--- a/bundles/io.github.linkedfactory.kvin/pom.xml
+++ b/bundles/io.github.linkedfactory.core/pom.xml
@@ -8,7 +8,7 @@
 		<version>0.0.1-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
-	<artifactId>io.github.linkedfactory.kvin</artifactId>
+	<artifactId>io.github.linkedfactory.core</artifactId>
 
 	<properties>
 		<parquet.version>1.13.1</parquet.version>
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/Data.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/Data.java
similarity index 98%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/Data.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/Data.java
index dc7f3624..7e0ecf26 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/Data.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/Data.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin;
+package io.github.linkedfactory.core.kvin;
 
 import java.util.Arrays;
 import java.util.Iterator;
@@ -23,7 +23,6 @@
 import java.util.stream.StreamSupport;
 
 import net.enilink.komma.core.URI;
-import net.enilink.komma.core.URIs;
 
 /**
  * A linked list of (property, value) pairs where properties are {@link URI}s
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/DelegatingKvin.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/DelegatingKvin.java
similarity index 98%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/DelegatingKvin.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/DelegatingKvin.java
index 7bb02c59..7607d3c3 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/DelegatingKvin.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/DelegatingKvin.java
@@ -1,4 +1,4 @@
-package io.github.linkedfactory.kvin;
+package io.github.linkedfactory.core.kvin;
 
 import net.enilink.commons.iterator.IExtendedIterator;
 import net.enilink.komma.core.URI;
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/Kvin.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/Kvin.java
similarity index 99%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/Kvin.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/Kvin.java
index a67d59f7..e31fb93f 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/Kvin.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/Kvin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin;
+package io.github.linkedfactory.core.kvin;
 
 import java.io.Closeable;
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/KvinListener.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/KvinListener.java
similarity index 96%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/KvinListener.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/KvinListener.java
index fbf46ce9..8b826214 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/KvinListener.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/KvinListener.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin;
+package io.github.linkedfactory.core.kvin;
 
 import net.enilink.komma.core.URI;
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/KvinTuple.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/KvinTuple.java
similarity index 98%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/KvinTuple.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/KvinTuple.java
index f40ceb57..531fb3bc 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/KvinTuple.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/KvinTuple.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin;
+package io.github.linkedfactory.core.kvin;
 
 import java.util.Formatter;
 import java.util.Objects;
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/Record.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/Record.java
similarity index 97%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/Record.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/Record.java
index bce336d2..2c97b318 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/Record.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/Record.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin;
+package io.github.linkedfactory.core.kvin;
 
 import net.enilink.komma.core.URI;
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/http/KvinHttp.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/http/KvinHttp.java
similarity index 97%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/http/KvinHttp.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/http/KvinHttp.java
index f934d142..577b8a60 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/http/KvinHttp.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/http/KvinHttp.java
@@ -1,4 +1,4 @@
-package io.github.linkedfactory.kvin.http;
+package io.github.linkedfactory.core.kvin.http;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
@@ -7,11 +7,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.io.ByteStreams;
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinListener;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.Record;
-import io.github.linkedfactory.kvin.util.JsonFormatParser;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinListener;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.Record;
+import io.github.linkedfactory.core.kvin.util.JsonFormatParser;
 import net.enilink.commons.iterator.*;
 import net.enilink.komma.core.URI;
 import net.enilink.komma.core.URIs;
@@ -25,15 +25,12 @@
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
-import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 
 public class KvinHttp implements Kvin {
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/Compactor.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/Compactor.java
similarity index 98%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/Compactor.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/Compactor.java
index 82177791..71358d32 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/Compactor.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/Compactor.java
@@ -1,4 +1,4 @@
-package io.github.linkedfactory.kvin.parquet;
+package io.github.linkedfactory.core.kvin.parquet;
 
 import net.enilink.commons.util.Pair;
 import org.apache.commons.io.FileUtils;
@@ -17,7 +17,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static io.github.linkedfactory.kvin.parquet.ParquetHelpers.*;
+import static io.github.linkedfactory.core.kvin.parquet.ParquetHelpers.*;
 
 public class Compactor {
 	String archiveLocation;
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/IdMapping.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/IdMapping.java
similarity index 70%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/IdMapping.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/IdMapping.java
index a7c15169..efaab388 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/IdMapping.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/IdMapping.java
@@ -1,4 +1,4 @@
-package io.github.linkedfactory.kvin.parquet;
+package io.github.linkedfactory.core.kvin.parquet;
 
 public interface IdMapping {
 	long getId();
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/KvinParquet.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinParquet.java
similarity index 94%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/KvinParquet.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinParquet.java
index 4dc0083d..f428b816 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/KvinParquet.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinParquet.java
@@ -1,12 +1,12 @@
-package io.github.linkedfactory.kvin.parquet;
+package io.github.linkedfactory.core.kvin.parquet;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinListener;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.Record;
-import io.github.linkedfactory.kvin.util.AggregatingIterator;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinListener;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.Record;
+import io.github.linkedfactory.core.kvin.util.AggregatingIterator;
 import net.enilink.commons.iterator.IExtendedIterator;
 import net.enilink.commons.iterator.NiceIterator;
 import net.enilink.commons.util.Pair;
@@ -42,9 +42,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static io.github.linkedfactory.kvin.parquet.ParquetHelpers.*;
-import static io.github.linkedfactory.kvin.parquet.Records.decodeRecord;
-import static io.github.linkedfactory.kvin.parquet.Records.encodeRecord;
+import static io.github.linkedfactory.core.kvin.parquet.ParquetHelpers.*;
+import static io.github.linkedfactory.core.kvin.parquet.Records.decodeRecord;
+import static io.github.linkedfactory.core.kvin.parquet.Records.encodeRecord;
 import static org.apache.parquet.filter2.predicate.FilterApi.*;
 
 public class KvinParquet implements Kvin {
@@ -68,7 +68,7 @@ public class KvinParquet implements Kvin {
 
 	public KvinParquet(String archiveLocation) {
 		this.archiveLocation = archiveLocation;
-		if (! this.archiveLocation.endsWith("/")) {
+		if (!this.archiveLocation.endsWith("/")) {
 			this.archiveLocation = this.archiveLocation + "/";
 		}
 	}
@@ -437,24 +437,13 @@ private IdMappings getIdMappings(URI item, URI property, URI context) throws IOE
 	}
 
 	private FilterPredicate generateFetchFilter(IdMappings idMappings) {
-		if (idMappings.propertyId != 0L) {
+		if (idMappings.propertyId != 0L && idMappings.contextId != 0L) {
 			ByteBuffer keyBuffer = ByteBuffer.allocate(Long.BYTES * 3);
 			keyBuffer.putLong(idMappings.itemId);
 			keyBuffer.putLong(idMappings.propertyId);
 			keyBuffer.putLong(idMappings.contextId);
 			return eq(FilterApi.binaryColumn("id"), Binary.fromConstantByteArray(keyBuffer.array()));
-		} else {
-			ByteBuffer keyBuffer = ByteBuffer.allocate(Long.BYTES);
-			keyBuffer.putLong(idMappings.itemId);
-			return and(gt(FilterApi.binaryColumn("id"), Binary.fromConstantByteArray(keyBuffer.array())),
-					lt(FilterApi.binaryColumn("id"),
-							Binary.fromConstantByteArray(ByteBuffer.allocate(Long.BYTES)
-									.putLong(idMappings.itemId + 1).array())));
-		}
-	}
-
-	private FilterPredicate generatePropertyFetchFilter(IdMappings idMappings) {
-		if (idMappings.propertyId != 0L) {
+		} else if (idMappings.propertyId != 0L) {
 			ByteBuffer keyBuffer = ByteBuffer.allocate(Long.BYTES * 2);
 			keyBuffer.putLong(idMappings.itemId);
 			keyBuffer.putLong(idMappings.propertyId);
@@ -768,36 +757,50 @@ private KvinTupleMetadata getFirstTuple(URI item, Long itemId, Long propertyId,
 		KvinTupleMetadata foundTuple = null;
 		try {
 			if (itemId == null) {
-				idMappings = getIdMappings(item, null, Kvin.DEFAULT_CONTEXT);
+				idMappings = getIdMappings(item, null, null);
+				if (propertyId != null) {
+					idMappings.propertyId = propertyId;
+				}
+				if (contextId != null) {
+					idMappings.contextId = contextId;
+				}
 			} else if (item != null && itemId != null && propertyId != null) {
 				idMappings = new IdMappings();
 				idMappings.itemId = itemId;
 				idMappings.propertyId = propertyId;
-				idMappings.contextId = contextId;
+				idMappings.contextId = contextId != null ? contextId : 0L;
 			}
 			if (idMappings.itemId == 0L) {
 				return null;
 			}
 
-			FilterPredicate filter = generatePropertyFetchFilter(idMappings);
+			FilterPredicate filter = generateFetchFilter(idMappings);
 			List<java.nio.file.Path> dataFolders = getDataFolders(idMappings);
 			ParquetReader<KvinTupleInternal> reader;
 
-			HadoopInputFile inputFile = getFile(getDataFiles(dataFolders.get(0).toString()).get(0));
-			reader = AvroParquetReader.<KvinTupleInternal>builder(inputFile)
-					.withDataModel(reflectData)
-					.useStatsFilter()
-					.withFilter(FilterCompat.get(filter))
-					.build();
-			KvinTupleInternal firstTuple = reader.read();
-			reader.close();
+			KvinTupleInternal firstTuple = null;
+			for (java.nio.file.Path dataFolder : dataFolders) {
+				for (Path dataFile : getDataFiles(dataFolder.toString())) {
+					reader = AvroParquetReader.<KvinTupleInternal>builder(getFile(dataFile))
+							.withDataModel(reflectData)
+							.useStatsFilter()
+							.withFilter(FilterCompat.get(filter))
+							.build();
+					KvinTupleInternal tuple = reader.read();
+					if (firstTuple == null || tuple != null && firstTuple != null && tuple.compareTo(firstTuple) < 0) {
+						firstTuple = tuple;
+					}
+					reader.close();
+				}
+			}
 
 			if (firstTuple != null) {
 				URI firstTupleProperty = URIs.createURI(getProperty(firstTuple));
 				if (itemId == null) {
 					idMappings.propertyId = getId(firstTupleProperty, IdType.PROPERTY_ID);
 				}
-				foundTuple = new KvinTupleMetadata(item.toString(), firstTupleProperty.toString(), idMappings.itemId, idMappings.propertyId, idMappings.contextId);
+				foundTuple = new KvinTupleMetadata(item.toString(), firstTupleProperty.toString(),
+						idMappings.itemId, idMappings.propertyId, idMappings.contextId);
 			}
 
 			return foundTuple;
@@ -816,7 +819,8 @@ public synchronized IExtendedIterator<URI> properties(URI item) {
 			@Override
 			public boolean hasNext() {
 				if (currentTuple == null && previousTuple != null) {
-					currentTuple = getFirstTuple(URIs.createURI(previousTuple.getItem()), previousTuple.getItemId(), previousTuple.getPropertyId() + 1, previousTuple.contextId);
+					currentTuple = getFirstTuple(URIs.createURI(previousTuple.getItem()), previousTuple.getItemId(),
+							previousTuple.getPropertyId() + 1, null);
 				}
 				return currentTuple != null;
 			}
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/KvinTupleInternal.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinTupleInternal.java
similarity index 97%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/KvinTupleInternal.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinTupleInternal.java
index 4863cd68..eed36ba0 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/KvinTupleInternal.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinTupleInternal.java
@@ -1,4 +1,4 @@
-package io.github.linkedfactory.kvin.parquet;
+package io.github.linkedfactory.core.kvin.parquet;
 
 import java.util.Arrays;
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/KvinTupleMetadata.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinTupleMetadata.java
similarity index 95%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/KvinTupleMetadata.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinTupleMetadata.java
index 75278908..07ed937b 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/KvinTupleMetadata.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/KvinTupleMetadata.java
@@ -1,4 +1,4 @@
-package io.github.linkedfactory.kvin.parquet;
+package io.github.linkedfactory.core.kvin.parquet;
 
 public class KvinTupleMetadata {
 	String item;
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/ParquetHelpers.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/ParquetHelpers.java
similarity index 98%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/ParquetHelpers.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/ParquetHelpers.java
index c67f8989..26abfc0d 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/ParquetHelpers.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/ParquetHelpers.java
@@ -1,4 +1,4 @@
-package io.github.linkedfactory.kvin.parquet;
+package io.github.linkedfactory.core.kvin.parquet;
 
 import net.enilink.commons.util.Pair;
 import org.apache.avro.Schema;
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/Records.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/Records.java
similarity index 94%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/Records.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/Records.java
index 29d44b16..1f79ca71 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/Records.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/Records.java
@@ -1,7 +1,7 @@
-package io.github.linkedfactory.kvin.parquet;
+package io.github.linkedfactory.core.kvin.parquet;
 
-import io.github.linkedfactory.kvin.Record;
-import io.github.linkedfactory.kvin.util.Values;
+import io.github.linkedfactory.core.kvin.Record;
+import io.github.linkedfactory.core.kvin.util.Values;
 import net.enilink.komma.core.URI;
 import net.enilink.komma.core.URIs;
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/SimpleMapping.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/SimpleMapping.java
similarity index 86%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/SimpleMapping.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/SimpleMapping.java
index a52444c8..9d8d6060 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/parquet/SimpleMapping.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/parquet/SimpleMapping.java
@@ -1,4 +1,4 @@
-package io.github.linkedfactory.kvin.parquet;
+package io.github.linkedfactory.core.kvin.parquet;
 
 public class SimpleMapping implements IdMapping {
 	long id;
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/partitioned/KvinPartitioned.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/partitioned/KvinPartitioned.java
similarity index 95%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/partitioned/KvinPartitioned.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/partitioned/KvinPartitioned.java
index 8cb9eef9..4814f064 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/partitioned/KvinPartitioned.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/partitioned/KvinPartitioned.java
@@ -1,12 +1,12 @@
-package io.github.linkedfactory.kvin.partitioned;
+package io.github.linkedfactory.core.kvin.partitioned;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinListener;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDbArchiver;
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb;
-import io.github.linkedfactory.kvin.parquet.KvinParquet;
-import io.github.linkedfactory.kvin.util.AggregatingIterator;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinListener;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDbArchiver;
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb;
+import io.github.linkedfactory.core.kvin.parquet.KvinParquet;
+import io.github.linkedfactory.core.kvin.util.AggregatingIterator;
 import net.enilink.commons.iterator.IExtendedIterator;
 import net.enilink.commons.iterator.NiceIterator;
 import net.enilink.commons.iterator.WrappedIterator;
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/AggregatingIterator.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/AggregatingIterator.java
similarity index 96%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/AggregatingIterator.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/AggregatingIterator.java
index b03a72cd..0a14f168 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/AggregatingIterator.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/AggregatingIterator.java
@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import io.github.linkedfactory.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.Kvin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import net.enilink.commons.iterator.NiceIterator;
 import net.enilink.commons.util.ValueUtils;
 import net.enilink.komma.core.URI;
-import io.github.linkedfactory.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.KvinTuple;
 
 /**
  * An iterator for KVIN tuples supporting a set of aggregation operators (min,
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/JsonFormatParser.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/JsonFormatParser.java
similarity index 97%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/JsonFormatParser.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/JsonFormatParser.java
index 3b6c7a23..79a44ff4 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/JsonFormatParser.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/JsonFormatParser.java
@@ -1,17 +1,16 @@
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonParser.Feature;
 import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.Record;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.Record;
 import net.enilink.commons.iterator.NiceIterator;
 import net.enilink.komma.core.URI;
 import net.enilink.komma.core.URIs;
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/JsonFormatWriter.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/JsonFormatWriter.java
similarity index 95%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/JsonFormatWriter.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/JsonFormatWriter.java
index 886c7036..20a18c2b 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/JsonFormatWriter.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/JsonFormatWriter.java
@@ -1,10 +1,10 @@
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.Record;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.Record;
 import net.enilink.commons.iterator.IExtendedIterator;
 import net.enilink.komma.core.URI;
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/Values.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/Values.java
similarity index 99%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/Values.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/Values.java
index 851bcd2f..1007c635 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/Values.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/Values.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
 import java.io.IOException;
 import java.math.BigDecimal;
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/Varint.java b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/Varint.java
similarity index 99%
rename from bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/Varint.java
rename to bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/Varint.java
index 2d30dcae..9d40b472 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/java/io/github/linkedfactory/kvin/util/Varint.java
+++ b/bundles/io.github.linkedfactory.core/src/main/java/io/github/linkedfactory/core/kvin/util/Varint.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
 import java.nio.ByteBuffer;
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/cli/CLI.scala b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/cli/CLI.scala
similarity index 95%
rename from bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/cli/CLI.scala
rename to bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/cli/CLI.scala
index c5eb49ea..64bace5d 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/cli/CLI.scala
+++ b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/cli/CLI.scala
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.cli
+package io.github.linkedfactory.core.kvin.cli
 
-import io.github.linkedfactory.kvin.Kvin
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb
+import io.github.linkedfactory.core.kvin.Kvin
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb
 
 import java.nio.file.{Files, Paths}
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/cli/Commands.scala b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/cli/Commands.scala
similarity index 96%
rename from bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/cli/Commands.scala
rename to bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/cli/Commands.scala
index 6d722d0b..df9e03b9 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/cli/Commands.scala
+++ b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/cli/Commands.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.cli
+package io.github.linkedfactory.core.kvin.cli
 
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple}
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple}
 import net.enilink.komma.core.URIs
 
 import scala.jdk.CollectionConverters._
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/influxdb/KvinInfluxDb.scala b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/influxdb/KvinInfluxDb.scala
similarity index 98%
rename from bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/influxdb/KvinInfluxDb.scala
rename to bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/influxdb/KvinInfluxDb.scala
index 35497b89..46c2f8b5 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/influxdb/KvinInfluxDb.scala
+++ b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/influxdb/KvinInfluxDb.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.influxdb
+package io.github.linkedfactory.core.kvin.influxdb
 
-import io.github.linkedfactory.kvin.{Kvin, KvinListener, KvinTuple}
+import io.github.linkedfactory.core.kvin.{Kvin, KvinListener, KvinTuple}
 import net.enilink.commons.iterator.{IExtendedIterator, NiceIterator, WrappedIterator}
 import net.enilink.komma.core.{URI, URIs}
 import org.influxdb.InfluxDBFactory
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinBenchmarkBase.scala b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinBenchmarkBase.scala
similarity index 96%
rename from bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinBenchmarkBase.scala
rename to bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinBenchmarkBase.scala
index 67a8e45c..9ddd593b 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinBenchmarkBase.scala
+++ b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinBenchmarkBase.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.leveldb
+package io.github.linkedfactory.core.kvin.leveldb
 
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple}
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple}
 import net.enilink.komma.core.URIs
 
 import scala.jdk.CollectionConverters._
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDb.scala b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDb.scala
similarity index 99%
rename from bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDb.scala
rename to bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDb.scala
index 65c15ed4..6c1667b7 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDb.scala
+++ b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDb.scala
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.leveldb
+package io.github.linkedfactory.core.kvin.leveldb
 
 import com.google.common.cache.{Cache, CacheBuilder}
 import com.google.common.util.concurrent.Striped
-import io.github.linkedfactory.kvin._
-import io.github.linkedfactory.kvin.util.{AggregatingIterator, Values, Varint}
+import io.github.linkedfactory.core.kvin._
+import io.github.linkedfactory.core.kvin.util.{AggregatingIterator, Values, Varint}
 import net.enilink.commons.iterator.{IExtendedIterator, NiceIterator, UniqueExtendedIterator, WrappedIterator}
 import net.enilink.komma.core.{URI, URIs}
 import org.iq80.leveldb.impl.Iq80DBFactory.{bytes, factory}
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDbArchiver.scala b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDbArchiver.scala
similarity index 95%
rename from bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDbArchiver.scala
rename to bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDbArchiver.scala
index 682c4925..279e3d78 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDbArchiver.scala
+++ b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDbArchiver.scala
@@ -1,7 +1,7 @@
-package io.github.linkedfactory.kvin.leveldb
+package io.github.linkedfactory.core.kvin.leveldb
 
-import io.github.linkedfactory.kvin.KvinTuple
-import io.github.linkedfactory.kvin.parquet.KvinParquet
+import io.github.linkedfactory.core.kvin.KvinTuple
+import io.github.linkedfactory.core.kvin.parquet.KvinParquet
 import net.enilink.commons.iterator.{IExtendedIterator, NiceIterator}
 import net.enilink.komma.core.{URI, URIs}
 import org.iq80.leveldb.{DB, DBIterator, ReadOptions, Snapshot}
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDbBase.scala b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDbBase.scala
similarity index 97%
rename from bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDbBase.scala
rename to bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDbBase.scala
index d0192b4d..0d0b827e 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDbBase.scala
+++ b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDbBase.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.leveldb
+package io.github.linkedfactory.core.kvin.leveldb
 
-import io.github.linkedfactory.kvin.util.Varint
+import io.github.linkedfactory.core.kvin.util.Varint
 import net.enilink.commons.iterator.NiceIterator
 import net.enilink.komma.core.URI
 import org.iq80.leveldb.{DB, DBIterator}
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDbBenchmark.scala b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDbBenchmark.scala
similarity index 94%
rename from bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDbBenchmark.scala
rename to bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDbBenchmark.scala
index 59e8759e..4a6cabea 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/KvinLevelDbBenchmark.scala
+++ b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/KvinLevelDbBenchmark.scala
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.leveldb
+package io.github.linkedfactory.core.kvin.leveldb
 
 import java.io.File
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/Utils.scala b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/Utils.scala
similarity index 95%
rename from bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/Utils.scala
rename to bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/Utils.scala
index c1fdefc3..25b8f03d 100644
--- a/bundles/io.github.linkedfactory.kvin/src/main/scala/io/github/linkedfactory/kvin/leveldb/Utils.scala
+++ b/bundles/io.github.linkedfactory.core/src/main/scala/io/github/linkedfactory/core/kvin/leveldb/Utils.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.leveldb
+package io.github.linkedfactory.core.kvin.leveldb
 
-import io.github.linkedfactory.kvin.KvinTuple
+import io.github.linkedfactory.core.kvin.KvinTuple
 
 import java.nio.ByteBuffer
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/parquet/KvinParquetTest.java b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/parquet/KvinParquetTest.java
similarity index 95%
rename from bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/parquet/KvinParquetTest.java
rename to bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/parquet/KvinParquetTest.java
index cdb393d3..db4665cc 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/parquet/KvinParquetTest.java
+++ b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/parquet/KvinParquetTest.java
@@ -1,8 +1,8 @@
-package io.github.linkedfactory.kvin.parquet;
+package io.github.linkedfactory.core.kvin.parquet;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.util.KvinTupleGenerator;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.util.KvinTupleGenerator;
 import net.enilink.commons.iterator.IExtendedIterator;
 import net.enilink.komma.core.URI;
 import net.enilink.komma.core.URIs;
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/partitioned/KvinPartitionedTest.java b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/partitioned/KvinPartitionedTest.java
similarity index 91%
rename from bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/partitioned/KvinPartitionedTest.java
rename to bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/partitioned/KvinPartitionedTest.java
index e392fd9c..cec76af1 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/partitioned/KvinPartitionedTest.java
+++ b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/partitioned/KvinPartitionedTest.java
@@ -1,9 +1,9 @@
-package io.github.linkedfactory.kvin.partitioned;
+package io.github.linkedfactory.core.kvin.partitioned;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDbArchiver;
-import io.github.linkedfactory.kvin.util.KvinTupleGenerator;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDbArchiver;
+import io.github.linkedfactory.core.kvin.util.KvinTupleGenerator;
 import net.enilink.commons.iterator.IExtendedIterator;
 import net.enilink.commons.iterator.NiceIterator;
 import net.enilink.komma.core.URI;
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/JsonFormatParserTest.java b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/JsonFormatParserTest.java
similarity index 86%
rename from bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/JsonFormatParserTest.java
rename to bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/JsonFormatParserTest.java
index 3a3e71d2..a6ba57db 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/JsonFormatParserTest.java
+++ b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/JsonFormatParserTest.java
@@ -13,21 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.Record;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.Record;
 import net.enilink.commons.iterator.IExtendedIterator;
-import net.enilink.komma.core.URIs;
 
 import org.junit.Test;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
-import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Arrays;
 
 import static org.junit.Assert.*;
 import static org.junit.Assert.fail;
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/JsonFormatWriterTest.java b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/JsonFormatWriterTest.java
similarity index 93%
rename from bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/JsonFormatWriterTest.java
rename to bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/JsonFormatWriterTest.java
index 92f2dfd4..496250ca 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/JsonFormatWriterTest.java
+++ b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/JsonFormatWriterTest.java
@@ -1,6 +1,6 @@
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
-import io.github.linkedfactory.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.KvinTuple;
 import net.enilink.commons.iterator.IExtendedIterator;
 import net.enilink.commons.iterator.WrappedIterator;
 import net.enilink.komma.core.URIs;
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/KvinTupleGenerator.java b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/KvinTupleGenerator.java
similarity index 94%
rename from bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/KvinTupleGenerator.java
rename to bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/KvinTupleGenerator.java
index 86af261d..8e2cf674 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/KvinTupleGenerator.java
+++ b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/KvinTupleGenerator.java
@@ -1,8 +1,8 @@
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.Record;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.Record;
 import net.enilink.commons.iterator.NiceIterator;
 import net.enilink.komma.core.URI;
 import net.enilink.komma.core.URIs;
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/RecordTest.java b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/RecordTest.java
similarity index 96%
rename from bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/RecordTest.java
rename to bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/RecordTest.java
index b6d03c2b..6db5d017 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/RecordTest.java
+++ b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/RecordTest.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
-import io.github.linkedfactory.kvin.Record;
+import io.github.linkedfactory.core.kvin.Record;
 import net.enilink.komma.core.URIs;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/VarintTest.java b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/VarintTest.java
similarity index 97%
rename from bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/VarintTest.java
rename to bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/VarintTest.java
index d0aaf3eb..39434ab3 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/java/io/github/linkedfactory/kvin/util/VarintTest.java
+++ b/bundles/io.github.linkedfactory.core/src/test/java/io/github/linkedfactory/core/kvin/util/VarintTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin.util;
+package io.github.linkedfactory.core.kvin.util;
 
 import org.junit.Test;
 
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/resources/JsonFormatParserTestContent.json b/bundles/io.github.linkedfactory.core/src/test/resources/JsonFormatParserTestContent.json
similarity index 100%
rename from bundles/io.github.linkedfactory.kvin/src/test/resources/JsonFormatParserTestContent.json
rename to bundles/io.github.linkedfactory.core/src/test/resources/JsonFormatParserTestContent.json
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/resources/log4j.properties b/bundles/io.github.linkedfactory.core/src/test/resources/log4j.properties
similarity index 100%
rename from bundles/io.github.linkedfactory.kvin/src/test/resources/log4j.properties
rename to bundles/io.github.linkedfactory.core/src/test/resources/log4j.properties
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinInfluxDbTest.scala b/bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinInfluxDbTest.scala
similarity index 97%
rename from bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinInfluxDbTest.scala
rename to bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinInfluxDbTest.scala
index ac7184f3..3ddc55c6 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinInfluxDbTest.scala
+++ b/bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinInfluxDbTest.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin
+package io.github.linkedfactory.core.kvin
 
-import io.github.linkedfactory.kvin.influxdb.KvinInfluxDb
+import io.github.linkedfactory.core.kvin.influxdb.KvinInfluxDb
 import net.enilink.komma.core.URIs
 import org.junit.Assert._
 import org.junit.runners.MethodSorters
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinLevelDbArchiverTest.scala b/bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinLevelDbArchiverTest.scala
similarity index 85%
rename from bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinLevelDbArchiverTest.scala
rename to bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinLevelDbArchiverTest.scala
index 8cd9b845..597de172 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinLevelDbArchiverTest.scala
+++ b/bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinLevelDbArchiverTest.scala
@@ -1,8 +1,8 @@
-package io.github.linkedfactory.kvin
+package io.github.linkedfactory.core.kvin
 
-import io.github.linkedfactory.kvin.leveldb.{KvinLevelDb, KvinLevelDbArchiver}
-import io.github.linkedfactory.kvin.parquet.KvinParquet
-import io.github.linkedfactory.kvin.util.KvinTupleGenerator
+import io.github.linkedfactory.core.kvin.leveldb.{KvinLevelDb, KvinLevelDbArchiver}
+import io.github.linkedfactory.core.kvin.parquet.KvinParquet
+import io.github.linkedfactory.core.kvin.util.KvinTupleGenerator
 import net.enilink.commons.iterator.NiceIterator
 import org.apache.commons.io.FileUtils
 import org.junit.Assert.assertTrue
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinLevelDbTest.scala b/bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinLevelDbTest.scala
similarity index 95%
rename from bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinLevelDbTest.scala
rename to bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinLevelDbTest.scala
index 81a2b9dc..a6edcef0 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinLevelDbTest.scala
+++ b/bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinLevelDbTest.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin
+package io.github.linkedfactory.core.kvin
 
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb
 import net.enilink.komma.core.URIs
 import org.junit.Assert._
 import org.junit.{After, Before, Test}
diff --git a/bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinTestBase.scala b/bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinTestBase.scala
similarity index 99%
rename from bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinTestBase.scala
rename to bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinTestBase.scala
index 5a44bc44..1b91df51 100644
--- a/bundles/io.github.linkedfactory.kvin/src/test/scala/io/github/linkedfactory/kvin/KvinTestBase.scala
+++ b/bundles/io.github.linkedfactory.core/src/test/scala/io/github/linkedfactory/core/kvin/KvinTestBase.scala
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin
+package io.github.linkedfactory.core.kvin
 
 import net.enilink.komma.core.URIs
 import org.junit.Assert._
diff --git a/bundles/io.github.linkedfactory.service/pom.xml b/bundles/io.github.linkedfactory.service/pom.xml
index 4e97db4c..cc72a471 100644
--- a/bundles/io.github.linkedfactory.service/pom.xml
+++ b/bundles/io.github.linkedfactory.service/pom.xml
@@ -26,7 +26,7 @@
 		</dependency>
 		<dependency>
 			<groupId>io.github.linkedfactory</groupId>
-			<artifactId>io.github.linkedfactory.kvin</artifactId>
+			<artifactId>io.github.linkedfactory.core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/Data.scala b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/Data.scala
index 4ce174a9..00ce61b5 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/Data.scala
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/Data.scala
@@ -16,7 +16,7 @@
 package io.github.linkedfactory.service
 
 import com.google.common.cache.CacheBuilder
-import io.github.linkedfactory.kvin.{Kvin, KvinListener}
+import io.github.linkedfactory.core.kvin.{Kvin, KvinListener}
 import io.github.linkedfactory.service.model.ssn._
 import io.github.linkedfactory.service.util.ResourceHelpers.withTransaction
 import net.enilink.komma.core._
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/KvinManager.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/KvinManager.java
index 1b887dad..2918ec25 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/KvinManager.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/KvinManager.java
@@ -1,20 +1,17 @@
 package io.github.linkedfactory.service;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb;
 import net.enilink.komma.core.URI;
 import net.enilink.komma.core.URIs;
 import net.enilink.komma.em.concepts.IResource;
 import net.enilink.platform.core.PluginConfigModel;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URISyntaxException;
-import java.nio.file.Files;
 import java.util.Hashtable;
 
 import org.eclipse.core.runtime.Platform;
-import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceRegistration;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/KvinService.scala b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/KvinService.scala
index 24a95b1b..5015a9bd 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/KvinService.scala
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/KvinService.scala
@@ -15,7 +15,7 @@
  */
 package io.github.linkedfactory.service
 
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple, Record}
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple, Record}
 import io.github.linkedfactory.service.util.{JsonFormatParser, LineProtocolParser}
 import net.enilink.commons.iterator.IExtendedIterator
 import net.enilink.komma.core.{URI, URIs}
@@ -238,7 +238,7 @@ class KvinService(path: List[String], store: Kvin) extends RestHelper with Logga
     if (parentUri.lastSegment != "") parentUri = parentUri.appendSegment("")
 
     try {
-      new io.github.linkedfactory.kvin.util.JsonFormatParser(in).parse().iterator().asScala
+      new io.github.linkedfactory.core.kvin.util.JsonFormatParser(in).parse().iterator().asScala
         .foreach { tuple =>
           publishEvent(tuple.item, tuple.property, tuple.time, tuple.value)
           store.put(tuple)
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/LiftModule.scala b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/LiftModule.scala
index 2b3c16ce..ecec4d3c 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/LiftModule.scala
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/LiftModule.scala
@@ -15,7 +15,7 @@
  */
 package io.github.linkedfactory.service
 
-import io.github.linkedfactory.kvin.Kvin
+import io.github.linkedfactory.core.kvin.Kvin
 import net.enilink.komma.core.{IReference, URI, URIs}
 import net.enilink.komma.em.concepts.IResource
 import net.enilink.platform.lift.LiftService
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/comet/StreamDataActor.scala b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/comet/StreamDataActor.scala
index c0fabcfb..389e08f6 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/comet/StreamDataActor.scala
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/comet/StreamDataActor.scala
@@ -15,7 +15,7 @@
  */
 package io.github.linkedfactory.service.comet
 
-import io.github.linkedfactory.kvin.{Kvin, KvinListener, KvinTuple}
+import io.github.linkedfactory.core.kvin.{Kvin, KvinListener, KvinTuple}
 import io.github.linkedfactory.service.Data
 import net.enilink.komma.core.{URI, URIs}
 import net.liftweb.common.Full
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/komma/KvinMemoryModelSet.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/komma/KvinMemoryModelSet.java
index 1c757110..e4f31913 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/komma/KvinMemoryModelSet.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/komma/KvinMemoryModelSet.java
@@ -1,7 +1,7 @@
 package io.github.linkedfactory.service.komma;
 
-import io.github.linkedfactory.kvin.DelegatingKvin;
-import io.github.linkedfactory.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.DelegatingKvin;
+import io.github.linkedfactory.core.kvin.Kvin;
 import io.github.linkedfactory.service.rdf4j.kvin.KvinSail;
 import net.enilink.composition.annotations.Iri;
 import net.enilink.komma.model.MODELS;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/FederatedServiceComponent.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/FederatedServiceComponent.java
index d1e5cb7d..1ee0be54 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/FederatedServiceComponent.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/FederatedServiceComponent.java
@@ -1,7 +1,7 @@
 package io.github.linkedfactory.service.rdf4j;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.http.KvinHttp;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.http.KvinHttp;
 import io.github.linkedfactory.service.rdf4j.aas.AasFederatedService;
 import io.github.linkedfactory.service.rdf4j.kvin.KvinFederatedService;
 import io.github.linkedfactory.service.rdf4j.kvin.functions.DateTimeFunction;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/AAS.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/AAS.java
index d6bd394c..ac15eb53 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/AAS.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/AAS.java
@@ -1,6 +1,6 @@
 package io.github.linkedfactory.service.rdf4j.aas;
 
-import io.github.linkedfactory.kvin.Record;
+import io.github.linkedfactory.core.kvin.Record;
 import io.github.linkedfactory.service.rdf4j.common.Conversions;
 import io.github.linkedfactory.service.rdf4j.common.IRIWithValue;
 import net.enilink.komma.core.URIs;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/AasClient.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/AasClient.java
index e3019b01..5c02d3e0 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/AasClient.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/AasClient.java
@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.github.linkedfactory.kvin.Record;
+import io.github.linkedfactory.core.kvin.Record;
 import net.enilink.commons.iterator.IExtendedIterator;
 import net.enilink.commons.iterator.NiceIterator;
 import net.enilink.commons.iterator.WrappedIterator;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/query/AasEvaluationStrategy.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/query/AasEvaluationStrategy.java
index 770e296c..b5636920 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/query/AasEvaluationStrategy.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/aas/query/AasEvaluationStrategy.java
@@ -1,6 +1,6 @@
 package io.github.linkedfactory.service.rdf4j.aas.query;
 
-import io.github.linkedfactory.kvin.Record;
+import io.github.linkedfactory.core.kvin.Record;
 import io.github.linkedfactory.service.rdf4j.aas.AAS;
 import io.github.linkedfactory.service.rdf4j.aas.AasClient;
 import io.github.linkedfactory.service.rdf4j.common.HasValue;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/common/Conversions.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/common/Conversions.java
index 3db8fc68..65414bf4 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/common/Conversions.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/common/Conversions.java
@@ -1,6 +1,6 @@
 package io.github.linkedfactory.service.rdf4j.common;
 
-import io.github.linkedfactory.kvin.Record;
+import io.github.linkedfactory.core.kvin.Record;
 import net.enilink.komma.core.URI;
 import org.eclipse.rdf4j.model.Literal;
 import org.eclipse.rdf4j.model.Value;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinConnection.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinConnection.java
index 056a5bfa..0760ed3c 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinConnection.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinConnection.java
@@ -1,9 +1,8 @@
 package io.github.linkedfactory.service.rdf4j.kvin;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.Record;
-import io.github.linkedfactory.service.rdf4j.common.BNodeWithValue;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.Record;
 import io.github.linkedfactory.service.rdf4j.common.HasValue;
 import net.enilink.commons.iterator.WrappedIterator;
 import net.enilink.komma.core.ILiteral;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinEvaluationStrategy.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinEvaluationStrategy.java
index 1ceae5ee..47f74165 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinEvaluationStrategy.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinEvaluationStrategy.java
@@ -1,9 +1,8 @@
 package io.github.linkedfactory.service.rdf4j.kvin;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.Record;
-import io.github.linkedfactory.service.rdf4j.common.BNodeWithValue;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.Record;
 import io.github.linkedfactory.service.rdf4j.common.HasValue;
 import io.github.linkedfactory.service.rdf4j.common.query.CompositeBindingSet;
 import io.github.linkedfactory.service.rdf4j.common.query.InnerJoinIterator;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinEvaluationUtil.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinEvaluationUtil.java
index 9fbf08ff..0ed53aa1 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinEvaluationUtil.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinEvaluationUtil.java
@@ -1,7 +1,7 @@
 package io.github.linkedfactory.service.rdf4j.kvin;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.KvinTuple;
 import io.github.linkedfactory.service.rdf4j.common.BNodeWithValue;
 import io.github.linkedfactory.service.rdf4j.common.query.CompositeBindingSet;
 import io.github.linkedfactory.service.rdf4j.kvin.query.Parameters;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinFederatedService.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinFederatedService.java
index f96de404..f75fc502 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinFederatedService.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinFederatedService.java
@@ -1,6 +1,6 @@
 package io.github.linkedfactory.service.rdf4j.kvin;
 
-import io.github.linkedfactory.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.Kvin;
 import io.github.linkedfactory.service.rdf4j.common.query.CompositeBindingSet;
 import io.github.linkedfactory.service.rdf4j.kvin.query.KvinFetchOptimizer;
 import io.github.linkedfactory.service.rdf4j.kvin.query.ParameterScanner;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinSail.java b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinSail.java
index cbd99ebb..5c8f108d 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinSail.java
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinSail.java
@@ -1,6 +1,6 @@
 package io.github.linkedfactory.service.rdf4j.kvin;
 
-import io.github.linkedfactory.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.Kvin;
 import net.enilink.komma.core.KommaModule;
 import net.enilink.komma.em.ManagerCompositionModule;
 import net.enilink.komma.literals.LiteralConverter;
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/util/JsonFormatParser.scala b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/util/JsonFormatParser.scala
index 9f8283a0..66f0aaf9 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/util/JsonFormatParser.scala
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/util/JsonFormatParser.scala
@@ -15,7 +15,7 @@
  */
 package io.github.linkedfactory.service.util
 
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple, Record}
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple, Record}
 import net.enilink.komma.core.{URI, URIs}
 import net.liftweb.common.Box.box2Iterable
 import net.liftweb.common._
diff --git a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/util/LineProtocolParser.scala b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/util/LineProtocolParser.scala
index 663fe9de..4061c2aa 100644
--- a/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/util/LineProtocolParser.scala
+++ b/bundles/io.github.linkedfactory.service/src/main/scala/io/github/linkedfactory/service/util/LineProtocolParser.scala
@@ -15,8 +15,8 @@
  */
 package io.github.linkedfactory.service.util
 
-import io.github.linkedfactory.kvin.Kvin
-import io.github.linkedfactory.kvin.KvinTuple
+import io.github.linkedfactory.core.kvin.Kvin
+import io.github.linkedfactory.core.kvin.KvinTuple
 
 import java.io.BufferedReader
 import java.io.InputStream
diff --git a/bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/kvin/KvinHttpTest.java b/bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/core/kvin/KvinHttpTest.java
similarity index 99%
rename from bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/kvin/KvinHttpTest.java
rename to bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/core/kvin/KvinHttpTest.java
index a9fafa81..46a19334 100644
--- a/bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/kvin/KvinHttpTest.java
+++ b/bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/core/kvin/KvinHttpTest.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.github.linkedfactory.kvin;
+package io.github.linkedfactory.core.kvin;
 
 import com.google.inject.Guice;
-import io.github.linkedfactory.kvin.http.KvinHttp;
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb;
-import io.github.linkedfactory.kvin.util.JsonFormatParser;
+import io.github.linkedfactory.core.kvin.http.KvinHttp;
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb;
+import io.github.linkedfactory.core.kvin.util.JsonFormatParser;
 import io.github.linkedfactory.service.KvinService;
 import io.github.linkedfactory.service.KvinServiceTestBase;
 import io.github.linkedfactory.service.MockHttpServletRequest;
diff --git a/bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/kvin/parquet/benchmark/KvinParquetBenchmark.java b/bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/core/kvin/parquet/benchmark/KvinParquetBenchmark.java
similarity index 98%
rename from bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/kvin/parquet/benchmark/KvinParquetBenchmark.java
rename to bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/core/kvin/parquet/benchmark/KvinParquetBenchmark.java
index 1b8dfc67..551da94c 100644
--- a/bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/kvin/parquet/benchmark/KvinParquetBenchmark.java
+++ b/bundles/io.github.linkedfactory.service/src/test/java/io/github/linkedfactory/core/kvin/parquet/benchmark/KvinParquetBenchmark.java
@@ -1,9 +1,9 @@
-package io.github.linkedfactory.kvin.parquet.benchmark;
+package io.github.linkedfactory.core.kvin.parquet.benchmark;
 
-import io.github.linkedfactory.kvin.Kvin;
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb;
-import io.github.linkedfactory.kvin.KvinTuple;
-import io.github.linkedfactory.kvin.parquet.KvinParquet;
+import io.github.linkedfactory.core.kvin.Kvin;
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb;
+import io.github.linkedfactory.core.kvin.KvinTuple;
+import io.github.linkedfactory.core.kvin.parquet.KvinParquet;
 import io.github.linkedfactory.service.rdf4j.kvin.KvinFederatedService;
 import net.enilink.commons.iterator.IExtendedIterator;
 import net.enilink.commons.iterator.NiceIterator;
diff --git a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/KvinServiceTest.scala b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/KvinServiceTest.scala
index da8320b9..5b4a0e32 100644
--- a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/KvinServiceTest.scala
+++ b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/KvinServiceTest.scala
@@ -2,9 +2,9 @@ package io.github.linkedfactory.service
 
 import com.fasterxml.jackson.databind.{JsonNode, ObjectMapper}
 import com.google.inject.Guice
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple}
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb
-import io.github.linkedfactory.kvin.util.JsonFormatParser
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple}
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb
+import io.github.linkedfactory.core.kvin.util.JsonFormatParser
 import net.enilink.commons.iterator.NiceIterator
 import net.enilink.komma.core.{KommaModule, URI}
 import net.enilink.komma.model._
diff --git a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/KvinServiceTestBase.scala b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/KvinServiceTestBase.scala
index 15e8b26a..826057d2 100644
--- a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/KvinServiceTestBase.scala
+++ b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/KvinServiceTestBase.scala
@@ -1,7 +1,7 @@
 package io.github.linkedfactory.service
 
-import io.github.linkedfactory.kvin.KvinTuple
-import io.github.linkedfactory.kvin.util.JsonFormatWriter
+import io.github.linkedfactory.core.kvin.KvinTuple
+import io.github.linkedfactory.core.kvin.util.JsonFormatWriter
 import net.enilink.commons.iterator.WrappedIterator
 import net.enilink.komma.core.URIs
 
diff --git a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/benchmark/KvinServiceBenchmark.scala b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/benchmark/KvinServiceBenchmark.scala
index fce9356f..433ccdd8 100644
--- a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/benchmark/KvinServiceBenchmark.scala
+++ b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/benchmark/KvinServiceBenchmark.scala
@@ -1,9 +1,9 @@
 package io.github.linkedfactory.service.benchmark
 
 import com.google.inject.Guice
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb
-import io.github.linkedfactory.kvin.util.JsonFormatWriter
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple}
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb
+import io.github.linkedfactory.core.kvin.util.JsonFormatWriter
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple}
 import io.github.linkedfactory.service.{KvinService, MockHttpServletRequest}
 import net.enilink.commons.iterator.WrappedIterator
 import net.enilink.komma.core.{KommaModule, URI, URIs}
diff --git a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/aas/ServiceTest.java b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/aas/ServiceTest.java
index 35e642f9..150d5e6d 100644
--- a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/aas/ServiceTest.java
+++ b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/aas/ServiceTest.java
@@ -12,10 +12,12 @@
 import org.eclipse.rdf4j.sail.memory.MemoryStore;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
 
+@Ignore
 public class ServiceTest {
 	private Repository repository;
 
diff --git a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinSailTest.scala b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinSailTest.scala
index 6cb836a5..503759cf 100644
--- a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinSailTest.scala
+++ b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/KvinSailTest.scala
@@ -15,8 +15,8 @@
  */
 package io.github.linkedfactory.service.rdf4j.kvin
 
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple}
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple}
 import net.enilink.komma.core.URIs
 import org.eclipse.rdf4j.query.algebra.evaluation.federation.AbstractFederatedServiceResolver
 import org.eclipse.rdf4j.repository.Repository
diff --git a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/RemoteServiceTest.scala b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/RemoteServiceTest.scala
index 70d1be68..8cc90ef1 100644
--- a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/RemoteServiceTest.scala
+++ b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/RemoteServiceTest.scala
@@ -15,10 +15,10 @@
  */
 package io.github.linkedfactory.service.rdf4j.kvin
 
-import io.github.linkedfactory.kvin.http.KvinHttp
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb
-import io.github.linkedfactory.kvin.util.JsonFormatParser
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple}
+import io.github.linkedfactory.core.kvin.http.KvinHttp
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb
+import io.github.linkedfactory.core.kvin.util.JsonFormatParser
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple}
 import io.github.linkedfactory.service.rdf4j.kvin.KvinFederatedService
 import net.enilink.commons.iterator.IExtendedIterator
 import net.enilink.komma.core.{URI, URIs}
diff --git a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/ServiceTest.scala b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/ServiceTest.scala
index a64c37fd..080aa1ca 100644
--- a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/ServiceTest.scala
+++ b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/rdf4j/kvin/ServiceTest.scala
@@ -15,8 +15,8 @@
  */
 package io.github.linkedfactory.service.rdf4j.kvin
 
-import io.github.linkedfactory.kvin.leveldb.KvinLevelDb
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple, Record}
+import io.github.linkedfactory.core.kvin.leveldb.KvinLevelDb
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple, Record}
 import net.enilink.komma.core.URIs
 import net.enilink.vocab.rdf.RDF
 import org.eclipse.rdf4j.model.Literal
diff --git a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/test/JsonFormatParserTest.scala b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/test/JsonFormatParserTest.scala
index f0604533..2b40463f 100644
--- a/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/test/JsonFormatParserTest.scala
+++ b/bundles/io.github.linkedfactory.service/src/test/scala/io/github/linkedfactory/service/test/JsonFormatParserTest.scala
@@ -15,7 +15,7 @@
  */
 package io.github.linkedfactory.service.test
 
-import io.github.linkedfactory.kvin.{Kvin, KvinTuple, Record}
+import io.github.linkedfactory.core.kvin.{Kvin, KvinTuple, Record}
 import io.github.linkedfactory.service.util.JsonFormatParser
 import net.enilink.komma.core.URIs
 import net.liftweb.common.Full
diff --git a/pom.xml b/pom.xml
index e1dfda06..f6b48ceb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -289,7 +289,7 @@
 	</distributionManagement>
 
 	<modules>
-		<module>bundles/io.github.linkedfactory.kvin</module>
+		<module>bundles/io.github.linkedfactory.core</module>
 		<module>bundles/io.github.linkedfactory.service</module>
 		<module>bundles/io.github.linkedfactory.opcua</module>
 	</modules>