diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/api/DhfsObjectGrpcService.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/api/DhfsObjectGrpcService.java
similarity index 93%
rename from server/src/main/java/com/usatiuk/dhfs/storage/api/DhfsObjectGrpcService.java
rename to server/src/main/java/com/usatiuk/dhfs/storage/objects/api/DhfsObjectGrpcService.java
index 889941a9..40535493 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/api/DhfsObjectGrpcService.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/api/DhfsObjectGrpcService.java
@@ -1,7 +1,8 @@
-package com.usatiuk.dhfs.storage.api;
+package com.usatiuk.dhfs.storage.objects.api;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.storage.repository.ObjectRepository;
+import com.usatiuk.dhfs.storage.api.*;
+import com.usatiuk.dhfs.storage.objects.repository.ObjectRepository;
 import io.quarkus.grpc.GrpcService;
 import io.smallrye.mutiny.Uni;
 import jakarta.inject.Inject;
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/data/Namespace.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Namespace.java
similarity index 78%
rename from server/src/main/java/com/usatiuk/dhfs/storage/data/Namespace.java
rename to server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Namespace.java
index 5484c00a..b83b1f0c 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/data/Namespace.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Namespace.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.storage.data;
+package com.usatiuk.dhfs.storage.objects.data;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/data/Object.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Object.java
similarity index 83%
rename from server/src/main/java/com/usatiuk/dhfs/storage/data/Object.java
rename to server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Object.java
index 7c4cc58d..6c2266ef 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/data/Object.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/data/Object.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.storage.data;
+package com.usatiuk.dhfs.storage.objects.data;
 
 import lombok.Getter;
 import lombok.Setter;
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/repository/ObjectRepository.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/ObjectRepository.java
similarity index 85%
rename from server/src/main/java/com/usatiuk/dhfs/storage/repository/ObjectRepository.java
rename to server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/ObjectRepository.java
index dd8f2955..28cf6a79 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/repository/ObjectRepository.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/ObjectRepository.java
@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.storage.repository;
+package com.usatiuk.dhfs.storage.objects.repository;
 
-import com.usatiuk.dhfs.storage.data.Object;
+import com.usatiuk.dhfs.storage.objects.data.Object;
 import io.smallrye.mutiny.Multi;
 import io.smallrye.mutiny.Uni;
 
diff --git a/server/src/main/java/com/usatiuk/dhfs/storage/repository/SimpleFileObjectRepository.java b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/SimpleFileObjectRepository.java
similarity index 95%
rename from server/src/main/java/com/usatiuk/dhfs/storage/repository/SimpleFileObjectRepository.java
rename to server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/SimpleFileObjectRepository.java
index 8c636198..fefecdc8 100644
--- a/server/src/main/java/com/usatiuk/dhfs/storage/repository/SimpleFileObjectRepository.java
+++ b/server/src/main/java/com/usatiuk/dhfs/storage/objects/repository/SimpleFileObjectRepository.java
@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.storage.repository;
+package com.usatiuk.dhfs.storage.objects.repository;
 
-import com.usatiuk.dhfs.storage.data.Namespace;
-import com.usatiuk.dhfs.storage.data.Object;
+import com.usatiuk.dhfs.storage.objects.data.Namespace;
+import com.usatiuk.dhfs.storage.objects.data.Object;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.quarkus.logging.Log;
diff --git a/server/src/main/proto/dhfs_objects.proto b/server/src/main/proto/dhfs_objects.proto
index a12a0b85..b22a3136 100644
--- a/server/src/main/proto/dhfs_objects.proto
+++ b/server/src/main/proto/dhfs_objects.proto
@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "com.usatiuk.dhfs.storage.api";
+option java_package = "com.usatiuk.dhfs.storage.objects.api";
 option java_outer_classname = "DhfsStorageApi";
 
 package hello;