Some packages cleanup

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/TemporaryOpSerializer.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/autosync/AutosyncProcessor.java

@@ -1,14 +1,14 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.autosync;
 
-import com.usatiuk.dhfs.JDataRemote;
-import com.usatiuk.dhfs.RemoteObjectMeta;
-import com.usatiuk.dhfs.RemoteTransaction;
+import com.usatiuk.dhfs.remoteobj.JDataRemote;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.IteratorStart;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
-import com.usatiuk.dhfs.utils.HashSetDelayedBlockingQueue;
+import com.usatiuk.utils.HashSetDelayedBlockingQueue;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/autosync/AutosyncTxHook.java

@@ -1,12 +1,11 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.autosync;
 
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.RemoteObjectMeta;
-import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
+import com.usatiuk.dhfs.invalidation.InvalidationQueueService;
 import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import org.eclipse.microprofile.config.inject.ConfigProperty;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/DeferredInvalidationQueueData.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/DeferredInvalidationQueueService.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/IndexUpdateOp.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/InvalidationQueueEntry.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/InvalidationQueueService.java

@@ -1,13 +1,13 @@
-package com.usatiuk.dhfs.repository.invalidation;
+package com.usatiuk.dhfs.invalidation;
 
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.repository.PeerManager;
-import com.usatiuk.dhfs.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.repository.RemoteObjectServiceClient;
-import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
-import com.usatiuk.dhfs.utils.DataLocker;
-import com.usatiuk.dhfs.utils.HashSetDelayedBlockingQueue;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.PeerManager;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.rpc.RemoteObjectServiceClient;
+import com.usatiuk.dhfs.peersync.PeerInfoService;
+import com.usatiuk.utils.AutoCloseableNoThrow;
+import com.usatiuk.utils.DataLocker;
+import com.usatiuk.utils.HashSetDelayedBlockingQueue;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.Transaction;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/Op.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/OpExtractor.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.repository.invalidation;
+package com.usatiuk.dhfs.invalidation;
 
-import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.peersync.PeerId;
 import com.usatiuk.objects.JData;
 import org.apache.commons.lang3.tuple.Pair;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/OpExtractorService.java

@@ -1,7 +1,6 @@
-package com.usatiuk.dhfs.repository.invalidation;
+package com.usatiuk.dhfs.invalidation;
 
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.repository.syncmap.DtoMapper;
+import com.usatiuk.dhfs.peersync.PeerId;
 import com.usatiuk.objects.JData;
 import jakarta.annotation.Nullable;
 import jakarta.enterprise.context.ApplicationScoped;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/OpHandler.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.repository.invalidation;
+package com.usatiuk.dhfs.invalidation;
 
-import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.peersync.PeerId;
 import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
 import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeOpWrapper;
 import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreePeriodicPushOp;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/PushOpHandler.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/RemoteObjectMetaOpExtractor.java

@@ -1,11 +1,11 @@
-package com.usatiuk.dhfs.repository.invalidation;
+package com.usatiuk.dhfs.invalidation;
 
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.RemoteObjectMeta;
-import com.usatiuk.dhfs.RemoteTransaction;
-import com.usatiuk.dhfs.repository.JDataRemoteDto;
-import com.usatiuk.dhfs.repository.JDataRemotePush;
-import com.usatiuk.dhfs.repository.syncmap.DtoMapperService;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
+import com.usatiuk.dhfs.remoteobj.JDataRemotePush;
+import com.usatiuk.dhfs.syncmap.DtoMapperService;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
 import io.quarkus.logging.Log;

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

@@ -1,9 +1,9 @@
 package com.usatiuk.dhfs.jkleppmanntree;
 
-import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.peersync.PeerId;
 import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData;
-import com.usatiuk.dhfs.repository.InitialSyncProcessor;
-import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.peersync.InitialSyncProcessor;
+import com.usatiuk.dhfs.invalidation.InvalidationQueueService;
 import com.usatiuk.objects.JObjectKey;
 import io.quarkus.logging.Log;
 import jakarta.enterprise.context.ApplicationScoped;

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

@@ -1,11 +1,11 @@
 package com.usatiuk.dhfs.jkleppmanntree;
 
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.peersync.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.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.invalidation.Op;
+import com.usatiuk.dhfs.peersync.PeerInfoService;
 import com.usatiuk.objects.transaction.LockingStrategy;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpExtractor.java

@@ -1,12 +1,12 @@
 package com.usatiuk.dhfs.jkleppmanntree;
 
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.RemoteTransaction;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
 import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData;
-import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
-import com.usatiuk.dhfs.repository.invalidation.Op;
-import com.usatiuk.dhfs.repository.invalidation.OpExtractor;
-import com.usatiuk.dhfs.repository.syncmap.DtoMapperService;
+import com.usatiuk.dhfs.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.invalidation.Op;
+import com.usatiuk.dhfs.invalidation.OpExtractor;
+import com.usatiuk.dhfs.syncmap.DtoMapperService;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
 import jakarta.enterprise.context.ApplicationScoped;

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

@@ -1,10 +1,10 @@
 package com.usatiuk.dhfs.jkleppmanntree;
 
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.peersync.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.dhfs.invalidation.Op;
 import com.usatiuk.kleppmanntree.OpMove;
 
 import java.io.Serializable;

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

@@ -1,9 +1,9 @@
 package com.usatiuk.dhfs.jkleppmanntree;
 
-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.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.peersync.PeerInfo;
+import com.usatiuk.dhfs.peersync.PeerInfoService;
 import com.usatiuk.kleppmanntree.PeerInterface;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;

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

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

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

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

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

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

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

@@ -1,13 +1,12 @@
 package com.usatiuk.dhfs.jmap;
 
-import com.usatiuk.dhfs.JDataRefcounted;
-import com.usatiuk.dhfs.RemoteObjectDataWrapper;
-import com.usatiuk.dhfs.RemoteObjectMeta;
+import com.usatiuk.dhfs.refcount.JDataRefcounted;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectDataWrapper;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 

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

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

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

@@ -1,13 +1,12 @@
 package com.usatiuk.dhfs.jmap;
 
 import com.usatiuk.objects.JData;
-import com.usatiuk.dhfs.JDataRefcounted;
+import com.usatiuk.dhfs.refcount.JDataRefcounted;
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.RemoteObjectMeta;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
 import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/IpPeerAddress.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerAddrStringHelper.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerAddress.java

@@ -1,6 +1,6 @@
-package com.usatiuk.dhfs.repository.peerdiscovery;
+package com.usatiuk.dhfs.peerdiscovery;
 
-import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.peersync.PeerId;
 
 import java.io.Serializable;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerAddressType.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerDiscoveryDirectory.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PersistentStaticPeerDiscovery.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/StaticPeerDiscovery.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.repository.peerdiscovery;
+package com.usatiuk.dhfs.peerdiscovery;
 
 import io.quarkus.scheduler.Scheduled;
 import jakarta.enterprise.context.ApplicationScoped;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/local/LocalPeerDiscoveryClient.java

@@ -1,11 +1,11 @@
-package com.usatiuk.dhfs.repository.peerdiscovery.local;
+package com.usatiuk.dhfs.peerdiscovery.local;
 
 import com.google.protobuf.InvalidProtocolBufferException;
-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 com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peerdiscovery.IpPeerAddress;
+import com.usatiuk.dhfs.peerdiscovery.PeerAddressType;
+import com.usatiuk.dhfs.peerdiscovery.PeerDiscoveryDirectory;
+import com.usatiuk.dhfs.peerdiscovery.PeerDiscoveryInfo;
 import io.quarkus.arc.properties.IfBuildProperty;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/InitialSyncProcessor.java

@@ -1,6 +1,5 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.peersync;
 
-import com.usatiuk.dhfs.PeerId;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerConnectedEventListener.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerDisconnectedEventListener.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerId.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfo.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfoProtoSerializer.java

@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.repository.peersync;
+package com.usatiuk.dhfs.peersync;
 
 import com.usatiuk.dhfs.ProtoSerializer;
 import com.usatiuk.dhfs.persistence.PeerInfoP;
-import com.usatiuk.dhfs.utils.SerializationHelper;
+import com.usatiuk.utils.SerializationHelper;
 import jakarta.inject.Singleton;
 
 import java.io.IOException;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfoService.java

@@ -1,12 +1,10 @@
-package com.usatiuk.dhfs.repository.peersync;
+package com.usatiuk.dhfs.peersync;
 
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.RemoteTransaction;
+import com.usatiuk.dhfs.remoteobj.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.peersync.structs.JKleppmannTreeNodeMetaPeer;
 import com.usatiuk.objects.transaction.LockingStrategy;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfoSyncHandler.java

@@ -1,12 +1,10 @@
-package com.usatiuk.dhfs.repository.peersync;
+package com.usatiuk.dhfs.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.repository.ObjSyncHandler;
-import com.usatiuk.dhfs.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.repository.SyncHelper;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectDataWrapper;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
+import com.usatiuk.dhfs.remoteobj.ObjSyncHandler;
+import com.usatiuk.dhfs.remoteobj.SyncHelper;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.Transaction;
 import io.grpc.Status;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerManager.java

@@ -1,11 +1,12 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.peersync;
 
-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.PeerInfoService;
-import com.usatiuk.dhfs.repository.peersync.api.PeerSyncApiClientDynamic;
-import com.usatiuk.dhfs.repository.peertrust.PeerTrustManager;
+import com.usatiuk.dhfs.peerdiscovery.PeerAddress;
+import com.usatiuk.dhfs.peerdiscovery.PeerDiscoveryDirectory;
+import com.usatiuk.dhfs.peersync.api.PeerSyncApiClientDynamic;
+import com.usatiuk.dhfs.peertrust.PeerTrustManager;
+import com.usatiuk.dhfs.repository.PingRequest;
+import com.usatiuk.dhfs.rpc.RpcClientFactory;
+import com.usatiuk.dhfs.remoteobj.SyncHandler;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
 import io.quarkus.logging.Log;
@@ -68,7 +69,7 @@ public class PeerManager {
         if (_heartbeatExecutor == null) return;
         try {
             var peers = peerInfoService.getPeersNoSelf();
-            var pids = peers.stream().map(com.usatiuk.dhfs.repository.peersync.PeerInfo::id).toList();
+            var pids = peers.stream().map(com.usatiuk.dhfs.peersync.PeerInfo::id).toList();
 
             List<PeerId> stale = _states.keySet().stream().filter(p -> !pids.contains(p)).toList();
             stale.forEach(_states.keySet()::remove);
@@ -96,7 +97,7 @@ public class PeerManager {
         }
     }
 
-    private void handleConnectionSuccess(com.usatiuk.dhfs.repository.peersync.PeerInfo host, PeerAddress address) {
+    private void handleConnectionSuccess(com.usatiuk.dhfs.peersync.PeerInfo host, PeerAddress address) {
         boolean wasReachable = isReachable(host);
 
         boolean shouldSync = !persistentPeerDataService.isInitialSyncDone(host.id());
@@ -118,7 +119,7 @@ public class PeerManager {
         }
     }
 
-    public void handleConnectionError(com.usatiuk.dhfs.repository.peersync.PeerInfo host) {
+    public void handleConnectionError(com.usatiuk.dhfs.peersync.PeerInfo host) {
         boolean wasReachable = isReachable(host);
 
         if (wasReachable)
@@ -132,7 +133,7 @@ public class PeerManager {
     }
 
     // FIXME:
-    private boolean pingCheck(com.usatiuk.dhfs.repository.peersync.PeerInfo host, PeerAddress address) {
+    private boolean pingCheck(com.usatiuk.dhfs.peersync.PeerInfo host, PeerAddress address) {
         try {
             return rpcClientFactory.withObjSyncClient(host.id(), address, pingTimeout, (peer, c) -> {
                 c.ping(PingRequest.getDefaultInstance());
@@ -148,7 +149,7 @@ public class PeerManager {
         return _states.containsKey(host);
     }
 
-    public boolean isReachable(com.usatiuk.dhfs.repository.peersync.PeerInfo host) {
+    public boolean isReachable(com.usatiuk.dhfs.peersync.PeerInfo host) {
         return isReachable(host.id());
     }
 
@@ -168,7 +169,7 @@ public class PeerManager {
 
     public HostStateSnapshot getHostStateSnapshot() {
         return transactionManager.run(() -> {
-            var partition = peerInfoService.getPeersNoSelf().stream().map(com.usatiuk.dhfs.repository.peersync.PeerInfo::id)
+            var partition = peerInfoService.getPeersNoSelf().stream().map(com.usatiuk.dhfs.peersync.PeerInfo::id)
                     .collect(Collectors.partitioningBy(this::isReachable));
             return new HostStateSnapshot(partition.get(true), partition.get(false));
         });

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PersistentPeerDataService.java

@@ -1,13 +1,13 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.peersync;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.PeerId;
 import com.usatiuk.dhfs.ShutdownChecker;
-import com.usatiuk.dhfs.repository.peerdiscovery.IpPeerAddress;
-import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddressType;
-import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
-import com.usatiuk.dhfs.repository.peertrust.PeerTrustManager;
-import com.usatiuk.dhfs.utils.SerializationHelper;
+import com.usatiuk.dhfs.peertrust.CertificateTools;
+import com.usatiuk.dhfs.peerdiscovery.IpPeerAddress;
+import com.usatiuk.dhfs.peerdiscovery.PeerAddressType;
+import com.usatiuk.dhfs.peertrust.PeerTrustManager;
+import com.usatiuk.dhfs.rpc.RpcClientFactory;
+import com.usatiuk.utils.SerializationHelper;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
 import io.quarkus.logging.Log;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PersistentRemoteHostsData.java

@@ -1,16 +1,13 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.peersync;
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.repository.peerdiscovery.IpPeerAddress;
+import com.usatiuk.dhfs.peerdiscovery.IpPeerAddress;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import org.pcollections.PMap;
 import org.pcollections.PSet;
 
 import java.io.Serializable;
-import java.security.KeyPair;
-import java.security.cert.X509Certificate;
 
 public record PersistentRemoteHostsData(PeerId selfUuid,
                                         ByteString selfCertificate,

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/ApiPeerInfo.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/PeerSyncApi.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/PeerSyncApiClient.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/PeerSyncApiClientDynamic.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/structs/JKleppmannTreeNodeMetaPeer.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/CertificateTools.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerInfoCertUpdateTxHook.java

@@ -1,18 +1,17 @@
-package com.usatiuk.dhfs.repository.peertrust;
+package com.usatiuk.dhfs.peertrust;
 
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.RemoteObjectDataWrapper;
+import com.usatiuk.dhfs.remoteobj.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.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.peersync.PeerInfo;
+import com.usatiuk.dhfs.peersync.PeerInfoService;
+import com.usatiuk.dhfs.peersync.structs.JKleppmannTreeNodeMetaPeer;
 import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerRolesAugmentor.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerTrustManager.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerTrustServerCustomizer.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.repository.peertrust;
+package com.usatiuk.dhfs.peertrust;
 
 
-import com.usatiuk.dhfs.repository.PersistentPeerDataService;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
 import io.quarkus.vertx.http.HttpServerOptionsCustomizer;
 import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.net.KeyCertOptions;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/DeleterTxHook.java

@@ -1,11 +1,12 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfs.refcount;
 
+import com.usatiuk.dhfs.remoteobj.RemoteObjectDeleter;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/JDataNormalRef.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/JDataRef.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/JDataRefcounted.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/RefcounterTxHook.java

@@ -1,11 +1,11 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfs.refcount;
 
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/ConflictResolver.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/DefaultObjSyncHandler.java

@@ -1,9 +1,7 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.remoteobj;
 
-import com.usatiuk.dhfs.JDataRemote;
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.RemoteObjectDataWrapper;
-import com.usatiuk.dhfs.RemoteObjectMeta;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/JDataRemote.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/JDataRemoteDto.java

@@ -1,6 +1,4 @@
-package com.usatiuk.dhfs.repository;
-
-import com.usatiuk.dhfs.JDataRemote;
+package com.usatiuk.dhfs.remoteobj;
 
 import java.io.Serializable;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/JDataRemotePush.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/ObjSyncHandler.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/ReceivedObject.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjPusherTxHook.java

@@ -1,12 +1,11 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfs.remoteobj;
 
 import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreePersistentData;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.invalidation.InvalidationQueueService;
 import com.usatiuk.objects.transaction.PreCommitTxHook;
 import com.usatiuk.objects.transaction.Transaction;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDataWrapper.java

@@ -1,5 +1,7 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfs.remoteobj;
 
+import com.usatiuk.dhfs.refcount.JDataRef;
+import com.usatiuk.dhfs.refcount.JDataRefcounted;
 import com.usatiuk.objects.JObjectKey;
 import org.pcollections.HashTreePSet;
 import org.pcollections.PCollection;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDeleter.java

@@ -1,13 +1,15 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfs.remoteobj;
 
+import com.usatiuk.dhfs.refcount.JDataRefcounted;
+import com.usatiuk.dhfs.peersync.PeerId;
 import com.usatiuk.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.autosync.AutosyncProcessor;
+import com.usatiuk.dhfs.rpc.RemoteObjectServiceClient;
+import com.usatiuk.dhfs.peersync.PeerInfo;
+import com.usatiuk.dhfs.peersync.PeerInfoService;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
-import com.usatiuk.dhfs.utils.HashSetDelayedBlockingQueue;
+import com.usatiuk.utils.HashSetDelayedBlockingQueue;
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;
 import io.quarkus.runtime.StartupEvent;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectInitialSyncProcessor.java

@@ -1,8 +1,9 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfs.remoteobj;
 
-import com.usatiuk.dhfs.repository.InitialSyncProcessor;
-import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
-import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.InitialSyncProcessor;
+import com.usatiuk.dhfs.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.peersync.PeerInfoService;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectMeta.java

@@ -1,5 +1,8 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfs.remoteobj;
 
+import com.usatiuk.dhfs.refcount.JDataRef;
+import com.usatiuk.dhfs.refcount.JDataRefcounted;
+import com.usatiuk.dhfs.peersync.PeerId;
 import com.usatiuk.objects.JObjectKey;
 import org.pcollections.*;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteTransaction.java

@@ -1,13 +1,11 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfs.remoteobj;
 
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.repository.RemoteObjectServiceClient;
-import com.usatiuk.dhfs.repository.SyncHandler;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.rpc.RemoteObjectServiceClient;
 import com.usatiuk.objects.transaction.LockingStrategy;
 import com.usatiuk.objects.transaction.Transaction;
 import io.quarkus.logging.Log;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import org.apache.commons.lang3.mutable.MutableObject;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/SyncHandler.java

@@ -1,10 +1,11 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.remoteobj;
 
-import com.usatiuk.dhfs.JDataRemote;
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.RemoteTransaction;
+import com.usatiuk.dhfs.peersync.InitialSyncProcessor;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.peersync.PeerId;
 import com.usatiuk.dhfs.ShutdownChecker;
-import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.rpc.RemoteObjectServiceClient;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.IteratorStart;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/SyncHandlerService.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/SyncHelper.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapper.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceClient.java

@@ -1,10 +1,18 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.rpc;
 
 import com.usatiuk.dhfs.ProtoSerializer;
-import com.usatiuk.dhfs.*;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.PeerManager;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
 import com.usatiuk.dhfs.persistence.JObjectKeyP;
-import com.usatiuk.dhfs.repository.invalidation.InvalidationQueueService;
-import com.usatiuk.dhfs.repository.invalidation.Op;
+import com.usatiuk.dhfs.refcount.JDataRef;
+import com.usatiuk.dhfs.remoteobj.ReceivedObject;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
+import com.usatiuk.dhfs.invalidation.InvalidationQueueService;
+import com.usatiuk.dhfs.invalidation.Op;
+import com.usatiuk.dhfs.remoteobj.SyncHandler;
+import com.usatiuk.dhfs.repository.*;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceServer.java

@@ -1,6 +1,7 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.rpc;
 
-import com.usatiuk.dhfs.PeerId;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.repository.*;
 import io.quarkus.grpc.GrpcService;
 import io.quarkus.security.identity.SecurityIdentity;
 import io.smallrye.common.annotation.Blocking;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceServerImpl.java

@@ -1,10 +1,15 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.rpc;
 
 import com.usatiuk.dhfs.*;
+import com.usatiuk.dhfs.autosync.AutosyncProcessor;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.PeerManager;
 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.remoteobj.*;
+import com.usatiuk.dhfs.invalidation.Op;
+import com.usatiuk.dhfs.invalidation.OpHandler;
+import com.usatiuk.dhfs.repository.*;
+import com.usatiuk.dhfs.syncmap.DtoMapperService;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionHandle;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RpcChannelFactory.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RpcClientFactory.java

@@ -1,8 +1,11 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.rpc;
 
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.repository.peerdiscovery.IpPeerAddress;
-import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddress;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.PeerDisconnectedEventListener;
+import com.usatiuk.dhfs.peerdiscovery.IpPeerAddress;
+import com.usatiuk.dhfs.peerdiscovery.PeerAddress;
+import com.usatiuk.dhfs.peersync.PeerManager;
+import com.usatiuk.dhfs.repository.DhfsObjectSyncGrpcGrpc;
 import io.grpc.ManagedChannel;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/TemporaryReceivedObjectSerializer.java

@@ -1,11 +1,13 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.rpc;
 
 import com.usatiuk.dhfs.ProtoSerializer;
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.ReceivedObject;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
+import com.usatiuk.dhfs.remoteobj.ReceivedObject;
 import com.usatiuk.dhfs.persistence.JDataRemoteDtoP;
 import com.usatiuk.dhfs.persistence.JObjectKeyP;
 import com.usatiuk.dhfs.persistence.PeerIdP;
+import com.usatiuk.dhfs.repository.GetObjectReply;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.pcollections.HashTreePMap;

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/TemporaryRemoteObjectSerializer.java

@@ -1,8 +1,9 @@
-package com.usatiuk.dhfs.repository;
+package com.usatiuk.dhfs.rpc;
 
 import com.usatiuk.dhfs.ProtoSerializer;
 import com.usatiuk.dhfs.persistence.JDataRemoteDtoP;
-import com.usatiuk.dhfs.utils.SerializationHelper;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
+import com.usatiuk.utils.SerializationHelper;
 import jakarta.enterprise.context.ApplicationScoped;
 
 @ApplicationScoped

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/syncmap/DtoMapper.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/syncmap/DtoMapperService.java

@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.repository.syncmap;
+package com.usatiuk.dhfs.syncmap;
 
-import com.usatiuk.dhfs.JDataRemote;
-import com.usatiuk.dhfs.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.remoteobj.JDataRemote;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
 import jakarta.enterprise.inject.Instance;
 import jakarta.inject.Singleton;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeerDelete.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeerInfo.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.repository.webapi;
+package com.usatiuk.dhfs.webapi;
 
 import jakarta.annotation.Nullable;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeerPut.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeers.java

@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.repository.webapi;
+package com.usatiuk.dhfs.webapi;
 
 import java.util.List;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PeerAddressInfo.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PeerInfo.java

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

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PeerManagementApi.java

@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.repository.webapi;
+package com.usatiuk.dhfs.webapi;
 
-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.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.PeerManager;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.peersync.PeerInfoService;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
@@ -11,7 +11,6 @@ import jakarta.ws.rs.PUT;
 import jakarta.ws.rs.Path;
 
 import java.util.Collection;
-import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 

dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PersistentPeerAddressApi.java

@@ -1,10 +1,10 @@
-package com.usatiuk.dhfs.repository.webapi;
+package com.usatiuk.dhfs.webapi;
 
-import com.usatiuk.dhfs.PeerId;
-import com.usatiuk.dhfs.repository.PeerManager;
-import com.usatiuk.dhfs.repository.PersistentPeerDataService;
-import com.usatiuk.dhfs.repository.peerdiscovery.PeerAddrStringHelper;
-import com.usatiuk.dhfs.repository.peersync.PeerInfoService;
+import com.usatiuk.dhfs.peersync.PeerId;
+import com.usatiuk.dhfs.peersync.PeerManager;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.peerdiscovery.PeerAddrStringHelper;
+import com.usatiuk.dhfs.peersync.PeerInfoService;
 import jakarta.inject.Inject;
 import jakarta.ws.rs.*;
 

dhfs-parent/sync-base/src/main/proto/dhfs_peer_discovery.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 option java_multiple_files = true;
-option java_package = "com.usatiuk.dhfs.repository.peerdiscovery";
+option java_package = "com.usatiuk.dhfs.peerdiscovery";
 option java_outer_classname = "DhfsObjectPeerDiscoveryApi";
 
 package dhfs.peerdiscovery;

dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/RefcounterTest.java

@@ -1,5 +1,6 @@
 package com.usatiuk.dhfs;
 
+import com.usatiuk.dhfs.refcount.JDataRef;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.dhfs.testobjs.TestRefcount;
 import com.usatiuk.objects.transaction.Transaction;

dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/testobjs/TestRefcount.java

@@ -1,7 +1,7 @@
 package com.usatiuk.dhfs.testobjs;
 
-import com.usatiuk.dhfs.JDataRef;
-import com.usatiuk.dhfs.JDataRefcounted;
+import com.usatiuk.dhfs.refcount.JDataRef;
+import com.usatiuk.dhfs.refcount.JDataRefcounted;
 import com.usatiuk.objects.JObjectKey;
 import org.pcollections.HashTreePSet;
 import org.pcollections.PCollection;