diff --git a/src/main/java/it/tdlight/reactiveapi/AtomixReactiveApi.java b/src/main/java/it/tdlight/reactiveapi/AtomixReactiveApi.java
index 1639a48..cf95b61 100644
--- a/src/main/java/it/tdlight/reactiveapi/AtomixReactiveApi.java
+++ b/src/main/java/it/tdlight/reactiveapi/AtomixReactiveApi.java
@@ -31,6 +31,7 @@ import java.util.concurrent.CompletionException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -356,7 +357,7 @@ public class AtomixReactiveApi implements ReactiveApi {
 											})
 											.subscribeOn(Schedulers.boundedElastic())
 											.flatMap(baseSessionsPath -> {
-												String diskSessionFolderName = Long.toUnsignedString(userId);
+												String diskSessionFolderName = "id" + Long.toUnsignedString(userId);
 												Path sessionPath = baseSessionsPath.resolve(diskSessionFolderName);
 
 												if (!loadedFromDisk) {
diff --git a/src/main/java/it/tdlight/reactiveapi/ReactiveApiPublisher.java b/src/main/java/it/tdlight/reactiveapi/ReactiveApiPublisher.java
index 308b17d..7f0a1b1 100644
--- a/src/main/java/it/tdlight/reactiveapi/ReactiveApiPublisher.java
+++ b/src/main/java/it/tdlight/reactiveapi/ReactiveApiPublisher.java
@@ -326,10 +326,10 @@ public abstract class ReactiveApiPublisher {
 	private TdlibParameters generateTDLibParameters() {
 		var tdlibParameters = new TdlibParameters();
 		var path = requireNonNull(this.path.get(), "Path must not be null");
-		tdlibParameters.databaseDirectory = path.resolve("database").toString();
+		tdlibParameters.databaseDirectory = path.toString();
 		tdlibParameters.apiId = 94575;
 		tdlibParameters.apiHash = "a3406de8d171bb422bb6ddf3bbd800e2";
-		tdlibParameters.filesDirectory = path.resolve("files").toString();
+		tdlibParameters.filesDirectory = path.resolve("user_storage").toString();
 		tdlibParameters.applicationVersion = it.tdlight.reactiveapi.generated.LibraryVersion.VERSION;
 		tdlibParameters.deviceModel = System.getProperty("os.name");
 		tdlibParameters.systemVersion = System.getProperty("os.version");