Server: move server outside objects

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ConflictResolver.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
 public interface ConflictResolver {
     void resolve(PeerId fromPeer, RemoteObjectMeta ours, RemoteObjectMeta theirs);

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java

@@ -1,5 +1,7 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
+import com.usatiuk.dhfs.objects.JData;
+import com.usatiuk.dhfs.objects.JObjectKey;
 import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java

@@ -1,6 +1,7 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.jmap.JMapRef;
+import com.usatiuk.dhfs.jmap.JMapRef;
+import com.usatiuk.dhfs.objects.JObjectKey;
 
 public record JDataNormalRef(JObjectKey obj) implements JDataRef {
     @Override

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRef.java

@@ -1,4 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
+
+import com.usatiuk.dhfs.objects.JObjectKey;
 
 import java.io.Serializable;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java

@@ -1,5 +1,7 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
+import com.usatiuk.dhfs.objects.JData;
+import com.usatiuk.dhfs.objects.JObjectKey;
 import org.pcollections.PCollection;
 
 import java.util.Collection;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JDataRemote.java

@@ -1,6 +1,7 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 
 import java.io.Serializable;
 import java.util.Collection;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/JObjectKeyProtoSerializer.java

@@ -1,7 +1,8 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
+import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.dhfs.persistence.JObjectKeyP;
 import jakarta.inject.Singleton;
 
 @Singleton

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/PeerId.java

@@ -1,4 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
+
+import com.usatiuk.dhfs.objects.JObjectKey;
 
 import java.io.Serializable;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/ReceivedObject.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 import org.pcollections.PMap;
 
 public record ReceivedObject(PMap<PeerId, Long> changelog, JDataRemoteDto data) {

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java

@@ -1,5 +1,7 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
+import com.usatiuk.dhfs.objects.JData;
+import com.usatiuk.dhfs.objects.JObjectKey;
 import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java

@@ -1,7 +1,9 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData;
-import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData;
+import com.usatiuk.dhfs.objects.JData;
+import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
 import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import jakarta.enterprise.context.ApplicationScoped;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java

@@ -1,5 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
+import com.usatiuk.dhfs.objects.JObjectKey;
 import org.pcollections.HashTreePSet;
 import org.pcollections.PCollection;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java

@@ -1,9 +1,10 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.repository.AutosyncProcessor;
-import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.AutosyncProcessor;
+import com.usatiuk.dhfs.repository.RemoteObjectServiceClient;
+import com.usatiuk.dhfs.repository.peersync.PeerInfo;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;
 import com.usatiuk.dhfs.utils.HashSetDelayedBlockingQueue;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java

@@ -1,5 +1,6 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
+import com.usatiuk.dhfs.objects.JObjectKey;
 import org.pcollections.*;
 
 import java.util.Collection;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java

@@ -1,8 +1,9 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient;
-import com.usatiuk.dhfs.objects.repository.SyncHandler;
+import com.usatiuk.dhfs.objects.JObjectKey;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.RemoteObjectServiceClient;
+import com.usatiuk.dhfs.repository.SyncHandler;
 import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/TemporaryOpSerializer.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects;
+package com.usatiuk.dhfs;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import com.usatiuk.dhfs.objects.repository.OpP;
-import com.usatiuk.dhfs.objects.repository.invalidation.Op;
+import com.usatiuk.dhfs.repository.OpP;
+import com.usatiuk.dhfs.repository.invalidation.Op;
 import com.usatiuk.dhfs.utils.SerializationHelper;
 import jakarta.inject.Singleton;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java

@@ -1,9 +1,9 @@
 package com.usatiuk.dhfs.files.objects;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.objects.JDataRemote;
+import com.usatiuk.dhfs.JDataRemote;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 
 public record ChunkData(JObjectKey key, ByteString data) implements JDataRemote, JDataRemoteDto {
     @Override

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java

@@ -2,8 +2,8 @@ package com.usatiuk.dhfs.files.objects;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.persistence.ChunkDataP;
-import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
+import com.usatiuk.dhfs.persistence.ChunkDataP;
+import com.usatiuk.dhfs.persistence.JObjectKeyP;
 import jakarta.inject.Singleton;
 
 @Singleton

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/File.java

@@ -1,10 +1,10 @@
 package com.usatiuk.dhfs.files.objects;
 
-import com.usatiuk.dhfs.objects.JDataRemote;
+import com.usatiuk.dhfs.JDataRemote;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.jmap.JMapHolder;
-import com.usatiuk.dhfs.objects.jmap.JMapLongKey;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.jmap.JMapHolder;
+import com.usatiuk.dhfs.jmap.JMapLongKey;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 
 import java.util.Collection;
 import java.util.Set;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java

@@ -1,8 +1,8 @@
 package com.usatiuk.dhfs.files.objects;
 
-import com.usatiuk.dhfs.objects.JDataRemote;
+import com.usatiuk.dhfs.JDataRemote;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.List;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java

@@ -1,7 +1,7 @@
 package com.usatiuk.dhfs.files.objects;
 
-import com.usatiuk.dhfs.objects.jmap.JMapHelper;
-import com.usatiuk.dhfs.objects.repository.syncmap.DtoMapper;
+import com.usatiuk.dhfs.jmap.JMapHelper;
+import com.usatiuk.dhfs.repository.syncmap.DtoMapper;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java

@@ -1,8 +1,8 @@
 package com.usatiuk.dhfs.files.objects;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.jmap.JMapHelper;
-import com.usatiuk.dhfs.objects.jmap.JMapLongKey;
+import com.usatiuk.dhfs.jmap.JMapHelper;
+import com.usatiuk.dhfs.jmap.JMapLongKey;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.apache.commons.lang3.tuple.Pair;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java

@@ -1,7 +1,7 @@
 package com.usatiuk.dhfs.files.objects;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import com.usatiuk.dhfs.objects.persistence.FileDtoP;
+import com.usatiuk.dhfs.persistence.FileDtoP;
 import com.usatiuk.dhfs.utils.SerializationHelper;
 import jakarta.inject.Singleton;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java

@@ -1,13 +1,17 @@
 package com.usatiuk.dhfs.files.objects;
 
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.RemoteObjectDataWrapper;
+import com.usatiuk.dhfs.RemoteObjectMeta;
+import com.usatiuk.dhfs.RemoteTransaction;
 import com.usatiuk.dhfs.files.service.DhfsFileService;
 import com.usatiuk.dhfs.objects.*;
-import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile;
-import com.usatiuk.dhfs.objects.jmap.JMapHelper;
-import com.usatiuk.dhfs.objects.repository.ObjSyncHandler;
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.SyncHelper;
+import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile;
+import com.usatiuk.dhfs.jmap.JMapHelper;
+import com.usatiuk.dhfs.repository.ObjSyncHandler;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.SyncHelper;
 import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.kleppmanntree.AlreadyExistsException;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java

@@ -2,18 +2,21 @@ package com.usatiuk.dhfs.files.service;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.UnsafeByteOperations;
+import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.dhfs.RemoteObjectMeta;
+import com.usatiuk.dhfs.RemoteTransaction;
 import com.usatiuk.dhfs.files.objects.ChunkData;
 import com.usatiuk.dhfs.files.objects.File;
 import com.usatiuk.dhfs.objects.*;
 import com.usatiuk.dhfs.objects.iterators.IteratorStart;
-import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaDirectory;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile;
-import com.usatiuk.dhfs.objects.jmap.JMapEntry;
-import com.usatiuk.dhfs.objects.jmap.JMapHelper;
-import com.usatiuk.dhfs.objects.jmap.JMapLongKey;
+import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaDirectory;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile;
+import com.usatiuk.dhfs.jmap.JMapEntry;
+import com.usatiuk.dhfs.jmap.JMapHelper;
+import com.usatiuk.dhfs.jmap.JMapLongKey;
 import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree;
+package com.usatiuk.dhfs.jkleppmanntree;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData;
-import com.usatiuk.dhfs.objects.repository.InitialSyncProcessor;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData;
+import com.usatiuk.dhfs.repository.InitialSyncProcessor;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java

@@ -1,11 +1,11 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree;
+package com.usatiuk.dhfs.jkleppmanntree;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.*;
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.invalidation.Op;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.jkleppmanntree.structs.*;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.invalidation.Op;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
 import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java

@@ -1,10 +1,10 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree;
+package com.usatiuk.dhfs.jkleppmanntree;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile;
-import com.usatiuk.dhfs.objects.repository.invalidation.Op;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMetaFile;
+import com.usatiuk.dhfs.repository.invalidation.Op;
 import com.usatiuk.kleppmanntree.OpMove;
 
 import java.io.Serializable;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeerInterface.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree;
+package com.usatiuk.dhfs.jkleppmanntree;
 
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.peersync.PeerInfo;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
 import com.usatiuk.kleppmanntree.PeerInterface;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree;
+package com.usatiuk.dhfs.jkleppmanntree;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.invalidation.Op;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.invalidation.Op;
 
 import java.io.Serializable;
 import java.util.Collection;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java

@@ -1,10 +1,10 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree.structs;
+package com.usatiuk.dhfs.jkleppmanntree.structs;
 
-import com.usatiuk.dhfs.objects.JDataRef;
-import com.usatiuk.dhfs.objects.JDataRefcounted;
+import com.usatiuk.dhfs.JDataRef;
+import com.usatiuk.dhfs.JDataRefcounted;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.peersync.structs.JKleppmannTreeNodeMetaPeer;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.peersync.structs.JKleppmannTreeNodeMetaPeer;
 import com.usatiuk.kleppmanntree.OpMove;
 import com.usatiuk.kleppmanntree.TreeNode;
 import org.pcollections.HashTreePMap;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMeta.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree.structs;
+package com.usatiuk.dhfs.jkleppmanntree.structs;
 
 import com.usatiuk.kleppmanntree.NodeMeta;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaDirectory.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree.structs;
+package com.usatiuk.dhfs.jkleppmanntree.structs;
 
 public class JKleppmannTreeNodeMetaDirectory extends JKleppmannTreeNodeMeta {
     public JKleppmannTreeNodeMetaDirectory(String name) {

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNodeMetaFile.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree.structs;
+package com.usatiuk.dhfs.jkleppmanntree.structs;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.jkleppmanntree.structs;
+package com.usatiuk.dhfs.jkleppmanntree.structs;
 
-import com.usatiuk.dhfs.objects.JDataRef;
-import com.usatiuk.dhfs.objects.JDataRefcounted;
+import com.usatiuk.dhfs.JDataRef;
+import com.usatiuk.dhfs.JDataRefcounted;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 import com.usatiuk.kleppmanntree.CombinedTimestamp;
 import com.usatiuk.kleppmanntree.LogRecord;
 import com.usatiuk.kleppmanntree.OpMove;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapEntry.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.jmap;
+package com.usatiuk.dhfs.jmap;
 
 import com.usatiuk.dhfs.objects.JData;
 import com.usatiuk.dhfs.objects.JObjectKey;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHelper.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.jmap;
+package com.usatiuk.dhfs.jmap;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
 import com.usatiuk.dhfs.objects.iterators.CloseableKvIterator;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolder.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.jmap;
+package com.usatiuk.dhfs.jmap;
 
 import com.usatiuk.dhfs.objects.JData;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java

@@ -1,5 +1,8 @@
-package com.usatiuk.dhfs.objects.jmap;
+package com.usatiuk.dhfs.jmap;
 
+import com.usatiuk.dhfs.JDataRefcounted;
+import com.usatiuk.dhfs.RemoteObjectDataWrapper;
+import com.usatiuk.dhfs.RemoteObjectMeta;
 import com.usatiuk.dhfs.objects.*;
 import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
 import com.usatiuk.dhfs.objects.transaction.Transaction;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapIterator.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.jmap;
+package com.usatiuk.dhfs.jmap;
 
 import com.usatiuk.dhfs.objects.JData;
 import com.usatiuk.dhfs.objects.JObjectKey;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapKey.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.jmap;
+package com.usatiuk.dhfs.jmap;
 
 public interface JMapKey extends Comparable<JMapKey> {
 }

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapLongKey.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.jmap;
+package com.usatiuk.dhfs.jmap;
 
 import javax.annotation.Nonnull;
 import java.io.Serializable;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.jmap;
+package com.usatiuk.dhfs.jmap;
 
-import com.usatiuk.dhfs.objects.JDataNormalRef;
-import com.usatiuk.dhfs.objects.JDataRef;
+import com.usatiuk.dhfs.JDataNormalRef;
+import com.usatiuk.dhfs.JDataRef;
 import com.usatiuk.dhfs.objects.JObjectKey;
 
 import java.util.Comparator;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.jmap;
+package com.usatiuk.dhfs.jmap;
 
 import com.usatiuk.dhfs.objects.JData;
-import com.usatiuk.dhfs.objects.JDataRefcounted;
+import com.usatiuk.dhfs.JDataRefcounted;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.RemoteObjectMeta;
+import com.usatiuk.dhfs.RemoteObjectMeta;
 import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/peerdiscovery/PeerAddress.java

@@ -1,9 +0,0 @@
-package com.usatiuk.dhfs.objects.repository.peerdiscovery;
-
-import com.usatiuk.dhfs.objects.PeerId;
-
-public interface PeerAddress {
-    PeerId peer();
-
-    PeerAddressType type();
-}

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/syncmap/DtoMapper.java

@@ -1,10 +0,0 @@
-package com.usatiuk.dhfs.objects.repository.syncmap;
-
-import com.usatiuk.dhfs.objects.JDataRemote;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
-
-public interface DtoMapper<F extends JDataRemote, D extends JDataRemoteDto> {
-    D toDto(F obj);
-
-    F fromDto(D dto);
-}

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/AvailablePeerInfo.java

@@ -1,4 +0,0 @@
-package com.usatiuk.dhfs.objects.repository.webapi;
-
-public record AvailablePeerInfo(String uuid) {
-}

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerDelete.java

@@ -1,4 +0,0 @@
-package com.usatiuk.dhfs.objects.repository.webapi;
-
-public record KnownPeerDelete(String uuid) {
-}

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerInfo.java

@@ -1,4 +0,0 @@
-package com.usatiuk.dhfs.objects.repository.webapi;
-
-public record KnownPeerInfo(String uuid) {
-}

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/objects/repository/webapi/KnownPeerPut.java

@@ -1,4 +0,0 @@
-package com.usatiuk.dhfs.objects.repository.webapi;
-
-public record KnownPeerPut(String uuid) {
-}

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java

@@ -1,5 +1,8 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
+import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.dhfs.RemoteObjectMeta;
+import com.usatiuk.dhfs.RemoteTransaction;
 import com.usatiuk.dhfs.objects.*;
 import com.usatiuk.dhfs.objects.iterators.IteratorStart;
 import com.usatiuk.dhfs.objects.transaction.Transaction;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import com.usatiuk.dhfs.objects.JData;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.RemoteObjectMeta;
-import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.RemoteObjectMeta;
+import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
 import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import jakarta.enterprise.context.ApplicationScoped;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/CertificateTools.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import org.apache.commons.codec.digest.DigestUtils;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java

@@ -1,5 +1,9 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
+import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.RemoteObjectDataWrapper;
+import com.usatiuk.dhfs.RemoteObjectMeta;
 import com.usatiuk.dhfs.objects.*;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import com.usatiuk.dhfs.objects.JData;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 
 public interface InitialSyncProcessor<T extends JData> {
     void prepareForInitialSync(PeerId from, JObjectKey key);

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/JDataRemoteDto.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import com.usatiuk.autoprotomap.runtime.ProtoMirror;
-import com.usatiuk.dhfs.objects.JDataRemote;
-import com.usatiuk.dhfs.objects.persistence.JDataRemoteDtoP;
+import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.dhfs.persistence.JDataRemoteDtoP;
 
 import java.io.Serializable;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/JDataRemotePush.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
-import com.usatiuk.dhfs.objects.JDataRemote;
+import com.usatiuk.dhfs.JDataRemote;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 import org.pcollections.PMap;
 
 import javax.annotation.Nullable;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerConnectedEventListener.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 
 public interface PeerConnectedEventListener {
     void handlePeerConnected(PeerId peerId);

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerDisconnectedEventListener.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 
 public interface PeerDisconnectedEventListener {
     void handlePeerDisconnected(PeerId peerId);

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java

@@ -1,13 +1,13 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddress;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryDirectory;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
-import com.usatiuk.dhfs.objects.repository.peersync.api.PeerSyncApiClientDynamic;
-import com.usatiuk.dhfs.objects.repository.peertrust.PeerTrustManager;
-import com.usatiuk.dhfs.objects.repository.webapi.AvailablePeerInfo;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddress;
+import com.usatiuk.dhfs.repository.peerdiscovery.PeerDiscoveryDirectory;
+import com.usatiuk.dhfs.repository.peersync.PeerInfo;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.repository.peersync.api.PeerSyncApiClientDynamic;
+import com.usatiuk.dhfs.repository.peertrust.PeerTrustManager;
+import com.usatiuk.dhfs.repository.webapi.AvailablePeerInfo;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import com.usatiuk.dhfs.ShutdownChecker;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
-import com.usatiuk.dhfs.objects.repository.peertrust.PeerTrustManager;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.repository.peertrust.PeerTrustManager;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import com.usatiuk.dhfs.objects.JData;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 import org.pcollections.PSet;
 
 import java.io.Serializable;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java

@@ -1,10 +1,11 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
+import com.usatiuk.dhfs.*;
 import com.usatiuk.dhfs.objects.*;
-import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
-import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService;
-import com.usatiuk.dhfs.objects.repository.invalidation.Op;
+import com.usatiuk.dhfs.persistence.JObjectKeyP;
+import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.repository.invalidation.Op;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;
 import io.grpc.Status;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServer.java

@@ -1,24 +1,12 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
-import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import com.usatiuk.dhfs.objects.*;
-import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
-import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService;
-import com.usatiuk.dhfs.objects.repository.invalidation.Op;
-import com.usatiuk.dhfs.objects.repository.invalidation.OpHandler;
-import com.usatiuk.dhfs.objects.repository.syncmap.DtoMapperService;
-import com.usatiuk.dhfs.objects.transaction.Transaction;
-import com.usatiuk.dhfs.objects.transaction.TransactionManager;
-import io.grpc.Status;
-import io.grpc.StatusRuntimeException;
+import com.usatiuk.dhfs.PeerId;
 import io.quarkus.grpc.GrpcService;
-import io.quarkus.logging.Log;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
 import jakarta.annotation.security.RolesAllowed;
 import jakarta.inject.Inject;
-import org.apache.commons.lang3.tuple.Pair;
 
 // Note: RunOnVirtualThread hangs somehow
 @GrpcService
@@ -29,7 +17,7 @@ public class RemoteObjectServiceServer implements DhfsObjectSyncGrpc {
     @Inject
     RemoteObjectServiceServerImpl remoteObjectServiceServerImpl;
 
-    PeerId getIdentity() {
+    private PeerId getIdentity() {
         return PeerId.of(identity.getPrincipal().getName().substring(3));
     }
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java

@@ -1,21 +1,18 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
+import com.usatiuk.dhfs.*;
 import com.usatiuk.dhfs.objects.*;
-import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
-import com.usatiuk.dhfs.objects.repository.invalidation.Op;
-import com.usatiuk.dhfs.objects.repository.invalidation.OpHandler;
-import com.usatiuk.dhfs.objects.repository.syncmap.DtoMapperService;
+import com.usatiuk.dhfs.persistence.JObjectKeyP;
+import com.usatiuk.dhfs.repository.invalidation.Op;
+import com.usatiuk.dhfs.repository.invalidation.OpHandler;
+import com.usatiuk.dhfs.repository.syncmap.DtoMapperService;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
-import io.quarkus.grpc.GrpcService;
 import io.quarkus.logging.Log;
-import io.quarkus.security.identity.SecurityIdentity;
-import io.smallrye.common.annotation.Blocking;
 import io.smallrye.mutiny.Uni;
-import jakarta.annotation.security.RolesAllowed;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.apache.commons.lang3.tuple.Pair;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RpcChannelFactory.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.peertrust.PeerTrustManager;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.peertrust.PeerTrustManager;
 import io.grpc.ChannelCredentials;
 import io.grpc.ManagedChannel;
 import io.grpc.TlsChannelCredentials;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/RpcClientFactory.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.IpPeerAddress;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddress;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.peerdiscovery.IpPeerAddress;
+import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddress;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java

@@ -1,8 +1,11 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
+import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.RemoteTransaction;
 import com.usatiuk.dhfs.objects.*;
 import com.usatiuk.dhfs.objects.iterators.IteratorStart;
-import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHandlerService.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import jakarta.enterprise.context.ApplicationScoped;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/SyncHelper.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 import org.pcollections.PMap;
 
 import java.util.stream.Collectors;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java

@@ -1,11 +1,11 @@
-package com.usatiuk.dhfs.objects.repository;
+package com.usatiuk.dhfs.repository;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.ReceivedObject;
-import com.usatiuk.dhfs.objects.persistence.JDataRemoteDtoP;
-import com.usatiuk.dhfs.objects.persistence.JObjectKeyP;
-import com.usatiuk.dhfs.objects.persistence.PeerIdP;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.ReceivedObject;
+import com.usatiuk.dhfs.persistence.JDataRemoteDtoP;
+import com.usatiuk.dhfs.persistence.JObjectKeyP;
+import com.usatiuk.dhfs.persistence.PeerIdP;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.pcollections.HashTreePMap;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueData.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.repository.invalidation;
+package com.usatiuk.dhfs.repository.invalidation;
 
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 import org.apache.commons.collections4.MultiValuedMap;
 import org.apache.commons.collections4.multimap.HashSetValuedHashMap;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueService.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.repository.invalidation;
+package com.usatiuk.dhfs.repository.invalidation;
 
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.PeerConnectedEventListener;
-import com.usatiuk.dhfs.objects.repository.PeerManager;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.PeerConnectedEventListener;
+import com.usatiuk.dhfs.repository.PeerManager;
 import com.usatiuk.dhfs.utils.SerializationHelper;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.repository.invalidation;
+package com.usatiuk.dhfs.repository.invalidation;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
 import org.pcollections.PMap;
 
 import java.util.Collection;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.repository.invalidation;
+package com.usatiuk.dhfs.repository.invalidation;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 
 import java.io.Serializable;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java

@@ -1,10 +1,10 @@
-package com.usatiuk.dhfs.objects.repository.invalidation;
+package com.usatiuk.dhfs.repository.invalidation;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.PeerManager;
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.PeerManager;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
 import com.usatiuk.dhfs.utils.HashSetDelayedBlockingQueue;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.repository.invalidation;
+package com.usatiuk.dhfs.repository.invalidation;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.objects.repository.invalidation;
+package com.usatiuk.dhfs.repository.invalidation;
 
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager;
-import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeOpWrapper;
-import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreePeriodicPushOp;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
+import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeOpWrapper;
+import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreePeriodicPushOp;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpPusher.java

@@ -1,14 +1,14 @@
-package com.usatiuk.dhfs.objects.repository.invalidation;
+package com.usatiuk.dhfs.repository.invalidation;
 
 import com.usatiuk.dhfs.objects.JData;
-import com.usatiuk.dhfs.objects.RemoteObjectMeta;
-import com.usatiuk.dhfs.objects.RemoteTransaction;
-import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreePersistentData;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
-import com.usatiuk.dhfs.objects.repository.JDataRemotePush;
-import com.usatiuk.dhfs.objects.repository.RemoteObjectServiceClient;
-import com.usatiuk.dhfs.objects.repository.syncmap.DtoMapperService;
+import com.usatiuk.dhfs.RemoteObjectMeta;
+import com.usatiuk.dhfs.RemoteTransaction;
+import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.repository.JDataRemotePush;
+import com.usatiuk.dhfs.repository.RemoteObjectServiceClient;
+import com.usatiuk.dhfs.repository.syncmap.DtoMapperService;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.repository.invalidation;
+package com.usatiuk.dhfs.repository.invalidation;
 
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.RemoteTransaction;
-import com.usatiuk.dhfs.objects.repository.SyncHandler;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.RemoteTransaction;
+import com.usatiuk.dhfs.repository.SyncHandler;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/IpPeerAddress.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.repository.peerdiscovery;
+package com.usatiuk.dhfs.repository.peerdiscovery;
 
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 
 import java.net.InetAddress;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddress.java

@@ -0,0 +1,9 @@
+package com.usatiuk.dhfs.repository.peerdiscovery;
+
+import com.usatiuk.dhfs.PeerId;
+
+public interface PeerAddress {
+    PeerId peer();
+
+    PeerAddressType type();
+}

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddressType.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.repository.peerdiscovery;
+package com.usatiuk.dhfs.repository.peerdiscovery;
 
 public enum PeerAddressType {
     LAN,

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerDiscoveryDirectory.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.repository.peerdiscovery;
+package com.usatiuk.dhfs.repository.peerdiscovery;
 
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.apache.commons.collections4.MultiValuedMap;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/StaticPeerDiscovery.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.repository.peerdiscovery;
+package com.usatiuk.dhfs.repository.peerdiscovery;
 
-import com.usatiuk.dhfs.objects.PeerId;
+import com.usatiuk.dhfs.PeerId;
 import io.quarkus.scheduler.Scheduled;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.repository.peerdiscovery.local;
+package com.usatiuk.dhfs.repository.peerdiscovery.local;
 
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryInfo;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.peerdiscovery.PeerDiscoveryInfo;
 import io.quarkus.arc.properties.IfBuildProperty;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java

@@ -1,11 +1,11 @@
-package com.usatiuk.dhfs.objects.repository.peerdiscovery.local;
+package com.usatiuk.dhfs.repository.peerdiscovery.local;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.IpPeerAddress;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddressType;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryDirectory;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerDiscoveryInfo;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.peerdiscovery.IpPeerAddress;
+import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddressType;
+import com.usatiuk.dhfs.repository.peerdiscovery.PeerDiscoveryDirectory;
+import com.usatiuk.dhfs.repository.peerdiscovery.PeerDiscoveryInfo;
 import io.quarkus.arc.properties.IfBuildProperty;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java

@@ -1,12 +1,12 @@
-package com.usatiuk.dhfs.objects.repository.peersync;
+package com.usatiuk.dhfs.repository.peersync;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.objects.JDataRemote;
+import com.usatiuk.dhfs.JDataRemote;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.CertificateTools;
-import com.usatiuk.dhfs.objects.repository.JDataRemoteDto;
-import com.usatiuk.dhfs.objects.repository.JDataRemotePush;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.CertificateTools;
+import com.usatiuk.dhfs.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.repository.JDataRemotePush;
 
 import java.security.cert.X509Certificate;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoProtoSerializer.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.repository.peersync;
+package com.usatiuk.dhfs.repository.peersync;
 
 import com.usatiuk.autoprotomap.runtime.ProtoSerializer;
-import com.usatiuk.dhfs.objects.persistence.PeerInfoP;
+import com.usatiuk.dhfs.persistence.PeerInfoP;
 import com.usatiuk.dhfs.utils.SerializationHelper;
 import jakarta.inject.Singleton;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java

@@ -1,12 +1,12 @@
-package com.usatiuk.dhfs.objects.repository.peersync;
+package com.usatiuk.dhfs.repository.peersync;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.RemoteTransaction;
-import com.usatiuk.dhfs.objects.jkleppmanntree.JKleppmannTreeManager;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode;
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.peersync.structs.JKleppmannTreeNodeMetaPeer;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.RemoteTransaction;
+import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.peersync.structs.JKleppmannTreeNodeMetaPeer;
 import com.usatiuk.dhfs.objects.transaction.LockingStrategy;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import com.usatiuk.dhfs.objects.transaction.TransactionManager;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java

@@ -1,9 +1,13 @@
-package com.usatiuk.dhfs.objects.repository.peersync;
+package com.usatiuk.dhfs.repository.peersync;
 
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.RemoteObjectDataWrapper;
+import com.usatiuk.dhfs.RemoteObjectMeta;
+import com.usatiuk.dhfs.RemoteTransaction;
 import com.usatiuk.dhfs.objects.*;
-import com.usatiuk.dhfs.objects.repository.ObjSyncHandler;
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.SyncHelper;
+import com.usatiuk.dhfs.repository.ObjSyncHandler;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.SyncHelper;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/ApiPeerInfo.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.repository.peersync.api;
+package com.usatiuk.dhfs.repository.peersync.api;
 
 public record ApiPeerInfo(String selfUuid, String cert) {
 }

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApi.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.objects.repository.peersync.api;
+package com.usatiuk.dhfs.repository.peersync.api;
 
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClient.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.objects.repository.peersync.api;
+package com.usatiuk.dhfs.repository.peersync.api;
 
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClientDynamic.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.repository.peersync.api;
+package com.usatiuk.dhfs.repository.peersync.api;
 
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.IpPeerAddress;
-import com.usatiuk.dhfs.objects.repository.peerdiscovery.PeerAddress;
+import com.usatiuk.dhfs.repository.peerdiscovery.IpPeerAddress;
+import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddress;
 import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder;
 import jakarta.enterprise.context.ApplicationScoped;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.objects.repository.peersync.structs;
+package com.usatiuk.dhfs.repository.peersync.structs;
 
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
 
 import java.util.Objects;
 

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java

@@ -1,14 +1,14 @@
-package com.usatiuk.dhfs.objects.repository.peertrust;
+package com.usatiuk.dhfs.repository.peertrust;
 
 import com.usatiuk.dhfs.objects.JData;
 import com.usatiuk.dhfs.objects.JObjectKey;
-import com.usatiuk.dhfs.objects.RemoteObjectDataWrapper;
-import com.usatiuk.dhfs.objects.jkleppmanntree.structs.JKleppmannTreeNode;
-import com.usatiuk.dhfs.objects.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.objects.repository.invalidation.InvalidationQueueService;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
-import com.usatiuk.dhfs.objects.repository.peersync.structs.JKleppmannTreeNodeMetaPeer;
+import com.usatiuk.dhfs.RemoteObjectDataWrapper;
+import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode;
+import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.repository.peersync.PeerInfo;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.repository.peersync.structs.JKleppmannTreeNodeMetaPeer;
 import com.usatiuk.dhfs.objects.transaction.PreCommitTxHook;
 import com.usatiuk.dhfs.objects.transaction.Transaction;
 import io.quarkus.logging.Log;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerRolesAugmentor.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.repository.peertrust;
+package com.usatiuk.dhfs.repository.peertrust;
 
-import com.usatiuk.dhfs.objects.PeerId;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
 import io.quarkus.logging.Log;
 import io.quarkus.security.credential.CertificateCredential;
 import io.quarkus.security.identity.AuthenticationRequestContext;

dhfs-parent/server/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustManager.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.objects.repository.peertrust;
+package com.usatiuk.dhfs.repository.peertrust;
 
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfo;
-import com.usatiuk.dhfs.objects.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.repository.peersync.PeerInfo;
+import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;