diff --git a/src/main/java/it/cavallium/dbengine/database/remote/DatabasePartName.java b/src/main/java/it/cavallium/dbengine/database/server/DatabasePartName.java
similarity index 71%
rename from src/main/java/it/cavallium/dbengine/database/remote/DatabasePartName.java
rename to src/main/java/it/cavallium/dbengine/database/server/DatabasePartName.java
index e666273..6ff59a8 100644
--- a/src/main/java/it/cavallium/dbengine/database/remote/DatabasePartName.java
+++ b/src/main/java/it/cavallium/dbengine/database/server/DatabasePartName.java
@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.remote;
+package it.cavallium.dbengine.database.server;
 
 import it.unimi.dsi.fastutil.bytes.ByteList;
 
diff --git a/src/main/java/it/cavallium/dbengine/database/remote/QuicRPCServer.java b/src/main/java/it/cavallium/dbengine/database/server/QuicRPCServer.java
similarity index 96%
rename from src/main/java/it/cavallium/dbengine/database/remote/QuicRPCServer.java
rename to src/main/java/it/cavallium/dbengine/database/server/QuicRPCServer.java
index a9dd106..eabcc13 100644
--- a/src/main/java/it/cavallium/dbengine/database/remote/QuicRPCServer.java
+++ b/src/main/java/it/cavallium/dbengine/database/server/QuicRPCServer.java
@@ -1,9 +1,8 @@
-package it.cavallium.dbengine.database.remote;
+package it.cavallium.dbengine.database.server;
 
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
 import io.netty5.buffer.api.Buffer;
 import io.netty5.buffer.api.DefaultBufferAllocators;
-import io.netty5.buffer.api.Send;
 import io.netty.handler.ssl.ClientAuth;
 import io.netty.incubator.codec.quic.InsecureQuicTokenHandler;
 import io.netty.incubator.codec.quic.QuicConnectionIdGenerator;
@@ -13,8 +12,11 @@ import it.cavallium.dbengine.database.LLDatabaseConnection;
 import it.cavallium.dbengine.database.LLKeyValueDatabase;
 import it.cavallium.dbengine.database.LLLuceneIndex;
 import it.cavallium.dbengine.database.LLSingleton;
+import it.cavallium.dbengine.database.disk.BinarySerializationFunction;
 import it.cavallium.dbengine.database.disk.LLLocalDatabaseConnection;
+import it.cavallium.dbengine.database.remote.QuicUtils;
 import it.cavallium.dbengine.database.remote.RPCCodecs.RPCEventCodec;
+import it.cavallium.dbengine.database.serialization.SerializationException;
 import it.cavallium.dbengine.lucene.LuceneRocksDBManager;
 import it.cavallium.dbengine.rpc.current.data.Binary;
 import it.cavallium.dbengine.rpc.current.data.BinaryOptional;
@@ -184,7 +186,9 @@ public class QuicRPCServer {
 					Many<RPCEvent> clientBound = Sinks.many().unicast().onBackpressureBuffer();
 					Mono<RPCEvent> update = singleton.update(prev -> {
 						clientBound
-								.tryEmitNext(new SingletonUpdateOldData(prev != null, prev != null ? toByteList(prev) : ByteList.of()))
+								.tryEmitNext(new SingletonUpdateOldData(prev != null,
+										prev != null ? toByteList(prev) : ByteList.of()
+								))
 								.orThrow();
 						SingletonUpdateEnd newValue = (SingletonUpdateEnd) otherRequests.singleOrEmpty().block();
 						Objects.requireNonNull(newValue);
diff --git a/src/main/java/it/cavallium/dbengine/database/remote/ReferencedResource.java b/src/main/java/it/cavallium/dbengine/database/server/ReferencedResource.java
similarity index 59%
rename from src/main/java/it/cavallium/dbengine/database/remote/ReferencedResource.java
rename to src/main/java/it/cavallium/dbengine/database/server/ReferencedResource.java
index 3d738bc..a36e7eb 100644
--- a/src/main/java/it/cavallium/dbengine/database/remote/ReferencedResource.java
+++ b/src/main/java/it/cavallium/dbengine/database/server/ReferencedResource.java
@@ -1,3 +1,3 @@
-package it.cavallium.dbengine.database.remote;
+package it.cavallium.dbengine.database.server;
 
 public record ReferencedResource<T>(Long reference, T resource) {}
diff --git a/src/main/java/it/cavallium/dbengine/database/remote/ReferencedResources.java b/src/main/java/it/cavallium/dbengine/database/server/ReferencedResources.java
similarity index 98%
rename from src/main/java/it/cavallium/dbengine/database/remote/ReferencedResources.java
rename to src/main/java/it/cavallium/dbengine/database/server/ReferencedResources.java
index ab87960..8944230 100644
--- a/src/main/java/it/cavallium/dbengine/database/remote/ReferencedResources.java
+++ b/src/main/java/it/cavallium/dbengine/database/server/ReferencedResources.java
@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.remote;
+package it.cavallium.dbengine.database.server;
 
 import java.util.NoSuchElementException;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/src/main/java/it/cavallium/dbengine/database/remote/ResourceFreer.java b/src/main/java/it/cavallium/dbengine/database/server/ResourceFreer.java
similarity index 69%
rename from src/main/java/it/cavallium/dbengine/database/remote/ResourceFreer.java
rename to src/main/java/it/cavallium/dbengine/database/server/ResourceFreer.java
index c355ac0..d622ce7 100644
--- a/src/main/java/it/cavallium/dbengine/database/remote/ResourceFreer.java
+++ b/src/main/java/it/cavallium/dbengine/database/server/ResourceFreer.java
@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.remote;
+package it.cavallium.dbengine.database.server;
 
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/it/cavallium/dbengine/database/remote/ResourceGetter.java b/src/main/java/it/cavallium/dbengine/database/server/ResourceGetter.java
similarity index 74%
rename from src/main/java/it/cavallium/dbengine/database/remote/ResourceGetter.java
rename to src/main/java/it/cavallium/dbengine/database/server/ResourceGetter.java
index 201eca0..8f33aa3 100644
--- a/src/main/java/it/cavallium/dbengine/database/remote/ResourceGetter.java
+++ b/src/main/java/it/cavallium/dbengine/database/server/ResourceGetter.java
@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.remote;
+package it.cavallium.dbengine.database.server;
 
 import reactor.core.publisher.Mono;
 
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..dd939a9
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,16 @@
+module dbengine.server {
+	requires it.unimi.dsi.fastutil;
+	requires org.apache.logging.log4j;
+	requires reactor.netty.incubator.quic;
+	requires reactor.netty.core;
+	requires dbengine;
+	requires java.logging;
+	requires reactor.core;
+	requires org.reactivestreams;
+	requires micrometer.core;
+	requires io.netty5.buffer;
+	requires org.jetbrains.annotations;
+	requires io.netty.incubator.codec.classes.quic;
+	requires io.netty.handler;
+
+}
\ No newline at end of file
diff --git a/src/test/java/it/cavallium/dbengine/database/remote/LLQuicConnectionTest.java b/src/test/java/it/cavallium/dbengine/database/server/LLQuicConnectionTest.java
similarity index 82%
rename from src/test/java/it/cavallium/dbengine/database/remote/LLQuicConnectionTest.java
rename to src/test/java/it/cavallium/dbengine/database/server/LLQuicConnectionTest.java
index e2ce781..c2254a4 100644
--- a/src/test/java/it/cavallium/dbengine/database/remote/LLQuicConnectionTest.java
+++ b/src/test/java/it/cavallium/dbengine/database/server/LLQuicConnectionTest.java
@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.remote;
+package it.cavallium.dbengine.database.server;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -9,18 +9,14 @@ import io.netty5.buffer.api.DefaultBufferAllocators;
 import it.cavallium.data.generator.nativedata.Nullableboolean;
 import it.cavallium.data.generator.nativedata.Nullabledouble;
 import it.cavallium.data.generator.nativedata.Nullableint;
-import it.cavallium.data.generator.nativedata.Nullablelong;
+import it.cavallium.dbengine.client.DefaultDatabaseOptions;
 import it.cavallium.dbengine.client.IndicizerAnalyzers;
 import it.cavallium.dbengine.client.IndicizerSimilarities;
 import it.cavallium.dbengine.database.ColumnUtils;
 import it.cavallium.dbengine.database.LLDatabaseConnection;
 import it.cavallium.dbengine.lucene.LuceneUtils;
 import it.cavallium.dbengine.rpc.current.data.ByteBuffersDirectory;
-import it.cavallium.dbengine.rpc.current.data.DatabaseOptions;
-import it.cavallium.dbengine.rpc.current.data.LuceneIndexStructure;
 import it.cavallium.dbengine.rpc.current.data.LuceneOptions;
-import it.cavallium.dbengine.rpc.current.data.nullables.NullableFilter;
-import it.unimi.dsi.fastutil.ints.IntList;
 import java.time.Duration;
 import java.util.List;
 import java.util.Map;
@@ -70,22 +66,7 @@ public class LLQuicConnectionTest {
 		var singletonsColumnName = "singletons";
 		var db = client.getDatabase(dbName,
 				List.of(ColumnUtils.special(singletonsColumnName)),
-				new DatabaseOptions(List.of(),
-						List.of(),
-						Map.of(),
-						true,
-						true,
-						true,
-						true,
-						true,
-						true,
-						Nullableint.empty(),
-						Nullablelong.empty(),
-						Nullablelong.empty(),
-						Nullableboolean.empty(),
-						false,
-						NullableFilter.empty()
-				)
+				DefaultDatabaseOptions.DEFAULT_DATABASE_OPTIONS
 		).blockOptional().orElseThrow();
 		assertEquals(dbName, db.getDatabaseName());
 		assertEquals(allocator, db.getAllocator());
diff --git a/src/test/java/it/cavallium/dbengine/database/remote/TestDbClient.java b/src/test/java/it/cavallium/dbengine/database/server/TestDbClient.java
similarity index 80%
rename from src/test/java/it/cavallium/dbengine/database/remote/TestDbClient.java
rename to src/test/java/it/cavallium/dbengine/database/server/TestDbClient.java
index 3112ae9..fbb4d8b 100644
--- a/src/test/java/it/cavallium/dbengine/database/remote/TestDbClient.java
+++ b/src/test/java/it/cavallium/dbengine/database/server/TestDbClient.java
@@ -1,7 +1,8 @@
-package it.cavallium.dbengine.database.remote;
+package it.cavallium.dbengine.database.server;
 
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
 import io.netty5.buffer.api.BufferAllocator;
+import it.cavallium.dbengine.database.remote.LLQuicConnection;
 import java.net.InetSocketAddress;
 
 public class TestDbClient {
diff --git a/src/test/java/it/cavallium/dbengine/database/remote/TestDbServer.java b/src/test/java/it/cavallium/dbengine/database/server/TestDbServer.java
similarity index 98%
rename from src/test/java/it/cavallium/dbengine/database/remote/TestDbServer.java
rename to src/test/java/it/cavallium/dbengine/database/server/TestDbServer.java
index 593c4d0..6c4ba4c 100644
--- a/src/test/java/it/cavallium/dbengine/database/remote/TestDbServer.java
+++ b/src/test/java/it/cavallium/dbengine/database/server/TestDbServer.java
@@ -1,4 +1,4 @@
-package it.cavallium.dbengine.database.remote;
+package it.cavallium.dbengine.database.server;
 
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
 import io.netty5.buffer.api.BufferAllocator;