From cca0b410cf44aed83adfe5e90d69cc88218eefd6 Mon Sep 17 00:00:00 2001
From: Stepan Usatiuk <stepan@usatiuk.com>
Date: Fri, 25 Apr 2025 09:16:22 +0200
Subject: [PATCH] Some packages cleanup

---
 dhfs-parent/.run/Main 2.run.xml               |  6 ++---
 dhfs-parent/.run/Main.run.xml                 |  6 ++---
 .../usatiuk/{dhfs/app => dhfsapp}/Main.java   |  2 +-
 .../com/usatiuk/dhfsapp}/TempDataProfile.java |  2 +-
 .../{dhfs => dhfsapp}/TestDataCleaner.java    |  2 +-
 .../integration/DhfsFuseIT.java               |  2 +-
 .../integration/DhfsFusex3IT.java             |  2 +-
 .../integration/DhfsImage.java                |  2 +-
 .../{dhfs => dhfsapp}/integration/KillIT.java |  4 +--
 .../{dhfs => dhfsapp}/integration/LazyFs.java |  2 +-
 .../integration/LazyFsIT.java                 |  7 ++---
 .../integration/ResyncIT.java                 |  2 +-
 .../files => dhfsfs}/objects/ChunkData.java   |  6 ++---
 .../objects/ChunkDataProtoSerializer.java     |  2 +-
 .../{dhfs/files => dhfsfs}/objects/File.java  |  6 ++---
 .../files => dhfsfs}/objects/FileDto.java     |  6 ++---
 .../objects/FileDtoMapper.java                |  4 +--
 .../files => dhfsfs}/objects/FileHelper.java  |  2 +-
 .../objects/FileProtoSerializer.java          |  4 +--
 .../objects/FileSyncHandler.java              | 18 ++++++-------
 .../service/DhfsFileService.java              |  2 +-
 .../service/DhfsFileServiceImpl.java          | 14 +++++-----
 .../service/DirectoryNotEmptyException.java   |  2 +-
 .../files => dhfsfs}/service/GetattrRes.java  |  2 +-
 .../files => dhfsfs}/service/GetattrType.java |  2 +-
 .../DhfsFileServiceSimpleTest.java            |  2 +-
 .../DhfsFileServiceSimpleTestImpl.java        |  9 +++----
 ...fsFileServiceSimpleTestNoChunkingTest.java |  2 +-
 ...ileServiceSimpleTestSmallChunkingTest.java |  2 +-
 .../com/usatiuk/dhfsfs}/TempDataProfile.java  |  2 +-
 .../com/usatiuk/dhfsfs}/TestDataCleaner.java  |  2 +-
 .../benchmarks/Benchmarker.java               |  2 +-
 .../benchmarks/DhfsFileBenchmarkTest.java     |  6 ++---
 .../{dhfs/fuse => dhfsfuse}/DhfsFuse.java     |  8 +++---
 .../fuse => dhfsfuse}/JnrPtrByteOutput.java   |  2 +-
 .../JnrPtrByteOutputAccessors.java            |  2 +-
 .../{dhfs/fuse => dhfsfuse}/DhfsFuseTest.java |  3 +--
 .../usatiuk/dhfsfuse}/TempDataProfile.java    |  2 +-
 .../usatiuk/dhfsfuse}/TestDataCleaner.java    |  2 +-
 .../usatiuk/objects/JavaDataSerializer.java   |  2 +-
 .../iterators/CloseableKvIterator.java        |  2 +-
 .../usatiuk/objects/snapshot/Snapshot.java    |  3 +--
 .../stores/LmdbObjectPersistentStore.java     |  2 +-
 .../objects/transaction/JObjectManager.java   |  2 +-
 .../objects/transaction/LockManager.java      |  5 ++--
 .../transaction/TransactionManager.java       |  2 +-
 .../transaction/TransactionObjectLocked.java  |  2 +-
 .../transaction/TransactionPrivate.java       |  2 +-
 dhfs-parent/pom.xml                           |  4 +--
 .../usatiuk/dhfs/TemporaryOpSerializer.java   |  4 +--
 .../AutosyncProcessor.java                    | 10 +++----
 .../AutosyncTxHook.java                       |  7 +++--
 .../DeferredInvalidationQueueData.java        |  4 +--
 .../DeferredInvalidationQueueService.java     | 10 +++----
 .../invalidation/IndexUpdateOp.java           |  6 ++---
 .../invalidation/InvalidationQueueEntry.java  |  4 +--
 .../InvalidationQueueService.java             | 18 ++++++-------
 .../{repository => }/invalidation/Op.java     |  2 +-
 .../invalidation/OpExtractor.java             |  4 +--
 .../invalidation/OpExtractorService.java      |  5 ++--
 .../invalidation/OpHandler.java               |  4 +--
 .../invalidation/PushOpHandler.java           |  8 +++---
 .../RemoteObjectMetaOpExtractor.java          | 14 +++++-----
 .../JKleppmannTreeInitialSyncProcessor.java   |  6 ++---
 .../jkleppmanntree/JKleppmannTreeManager.java |  8 +++---
 .../JKleppmannTreeOpExtractor.java            | 12 ++++-----
 .../JKleppmannTreeOpWrapper.java              |  4 +--
 .../JKleppmannTreePeerInterface.java          |  8 +++---
 .../JKleppmannTreePeriodicPushOp.java         |  4 +--
 .../structs/JKleppmannTreeNode.java           |  9 +++----
 .../structs/JKleppmannTreePersistentData.java |  6 ++---
 .../dhfs/jmap/JMapHolderRefcounterTxHook.java |  7 +++--
 .../java/com/usatiuk/dhfs/jmap/JMapRef.java   |  4 +--
 .../dhfs/jmap/JMapRefcounterTxHook.java       |  5 ++--
 .../peerdiscovery/IpPeerAddress.java          |  4 +--
 .../peerdiscovery/PeerAddrStringHelper.java   |  4 +--
 .../peerdiscovery/PeerAddress.java            |  4 +--
 .../peerdiscovery/PeerAddressType.java        |  2 +-
 .../peerdiscovery/PeerDiscoveryDirectory.java |  4 +--
 .../PersistentStaticPeerDiscovery.java        |  4 +--
 .../peerdiscovery/StaticPeerDiscovery.java    |  2 +-
 .../local/LocalPeerDiscoveryBroadcaster.java  |  6 ++---
 .../local/LocalPeerDiscoveryClient.java       | 12 ++++-----
 .../InitialSyncProcessor.java                 |  3 +--
 .../PeerConnectedEventListener.java           |  4 +--
 .../PeerDisconnectedEventListener.java        |  4 +--
 .../usatiuk/dhfs/{ => peersync}/PeerId.java   |  3 +--
 .../{repository => }/peersync/PeerInfo.java   | 11 ++++----
 .../peersync/PeerInfoProtoSerializer.java     |  4 +--
 .../peersync/PeerInfoService.java             |  8 +++---
 .../peersync/PeerInfoSyncHandler.java         | 14 +++++-----
 .../{repository => peersync}/PeerManager.java | 27 ++++++++++---------
 .../PersistentPeerDataService.java            | 14 +++++-----
 .../PersistentRemoteHostsData.java            |  7 ++---
 .../peersync/api/ApiPeerInfo.java             |  2 +-
 .../peersync/api/PeerSyncApi.java             |  4 +--
 .../peersync/api/PeerSyncApiClient.java       |  2 +-
 .../api/PeerSyncApiClientDynamic.java         |  6 ++---
 .../structs/JKleppmannTreeNodeMetaPeer.java   |  4 +--
 .../CertificateTools.java                     |  2 +-
 .../peertrust/PeerInfoCertUpdateTxHook.java   | 15 +++++------
 .../peertrust/PeerRolesAugmentor.java         |  6 ++---
 .../peertrust/PeerTrustManager.java           |  6 ++---
 .../peertrust/PeerTrustServerCustomizer.java  |  4 +--
 .../dhfs/{ => refcount}/DeleterTxHook.java    |  5 ++--
 .../dhfs/{ => refcount}/JDataNormalRef.java   |  3 +--
 .../usatiuk/dhfs/{ => refcount}/JDataRef.java |  2 +-
 .../dhfs/{ => refcount}/JDataRefcounted.java  |  2 +-
 .../dhfs/{ => refcount}/RefcounterTxHook.java |  4 +--
 .../{ => remoteobj}/ConflictResolver.java     |  4 ++-
 .../DefaultObjSyncHandler.java                |  8 +++---
 .../dhfs/{ => remoteobj}/JDataRemote.java     |  3 +--
 .../JDataRemoteDto.java                       |  4 +--
 .../JDataRemotePush.java                      |  2 +-
 .../ObjSyncHandler.java                       |  5 ++--
 .../dhfs/{ => remoteobj}/ReceivedObject.java  |  4 +--
 .../RemoteObjPusherTxHook.java                |  5 ++--
 .../RemoteObjectDataWrapper.java              |  4 ++-
 .../{ => remoteobj}/RemoteObjectDeleter.java  | 14 +++++-----
 .../RemoteObjectInitialSyncProcessor.java     |  9 ++++---
 .../{ => remoteobj}/RemoteObjectMeta.java     |  5 +++-
 .../{ => remoteobj}/RemoteTransaction.java    |  8 +++---
 .../SyncHandler.java                          | 11 ++++----
 .../SyncHandlerService.java                   |  2 +-
 .../{repository => remoteobj}/SyncHelper.java |  4 +--
 .../dhfs/repository/syncmap/DtoMapper.java    | 10 -------
 .../RemoteObjectServiceClient.java            | 16 ++++++++---
 .../RemoteObjectServiceServer.java            |  5 ++--
 .../RemoteObjectServiceServerImpl.java        | 13 ++++++---
 .../RpcChannelFactory.java                    |  7 ++---
 .../{repository => rpc}/RpcClientFactory.java | 11 +++++---
 .../TemporaryReceivedObjectSerializer.java    |  8 +++---
 .../TemporaryRemoteObjectSerializer.java      |  5 ++--
 .../com/usatiuk/dhfs/syncmap/DtoMapper.java   | 10 +++++++
 .../syncmap/DtoMapperService.java             |  6 ++---
 .../webapi/KnownPeerDelete.java               |  2 +-
 .../webapi/KnownPeerInfo.java                 |  2 +-
 .../{repository => }/webapi/KnownPeerPut.java |  2 +-
 .../{repository => }/webapi/KnownPeers.java   |  2 +-
 .../webapi/PeerAddressInfo.java               |  2 +-
 .../{repository => }/webapi/PeerInfo.java     |  2 +-
 .../webapi/PeerManagementApi.java             | 11 ++++----
 .../webapi/PersistentPeerAddressApi.java      | 12 ++++-----
 .../src/main/proto/dhfs_peer_discovery.proto  |  2 +-
 .../java/com/usatiuk/dhfs/RefcounterTest.java |  1 +
 .../usatiuk/dhfs/testobjs/TestRefcount.java   |  4 +--
 .../utils/AutoCloseableNoThrow.java           |  2 +-
 .../usatiuk/{dhfs => }/utils/ByteUtils.java   |  2 +-
 .../usatiuk/{dhfs => }/utils/DataLocker.java  |  3 +--
 .../utils/HashSetDelayedBlockingQueue.java    |  2 +-
 .../{dhfs => }/utils/RefcountedCloseable.java |  2 +-
 .../{dhfs => }/utils/SerializationHelper.java |  2 +-
 .../StatusRuntimeExceptionNoStacktrace.java   |  2 +-
 .../com/usatiuk/{dhfs => }/utils/VoidFn.java  |  2 +-
 .../{dhfs => }/utils/VoidFnThrows.java        |  2 +-
 .../HashSetDelayedBlockingQueueTest.java      |  2 +-
 webui/src/PeerKnownCard.tsx                   | 16 +++++------
 webui/src/PeerState.tsx                       |  4 +--
 158 files changed, 412 insertions(+), 416 deletions(-)
 rename dhfs-parent/dhfs-app/src/main/java/com/usatiuk/{dhfs/app => dhfsapp}/Main.java (94%)
 rename dhfs-parent/{dhfs-fuse/src/test/java/com/usatiuk/dhfs => dhfs-app/src/test/java/com/usatiuk/dhfsapp}/TempDataProfile.java (96%)
 rename dhfs-parent/dhfs-app/src/test/java/com/usatiuk/{dhfs => dhfsapp}/TestDataCleaner.java (97%)
 rename dhfs-parent/dhfs-app/src/test/java/com/usatiuk/{dhfs => dhfsapp}/integration/DhfsFuseIT.java (99%)
 rename dhfs-parent/dhfs-app/src/test/java/com/usatiuk/{dhfs => dhfsapp}/integration/DhfsFusex3IT.java (99%)
 rename dhfs-parent/dhfs-app/src/test/java/com/usatiuk/{dhfs => dhfsapp}/integration/DhfsImage.java (99%)
 rename dhfs-parent/dhfs-app/src/test/java/com/usatiuk/{dhfs => dhfsapp}/integration/KillIT.java (99%)
 rename dhfs-parent/dhfs-app/src/test/java/com/usatiuk/{dhfs => dhfsapp}/integration/LazyFs.java (99%)
 rename dhfs-parent/dhfs-app/src/test/java/com/usatiuk/{dhfs => dhfsapp}/integration/LazyFsIT.java (98%)
 rename dhfs-parent/dhfs-app/src/test/java/com/usatiuk/{dhfs => dhfsapp}/integration/ResyncIT.java (99%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/objects/ChunkData.java (66%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/objects/ChunkDataProtoSerializer.java (95%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/objects/File.java (90%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/objects/FileDto.java (69%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/objects/FileDtoMapper.java (84%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/objects/FileHelper.java (96%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/objects/FileProtoSerializer.java (88%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/objects/FileSyncHandler.java (95%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/service/DhfsFileService.java (96%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/service/DhfsFileServiceImpl.java (98%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/service/DirectoryNotEmptyException.java (80%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/service/GetattrRes.java (67%)
 rename dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/{dhfs/files => dhfsfs}/service/GetattrType.java (62%)
 rename dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/{dhfs/files => dhfsfs}/DhfsFileServiceSimpleTest.java (88%)
 rename dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/{dhfs/files => dhfsfs}/DhfsFileServiceSimpleTestImpl.java (98%)
 rename dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/{dhfs/files => dhfsfs}/DhfsFileServiceSimpleTestNoChunkingTest.java (89%)
 rename dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/{dhfs/files => dhfsfs}/DhfsFileServiceSimpleTestSmallChunkingTest.java (89%)
 rename dhfs-parent/{dhfs-app/src/test/java/com/usatiuk/dhfs => dhfs-fs/src/test/java/com/usatiuk/dhfsfs}/TempDataProfile.java (97%)
 rename dhfs-parent/{dhfs-fuse/src/test/java/com/usatiuk/dhfs => dhfs-fs/src/test/java/com/usatiuk/dhfsfs}/TestDataCleaner.java (97%)
 rename dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/{dhfs => dhfsfs}/benchmarks/Benchmarker.java (98%)
 rename dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/{dhfs => dhfsfs}/benchmarks/DhfsFileBenchmarkTest.java (92%)
 rename dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/{dhfs/fuse => dhfsfuse}/DhfsFuse.java (98%)
 rename dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/{dhfs/fuse => dhfsfuse}/JnrPtrByteOutput.java (98%)
 rename dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/{dhfs/fuse => dhfsfuse}/JnrPtrByteOutputAccessors.java (95%)
 rename dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/{dhfs/fuse => dhfsfuse}/DhfsFuseTest.java (97%)
 rename dhfs-parent/{dhfs-fs/src/test/java/com/usatiuk/dhfs => dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse}/TempDataProfile.java (96%)
 rename dhfs-parent/{dhfs-fs/src/test/java/com/usatiuk/dhfs => dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse}/TestDataCleaner.java (97%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => autosync}/AutosyncProcessor.java (95%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => autosync}/AutosyncTxHook.java (87%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/DeferredInvalidationQueueData.java (84%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/DeferredInvalidationQueueService.java (92%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/IndexUpdateOp.java (71%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/InvalidationQueueEntry.java (66%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/InvalidationQueueService.java (95%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/Op.java (79%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/OpExtractor.java (72%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/OpExtractorService.java (92%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/OpHandler.java (93%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/PushOpHandler.java (72%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/invalidation/RemoteObjectMetaOpExtractor.java (80%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peerdiscovery/IpPeerAddress.java (80%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peerdiscovery/PeerAddrStringHelper.java (93%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peerdiscovery/PeerAddress.java (61%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peerdiscovery/PeerAddressType.java (54%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peerdiscovery/PeerDiscoveryDirectory.java (97%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peerdiscovery/PersistentStaticPeerDiscovery.java (84%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peerdiscovery/StaticPeerDiscovery.java (94%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java (94%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peerdiscovery/local/LocalPeerDiscoveryClient.java (88%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => peersync}/InitialSyncProcessor.java (77%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => peersync}/PeerConnectedEventListener.java (57%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => peersync}/PeerDisconnectedEventListener.java (58%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => peersync}/PeerId.java (88%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peersync/PeerInfo.java (70%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peersync/PeerInfoProtoSerializer.java (87%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peersync/PeerInfoService.java (95%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peersync/PeerInfoSyncHandler.java (93%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => peersync}/PeerManager.java (88%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => peersync}/PersistentPeerDataService.java (95%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => peersync}/PersistentRemoteHostsData.java (87%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peersync/api/ApiPeerInfo.java (54%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peersync/api/PeerSyncApi.java (85%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peersync/api/PeerSyncApiClient.java (77%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peersync/api/PeerSyncApiClientDynamic.java (84%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peersync/structs/JKleppmannTreeNodeMetaPeer.java (94%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => peertrust}/CertificateTools.java (98%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peertrust/PeerInfoCertUpdateTxHook.java (86%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peertrust/PeerRolesAugmentor.java (92%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peertrust/PeerTrustManager.java (93%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/peertrust/PeerTrustServerCustomizer.java (93%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => refcount}/DeleterTxHook.java (92%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => refcount}/JDataNormalRef.java (88%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => refcount}/JDataRef.java (82%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => refcount}/JDataRefcounted.java (93%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => refcount}/RefcounterTxHook.java (96%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => remoteobj}/ConflictResolver.java (61%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => remoteobj}/DefaultObjSyncHandler.java (95%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => remoteobj}/JDataRemote.java (87%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => remoteobj}/JDataRemoteDto.java (78%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => remoteobj}/JDataRemotePush.java (87%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => remoteobj}/ObjSyncHandler.java (77%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => remoteobj}/ReceivedObject.java (60%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => remoteobj}/RemoteObjPusherTxHook.java (90%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => remoteobj}/RemoteObjectDataWrapper.java (89%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => remoteobj}/RemoteObjectDeleter.java (96%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => remoteobj}/RemoteObjectInitialSyncProcessor.java (81%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => remoteobj}/RemoteObjectMeta.java (95%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{ => remoteobj}/RemoteTransaction.java (96%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => remoteobj}/SyncHandler.java (95%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => remoteobj}/SyncHandlerService.java (75%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => remoteobj}/SyncHelper.java (93%)
 delete mode 100644 dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapper.java
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => rpc}/RemoteObjectServiceClient.java (90%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => rpc}/RemoteObjectServiceServer.java (92%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => rpc}/RemoteObjectServiceServerImpl.java (93%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => rpc}/RpcChannelFactory.java (89%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => rpc}/RpcClientFactory.java (92%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => rpc}/TemporaryReceivedObjectSerializer.java (87%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => rpc}/TemporaryRemoteObjectSerializer.java (84%)
 create mode 100644 dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/syncmap/DtoMapper.java
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/syncmap/DtoMapperService.java (94%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/webapi/KnownPeerDelete.java (52%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/webapi/KnownPeerInfo.java (72%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/webapi/KnownPeerPut.java (50%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/webapi/KnownPeers.java (69%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/webapi/PeerAddressInfo.java (59%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/webapi/PeerInfo.java (56%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/webapi/PeerManagementApi.java (87%)
 rename dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/{repository => }/webapi/PersistentPeerAddressApi.java (82%)
 rename dhfs-parent/utils/src/main/java/com/usatiuk/{dhfs => }/utils/AutoCloseableNoThrow.java (75%)
 rename dhfs-parent/utils/src/main/java/com/usatiuk/{dhfs => }/utils/ByteUtils.java (93%)
 rename dhfs-parent/utils/src/main/java/com/usatiuk/{dhfs => }/utils/DataLocker.java (97%)
 rename dhfs-parent/utils/src/main/java/com/usatiuk/{dhfs => }/utils/HashSetDelayedBlockingQueue.java (99%)
 rename dhfs-parent/utils/src/main/java/com/usatiuk/{dhfs => }/utils/RefcountedCloseable.java (97%)
 rename dhfs-parent/utils/src/main/java/com/usatiuk/{dhfs => }/utils/SerializationHelper.java (97%)
 rename dhfs-parent/utils/src/main/java/com/usatiuk/{dhfs => }/utils/StatusRuntimeExceptionNoStacktrace.java (94%)
 rename dhfs-parent/utils/src/main/java/com/usatiuk/{dhfs => }/utils/VoidFn.java (68%)
 rename dhfs-parent/utils/src/main/java/com/usatiuk/{dhfs => }/utils/VoidFnThrows.java (74%)
 rename dhfs-parent/utils/src/test/java/com/usatiuk/{dhfs => }/utils/HashSetDelayedBlockingQueueTest.java (99%)

diff --git a/dhfs-parent/.run/Main 2.run.xml b/dhfs-parent/.run/Main 2.run.xml
index a639a231..67ea3715 100644
--- a/dhfs-parent/.run/Main 2.run.xml	
+++ b/dhfs-parent/.run/Main 2.run.xml	
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Main 2" type="QsApplicationConfigurationType" factoryName="QuarkusApplication">
-    <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfs.app.Main" />
+    <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfsapp.Main" />
     <module name="dhfs-app" />
-    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/2/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/2/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/2/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=false -Dquarkus.http.port=9020 -Dquarkus.http.ssl-port=9021 -Ddhfs.peerdiscovery.preset-uuid=22000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=11000000-0000-0000-0000-000000000000:127.0.0.1:8080:9011" />
+    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/2/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/2/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/2/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=false -Dquarkus.http.port=9020 -Dquarkus.http.ssl-port=9021 -Ddhfs.peerdiscovery.preset-uuid=22000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=11000000-0000-0000-0000-000000000000:127.0.0.1:9010:9011" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="com.usatiuk.dhfs.*" />
+        <option name="PATTERN" value="com.usatiuk.dhfs.remoteobj.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
diff --git a/dhfs-parent/.run/Main.run.xml b/dhfs-parent/.run/Main.run.xml
index 9ea182c2..601c96ed 100644
--- a/dhfs-parent/.run/Main.run.xml
+++ b/dhfs-parent/.run/Main.run.xml
@@ -1,11 +1,11 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Main" type="QsApplicationConfigurationType" factoryName="QuarkusApplication" nameIsGenerated="true">
-    <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfs.app.Main" />
+    <option name="MAIN_CLASS_NAME" value="com.usatiuk.dhfsapp.Main" />
     <module name="dhfs-app" />
-    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions --enable-preview -XX:+UseParallelGC -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/1/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/1/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/1/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=true -Dquarkus.http.port=8080 -Dquarkus.http.ssl-port=9011 -Ddhfs.peerdiscovery.preset-uuid=11000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=22000000-0000-0000-0000-000000000000:127.0.0.1:9020:9021 -Dquarkus.http.host=0.0.0.0" />
+    <option name="VM_PARAMETERS" value="-XX:+UnlockDiagnosticVMOptions -XX:+UseParallelGC -XX:+DebugNonSafepoints --add-exports java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-exports java.base/jdk.internal.access=ALL-UNNAMED -ea -Xmx2G -Ddhfs.webui.root=$ProjectFileDir$/../webui/dist -Ddhfs.fuse.root=${HOME}/dhfs_test/1/fuse -Ddhfs.objects.persistence.files.root=${HOME}/dhfs_test/1/data -Ddhfs.objects.persistence.stuff.root=${HOME}/dhfs_test/1/data/stuff -Ddhfs.objects.peerdiscovery.broadcast=true -Dquarkus.http.port=9010 -Dquarkus.http.ssl-port=9011 -Ddhfs.peerdiscovery.preset-uuid=11000000-0000-0000-0000-000000000000 -Ddhfs.peerdiscovery.static-peers=22000000-0000-0000-0000-000000000000:127.0.0.1:9020:9021 -Dquarkus.http.host=0.0.0.0" />
     <extension name="coverage">
       <pattern>
-        <option name="PATTERN" value="com.usatiuk.dhfs.*" />
+        <option name="PATTERN" value="com.usatiuk.dhfs.remoteobj.*" />
         <option name="ENABLED" value="true" />
       </pattern>
     </extension>
diff --git a/dhfs-parent/dhfs-app/src/main/java/com/usatiuk/dhfs/app/Main.java b/dhfs-parent/dhfs-app/src/main/java/com/usatiuk/dhfsapp/Main.java
similarity index 94%
rename from dhfs-parent/dhfs-app/src/main/java/com/usatiuk/dhfs/app/Main.java
rename to dhfs-parent/dhfs-app/src/main/java/com/usatiuk/dhfsapp/Main.java
index f3b6a13e..5fac1b2a 100644
--- a/dhfs-parent/dhfs-app/src/main/java/com/usatiuk/dhfs/app/Main.java
+++ b/dhfs-parent/dhfs-app/src/main/java/com/usatiuk/dhfsapp/Main.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.app;
+package com.usatiuk.dhfsapp;
 
 import io.quarkus.runtime.Quarkus;
 import io.quarkus.runtime.QuarkusApplication;
diff --git a/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TempDataProfile.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/TempDataProfile.java
similarity index 96%
rename from dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
rename to dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/TempDataProfile.java
index e5a9f59b..649499ce 100644
--- a/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/TempDataProfile.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsapp;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/TestDataCleaner.java
similarity index 97%
rename from dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
rename to dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/TestDataCleaner.java
index 8ca6292d..fc819a74 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/TestDataCleaner.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsapp;
 
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/DhfsFuseIT.java
similarity index 99%
rename from dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java
rename to dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/DhfsFuseIT.java
index d7e4b894..40c0c1ae 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFuseIT.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/DhfsFuseIT.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsapp.integration;
 
 import com.github.dockerjava.api.model.Device;
 import io.quarkus.logging.Log;
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/DhfsFusex3IT.java
similarity index 99%
rename from dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java
rename to dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/DhfsFusex3IT.java
index 41d6d177..717d11f2 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsFusex3IT.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/DhfsFusex3IT.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsapp.integration;
 
 import com.github.dockerjava.api.model.Device;
 import io.quarkus.logging.Log;
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsImage.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/DhfsImage.java
similarity index 99%
rename from dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsImage.java
rename to dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/DhfsImage.java
index 8ee5d850..a4ae3054 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/DhfsImage.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/DhfsImage.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsapp.integration;
 
 import io.quarkus.logging.Log;
 import org.jetbrains.annotations.NotNull;
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/KillIT.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/KillIT.java
similarity index 99%
rename from dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/KillIT.java
rename to dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/KillIT.java
index ee8d1aa1..01eb29ae 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/KillIT.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/KillIT.java
@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsapp.integration;
 
 import com.github.dockerjava.api.model.Device;
-import com.usatiuk.dhfs.TestDataCleaner;
+import com.usatiuk.dhfsapp.TestDataCleaner;
 import io.quarkus.logging.Log;
 import org.junit.jupiter.api.*;
 import org.slf4j.LoggerFactory;
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFs.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/LazyFs.java
similarity index 99%
rename from dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFs.java
rename to dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/LazyFs.java
index 567242b4..59dddffc 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFs.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/LazyFs.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsapp.integration;
 
 import io.quarkus.logging.Log;
 
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFsIT.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/LazyFsIT.java
similarity index 98%
rename from dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFsIT.java
rename to dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/LazyFsIT.java
index cf91a746..99396670 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/LazyFsIT.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/LazyFsIT.java
@@ -1,13 +1,10 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsapp.integration;
 
 import com.github.dockerjava.api.model.Device;
-import com.usatiuk.dhfs.TestDataCleaner;
+import com.usatiuk.dhfsapp.TestDataCleaner;
 import io.quarkus.logging.Log;
 import org.junit.jupiter.api.*;
-import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.slf4j.LoggerFactory;
 import org.testcontainers.DockerClientFactory;
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/ResyncIT.java b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/ResyncIT.java
similarity index 99%
rename from dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/ResyncIT.java
rename to dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/ResyncIT.java
index 6f80d7b8..398c37cd 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/integration/ResyncIT.java
+++ b/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfsapp/integration/ResyncIT.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.integration;
+package com.usatiuk.dhfsapp.integration;
 
 import com.github.dockerjava.api.model.Device;
 import org.junit.jupiter.api.*;
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/ChunkData.java
similarity index 66%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/ChunkData.java
index 868c5190..78930fdb 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkData.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/ChunkData.java
@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
 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.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
 
 public record ChunkData(JObjectKey key, ByteString data) implements JDataRemote, JDataRemoteDto {
     @Override
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/ChunkDataProtoSerializer.java
similarity index 95%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/ChunkDataProtoSerializer.java
index 9e83c980..f83ae380 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/ChunkDataProtoSerializer.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/ChunkDataProtoSerializer.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
 import com.usatiuk.dhfs.ProtoSerializer;
 import com.usatiuk.objects.JObjectKey;
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/File.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/File.java
similarity index 90%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/File.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/File.java
index a4d0a6b1..defd8489 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/File.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/File.java
@@ -1,9 +1,9 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
-import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.dhfs.remoteobj.JDataRemote;
 import com.usatiuk.dhfs.jmap.JMapHolder;
 import com.usatiuk.dhfs.jmap.JMapLongKey;
-import com.usatiuk.dhfs.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
 import com.usatiuk.objects.JObjectKey;
 
 import java.util.Collection;
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileDto.java
similarity index 69%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileDto.java
index 1a8f66ea..1e5b4565 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDto.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileDto.java
@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
-import com.usatiuk.dhfs.JDataRemote;
+import com.usatiuk.dhfs.remoteobj.JDataRemote;
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.repository.JDataRemoteDto;
+import com.usatiuk.dhfs.remoteobj.JDataRemoteDto;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.List;
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileDtoMapper.java
similarity index 84%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileDtoMapper.java
index 04b34ddf..2a447248 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileDtoMapper.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileDtoMapper.java
@@ -1,7 +1,7 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
 import com.usatiuk.dhfs.jmap.JMapHelper;
-import com.usatiuk.dhfs.repository.syncmap.DtoMapper;
+import com.usatiuk.dhfs.syncmap.DtoMapper;
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileHelper.java
similarity index 96%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileHelper.java
index 20455770..a59cbb97 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileHelper.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileHelper.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.dhfs.jmap.JMapHelper;
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileProtoSerializer.java
similarity index 88%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileProtoSerializer.java
index 5460f266..e9b86c40 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileProtoSerializer.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileProtoSerializer.java
@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.objects;
 
 import com.usatiuk.dhfs.ProtoSerializer;
 import com.usatiuk.dhfs.persistence.FileDtoP;
-import com.usatiuk.dhfs.utils.SerializationHelper;
+import com.usatiuk.utils.SerializationHelper;
 import jakarta.inject.Singleton;
 
 import java.io.IOException;
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileSyncHandler.java
similarity index 95%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileSyncHandler.java
index 47873262..e1524951 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/objects/FileSyncHandler.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/objects/FileSyncHandler.java
@@ -1,16 +1,16 @@
-package com.usatiuk.dhfs.files.objects;
+package com.usatiuk.dhfsfs.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.peersync.PeerId;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectDataWrapper;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
+import com.usatiuk.dhfsfs.service.DhfsFileService;
 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.remoteobj.ObjSyncHandler;
+import com.usatiuk.dhfs.peersync.PersistentPeerDataService;
+import com.usatiuk.dhfs.remoteobj.SyncHelper;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.transaction.LockingStrategy;
 import com.usatiuk.objects.transaction.Transaction;
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileService.java
similarity index 96%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileService.java
index 909ca7f0..b5e18da8 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileService.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileService.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files.service;
+package com.usatiuk.dhfsfs.service;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.UnsafeByteOperations;
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileServiceImpl.java
similarity index 98%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileServiceImpl.java
index 258396a0..8004ab0c 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DhfsFileServiceImpl.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DhfsFileServiceImpl.java
@@ -1,12 +1,12 @@
-package com.usatiuk.dhfs.files.service;
+package com.usatiuk.dhfsfs.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.remoteobj.JDataRemote;
+import com.usatiuk.dhfs.remoteobj.RemoteObjectMeta;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
+import com.usatiuk.dhfsfs.objects.ChunkData;
+import com.usatiuk.dhfsfs.objects.File;
 import com.usatiuk.dhfs.jkleppmanntree.JKleppmannTreeManager;
 import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNode;
 import com.usatiuk.dhfs.jkleppmanntree.structs.JKleppmannTreeNodeMeta;
@@ -15,7 +15,7 @@ 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.utils.StatusRuntimeExceptionNoStacktrace;
+import com.usatiuk.utils.StatusRuntimeExceptionNoStacktrace;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.IteratorStart;
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DirectoryNotEmptyException.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DirectoryNotEmptyException.java
similarity index 80%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DirectoryNotEmptyException.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DirectoryNotEmptyException.java
index f13096f9..f0c47a9c 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/DirectoryNotEmptyException.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/DirectoryNotEmptyException.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files.service;
+package com.usatiuk.dhfsfs.service;
 
 public class DirectoryNotEmptyException extends RuntimeException {
     @Override
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrRes.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/GetattrRes.java
similarity index 67%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrRes.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/GetattrRes.java
index 3240a6b4..11b8e5fa 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrRes.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/GetattrRes.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files.service;
+package com.usatiuk.dhfsfs.service;
 
 public record GetattrRes(long mtime, long ctime, long mode, GetattrType type) {
 }
diff --git a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrType.java b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/GetattrType.java
similarity index 62%
rename from dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrType.java
rename to dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/GetattrType.java
index ebcd4868..b5660f4d 100644
--- a/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfs/files/service/GetattrType.java
+++ b/dhfs-parent/dhfs-fs/src/main/java/com/usatiuk/dhfsfs/service/GetattrType.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files.service;
+package com.usatiuk.dhfsfs.service;
 
 public enum GetattrType {
     FILE,
diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTest.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTest.java
similarity index 88%
rename from dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTest.java
rename to dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTest.java
index 93cc42b8..4b5c415f 100644
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTest.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTest.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestImpl.java
similarity index 98%
rename from dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java
rename to dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestImpl.java
index 72c2a4d3..731b09b3 100644
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestImpl.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestImpl.java
@@ -1,9 +1,8 @@
-package com.usatiuk.dhfs.files;
+package com.usatiuk.dhfsfs;
 
-import com.usatiuk.dhfs.RemoteTransaction;
-import com.usatiuk.dhfs.TempDataProfile;
-import com.usatiuk.dhfs.files.objects.File;
-import com.usatiuk.dhfs.files.service.DhfsFileService;
+import com.usatiuk.dhfs.remoteobj.RemoteTransaction;
+import com.usatiuk.dhfsfs.objects.File;
+import com.usatiuk.dhfsfs.service.DhfsFileService;
 import com.usatiuk.kleppmanntree.AlreadyExistsException;
 import com.usatiuk.objects.transaction.Transaction;
 import com.usatiuk.objects.transaction.TransactionManager;
diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestNoChunkingTest.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestNoChunkingTest.java
similarity index 89%
rename from dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestNoChunkingTest.java
rename to dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestNoChunkingTest.java
index 5aab68e4..cce7267c 100644
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestNoChunkingTest.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestNoChunkingTest.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestSmallChunkingTest.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestSmallChunkingTest.java
similarity index 89%
rename from dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestSmallChunkingTest.java
rename to dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestSmallChunkingTest.java
index 2d9fdd78..96f78012 100644
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/files/DhfsFileServiceSimpleTestSmallChunkingTest.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/DhfsFileServiceSimpleTestSmallChunkingTest.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.files;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
diff --git a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TempDataProfile.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TempDataProfile.java
similarity index 97%
rename from dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
rename to dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TempDataProfile.java
index e5a9f59b..4adad4b4 100644
--- a/dhfs-parent/dhfs-app/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TempDataProfile.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 
diff --git a/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TestDataCleaner.java
similarity index 97%
rename from dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
rename to dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TestDataCleaner.java
index b3659d01..1071102b 100644
--- a/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/TestDataCleaner.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsfs;
 
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;
diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/Benchmarker.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/Benchmarker.java
similarity index 98%
rename from dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/Benchmarker.java
rename to dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/Benchmarker.java
index 86ad0fb3..75a6c903 100644
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/Benchmarker.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/Benchmarker.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.benchmarks;
+package com.usatiuk.dhfsfs.benchmarks;
 
 import io.quarkus.logging.Log;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/DhfsFileBenchmarkTest.java
similarity index 92%
rename from dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java
rename to dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/DhfsFileBenchmarkTest.java
index 38bb021b..17e979f1 100644
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/benchmarks/DhfsFileBenchmarkTest.java
+++ b/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfsfs/benchmarks/DhfsFileBenchmarkTest.java
@@ -1,8 +1,8 @@
-package com.usatiuk.dhfs.benchmarks;
+package com.usatiuk.dhfsfs.benchmarks;
 
 import com.google.protobuf.UnsafeByteOperations;
-import com.usatiuk.dhfs.TempDataProfile;
-import com.usatiuk.dhfs.files.service.DhfsFileService;
+import com.usatiuk.dhfsfs.TempDataProfile;
+import com.usatiuk.dhfsfs.service.DhfsFileService;
 import com.usatiuk.objects.JObjectKey;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
diff --git a/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/DhfsFuse.java b/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/DhfsFuse.java
similarity index 98%
rename from dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/DhfsFuse.java
rename to dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/DhfsFuse.java
index eade8694..ccc92e29 100644
--- a/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/DhfsFuse.java
+++ b/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/DhfsFuse.java
@@ -1,10 +1,10 @@
-package com.usatiuk.dhfs.fuse;
+package com.usatiuk.dhfsfuse;
 
 import com.google.protobuf.UnsafeByteOperations;
 import com.sun.security.auth.module.UnixSystem;
-import com.usatiuk.dhfs.files.service.DhfsFileService;
-import com.usatiuk.dhfs.files.service.DirectoryNotEmptyException;
-import com.usatiuk.dhfs.files.service.GetattrRes;
+import com.usatiuk.dhfsfs.service.DhfsFileService;
+import com.usatiuk.dhfsfs.service.DirectoryNotEmptyException;
+import com.usatiuk.dhfsfs.service.GetattrRes;
 import com.usatiuk.kleppmanntree.AlreadyExistsException;
 import com.usatiuk.objects.JObjectKey;
 import io.grpc.Status;
diff --git a/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutput.java b/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/JnrPtrByteOutput.java
similarity index 98%
rename from dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutput.java
rename to dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/JnrPtrByteOutput.java
index 51be0f7a..77fc38a1 100644
--- a/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutput.java
+++ b/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/JnrPtrByteOutput.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.fuse;
+package com.usatiuk.dhfsfuse;
 
 import com.google.protobuf.ByteOutput;
 import jnr.ffi.Pointer;
diff --git a/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutputAccessors.java b/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/JnrPtrByteOutputAccessors.java
similarity index 95%
rename from dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutputAccessors.java
rename to dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/JnrPtrByteOutputAccessors.java
index 6ec005d7..ab89b006 100644
--- a/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfs/fuse/JnrPtrByteOutputAccessors.java
+++ b/dhfs-parent/dhfs-fuse/src/main/java/com/usatiuk/dhfsfuse/JnrPtrByteOutputAccessors.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.fuse;
+package com.usatiuk.dhfsfuse;
 
 import jakarta.inject.Singleton;
 import jdk.internal.access.JavaNioAccess;
diff --git a/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/fuse/DhfsFuseTest.java b/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/DhfsFuseTest.java
similarity index 97%
rename from dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/fuse/DhfsFuseTest.java
rename to dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/DhfsFuseTest.java
index df800321..e78fa8e8 100644
--- a/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfs/fuse/DhfsFuseTest.java
+++ b/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/DhfsFuseTest.java
@@ -1,6 +1,5 @@
-package com.usatiuk.dhfs.fuse;
+package com.usatiuk.dhfsfuse;
 
-import com.usatiuk.dhfs.TempDataProfile;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.TestProfile;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TempDataProfile.java b/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TempDataProfile.java
similarity index 96%
rename from dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
rename to dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TempDataProfile.java
index e5a9f59b..7fdd99d3 100644
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TempDataProfile.java
+++ b/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TempDataProfile.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsfuse;
 
 import io.quarkus.test.junit.QuarkusTestProfile;
 
diff --git a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java b/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TestDataCleaner.java
similarity index 97%
rename from dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
rename to dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TestDataCleaner.java
index b3659d01..23c970e3 100644
--- a/dhfs-parent/dhfs-fs/src/test/java/com/usatiuk/dhfs/TestDataCleaner.java
+++ b/dhfs-parent/dhfs-fuse/src/test/java/com/usatiuk/dhfsfuse/TestDataCleaner.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs;
+package com.usatiuk.dhfsfuse;
 
 import io.quarkus.logging.Log;
 import io.quarkus.runtime.ShutdownEvent;
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JavaDataSerializer.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JavaDataSerializer.java
index 21e6086e..b519521f 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JavaDataSerializer.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/JavaDataSerializer.java
@@ -2,7 +2,7 @@ package com.usatiuk.objects;
 
 
 import com.google.protobuf.ByteString;
-import com.usatiuk.dhfs.utils.SerializationHelper;
+import com.usatiuk.utils.SerializationHelper;
 import io.quarkus.arc.DefaultBean;
 import jakarta.enterprise.context.ApplicationScoped;
 
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java
index e6cbb19b..f04bcb26 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/iterators/CloseableKvIterator.java
@@ -1,6 +1,6 @@
 package com.usatiuk.objects.iterators;
 
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
+import com.usatiuk.utils.AutoCloseableNoThrow;
 import org.apache.commons.lang3.tuple.Pair;
 
 import java.util.Iterator;
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java
index 38f93045..6b1a6bdd 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/snapshot/Snapshot.java
@@ -1,9 +1,8 @@
 package com.usatiuk.objects.snapshot;
 
-import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.iterators.CloseableKvIterator;
 import com.usatiuk.objects.iterators.IteratorStart;
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
+import com.usatiuk.utils.AutoCloseableNoThrow;
 
 import javax.annotation.Nonnull;
 import java.util.Optional;
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java
index 512d2cd6..ac06ef7e 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/stores/LmdbObjectPersistentStore.java
@@ -2,7 +2,7 @@ package com.usatiuk.objects.stores;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.UnsafeByteOperations;
-import com.usatiuk.dhfs.utils.RefcountedCloseable;
+import com.usatiuk.utils.RefcountedCloseable;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.JObjectKeyMax;
 import com.usatiuk.objects.JObjectKeyMin;
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
index 355d5dd2..c4b58680 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/JObjectManager.java
@@ -1,6 +1,6 @@
 package com.usatiuk.objects.transaction;
 
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
+import com.usatiuk.utils.AutoCloseableNoThrow;
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JDataVersionedWrapper;
 import com.usatiuk.objects.JObjectKey;
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java
index 905ca2a2..ab2eed3b 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/LockManager.java
@@ -1,11 +1,10 @@
 package com.usatiuk.objects.transaction;
 
 import com.usatiuk.objects.JObjectKey;
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
-import com.usatiuk.dhfs.utils.DataLocker;
+import com.usatiuk.utils.AutoCloseableNoThrow;
+import com.usatiuk.utils.DataLocker;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
-import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Singleton;
 
 @Singleton
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java
index 770ac82f..3ae998a0 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionManager.java
@@ -1,6 +1,6 @@
 package com.usatiuk.objects.transaction;
 
-import com.usatiuk.dhfs.utils.VoidFn;
+import com.usatiuk.utils.VoidFn;
 import io.quarkus.logging.Log;
 
 import java.util.function.Supplier;
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectLocked.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectLocked.java
index 75b5fe38..f4abdf47 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectLocked.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionObjectLocked.java
@@ -2,7 +2,7 @@ package com.usatiuk.objects.transaction;
 
 import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JDataVersionedWrapper;
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
+import com.usatiuk.utils.AutoCloseableNoThrow;
 
 import java.util.Optional;
 
diff --git a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionPrivate.java b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionPrivate.java
index 52a4ef9b..bbae2c18 100644
--- a/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionPrivate.java
+++ b/dhfs-parent/objects/src/main/java/com/usatiuk/objects/transaction/TransactionPrivate.java
@@ -4,7 +4,7 @@ import com.usatiuk.objects.JData;
 import com.usatiuk.objects.JDataVersionedWrapper;
 import com.usatiuk.objects.JObjectKey;
 import com.usatiuk.objects.snapshot.Snapshot;
-import com.usatiuk.dhfs.utils.AutoCloseableNoThrow;
+import com.usatiuk.utils.AutoCloseableNoThrow;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/dhfs-parent/pom.xml b/dhfs-parent/pom.xml
index aa87de41..2fa02021 100644
--- a/dhfs-parent/pom.xml
+++ b/dhfs-parent/pom.xml
@@ -178,8 +178,8 @@
                     --initialize-at-run-time=jnr.ffi.util.ref.FinalizableReferenceQueue,
                     --initialize-at-run-time=jnr.ffi.provider.jffi.NativeFinalizer,
                     --initialize-at-run-time=jnr.ffi.provider.jffi.NativeFinalizer$SingletonHolder,
-                    --initialize-at-run-time=com.usatiuk.dhfs.utils.RefcountedCloseable,
-                    --initialize-at-run-time=com.usatiuk.dhfs.utils.DataLocker$Lock,
+                    --initialize-at-run-time=com.usatiuk.utils.RefcountedCloseable,
+                    --initialize-at-run-time=com.usatiuk.utils.DataLocker$Lock,
                     --initialize-at-run-time=com.usatiuk.objects.stores.LmdbObjectPersistentStore$LmdbKvIterator,
                     --initialize-at-run-time=com.usatiuk.objects.stores.LmdbObjectPersistentStore,
                     --initialize-at-run-time=com.google.protobuf.UnsafeUtil
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/TemporaryOpSerializer.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/TemporaryOpSerializer.java
index c77e4972..64d1d4f6 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/TemporaryOpSerializer.java
+++ b/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
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/autosync/AutosyncProcessor.java
similarity index 95%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/autosync/AutosyncProcessor.java
index 956f9d3a..483bb717 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncProcessor.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/autosync/AutosyncTxHook.java
similarity index 87%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/autosync/AutosyncTxHook.java
index eb4ef598..117d7820 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/AutosyncTxHook.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueData.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/DeferredInvalidationQueueData.java
similarity index 84%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueData.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/DeferredInvalidationQueueData.java
index 09771790..19c426b8 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueData.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueService.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/DeferredInvalidationQueueService.java
similarity index 92%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueService.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/DeferredInvalidationQueueService.java
index 8ed1a727..b3431c35 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/DeferredInvalidationQueueService.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/IndexUpdateOp.java
similarity index 71%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/IndexUpdateOp.java
index 746a96ec..74b128fc 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/IndexUpdateOp.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/InvalidationQueueEntry.java
similarity index 66%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/InvalidationQueueEntry.java
index 98253e2b..78b0d104 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueEntry.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/InvalidationQueueService.java
similarity index 95%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/InvalidationQueueService.java
index 5f4271e4..9934f844 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/InvalidationQueueService.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/Op.java
similarity index 79%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/Op.java
index a0021f05..15914e84 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/Op.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpExtractor.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/OpExtractor.java
similarity index 72%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpExtractor.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/OpExtractor.java
index e6d8d3aa..beaf4046 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpExtractor.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpExtractorService.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/OpExtractorService.java
similarity index 92%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpExtractorService.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/OpExtractorService.java
index fd3acc5c..7b8eb32d 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpExtractorService.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/OpHandler.java
similarity index 93%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/OpHandler.java
index 26741734..12ed5950 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/OpHandler.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/PushOpHandler.java
similarity index 72%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/PushOpHandler.java
index ff7614f0..56b2dfb7 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/PushOpHandler.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/RemoteObjectMetaOpExtractor.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/RemoteObjectMetaOpExtractor.java
similarity index 80%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/RemoteObjectMetaOpExtractor.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/invalidation/RemoteObjectMetaOpExtractor.java
index 6d539e17..f79b2a77 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/invalidation/RemoteObjectMetaOpExtractor.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java
index c1793d1b..cc8a32a1 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeInitialSyncProcessor.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java
index 0c0a0871..fc2f3693 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeManager.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpExtractor.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpExtractor.java
index 4e982616..dbff3ca5 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpExtractor.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java
index 3a3ed51c..71ab4b7c 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreeOpWrapper.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeerInterface.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeerInterface.java
index d1f8e006..50425a4a 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeerInterface.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java
index 3f97f8a4..c56d43cc 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/JKleppmannTreePeriodicPushOp.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java
index ff9a6962..8e4182ee 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreeNode.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java
index d3b41e04..8d2d07e7 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jkleppmanntree/structs/JKleppmannTreePersistentData.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java
index 9b4c6fa5..66a146c1 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapHolderRefcounterTxHook.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java
index 5045f210..d3fd2ab1 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRef.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java
index 72deab34..2fd327d6 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/jmap/JMapRefcounterTxHook.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/IpPeerAddress.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/IpPeerAddress.java
similarity index 80%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/IpPeerAddress.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/IpPeerAddress.java
index 85ee08af..638b17a0 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/IpPeerAddress.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddrStringHelper.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerAddrStringHelper.java
similarity index 93%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddrStringHelper.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerAddrStringHelper.java
index f5c225ec..62ae4c2a 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddrStringHelper.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddress.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerAddress.java
similarity index 61%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddress.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerAddress.java
index 813464e5..e4d2f4e5 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddress.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddressType.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerAddressType.java
similarity index 54%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddressType.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerAddressType.java
index 9511c8db..d592d5b0 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerAddressType.java
+++ b/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,
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerDiscoveryDirectory.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerDiscoveryDirectory.java
similarity index 97%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerDiscoveryDirectory.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PeerDiscoveryDirectory.java
index 715287f8..ff76df69 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PeerDiscoveryDirectory.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PersistentStaticPeerDiscovery.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PersistentStaticPeerDiscovery.java
similarity index 84%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PersistentStaticPeerDiscovery.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/PersistentStaticPeerDiscovery.java
index 6b4f6c5d..f371e430 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/PersistentStaticPeerDiscovery.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/StaticPeerDiscovery.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/StaticPeerDiscovery.java
similarity index 94%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/StaticPeerDiscovery.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/StaticPeerDiscovery.java
index cf1b3bb9..b366359f 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/StaticPeerDiscovery.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java
similarity index 94%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java
index eae33e82..c22fdb55 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryBroadcaster.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/local/LocalPeerDiscoveryClient.java
similarity index 88%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peerdiscovery/local/LocalPeerDiscoveryClient.java
index e61edb0f..dca99631 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peerdiscovery/local/LocalPeerDiscoveryClient.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/InitialSyncProcessor.java
similarity index 77%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/InitialSyncProcessor.java
index 293e0d0c..055319c9 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/InitialSyncProcessor.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerConnectedEventListener.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerConnectedEventListener.java
similarity index 57%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerConnectedEventListener.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerConnectedEventListener.java
index 8d249a4c..2bff44ae 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerConnectedEventListener.java
+++ b/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);
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerDisconnectedEventListener.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerDisconnectedEventListener.java
similarity index 58%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerDisconnectedEventListener.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerDisconnectedEventListener.java
index 47fd966f..ae84c512 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerDisconnectedEventListener.java
+++ b/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);
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/PeerId.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerId.java
similarity index 88%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/PeerId.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerId.java
index 4ec78c8d..55fa6813 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/PeerId.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfo.java
similarity index 70%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfo.java
index 8f5898bf..e4f5f526 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfo.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoProtoSerializer.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfoProtoSerializer.java
similarity index 87%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoProtoSerializer.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfoProtoSerializer.java
index 3b3fbaa1..22e1a54b 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoProtoSerializer.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfoService.java
similarity index 95%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfoService.java
index e67e037d..0cc855e8 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoService.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfoSyncHandler.java
similarity index 93%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerInfoSyncHandler.java
index d1daffb1..fc990e35 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/PeerInfoSyncHandler.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerManager.java
similarity index 88%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PeerManager.java
index 05242302..628c3715 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PeerManager.java
+++ b/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));
         });
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PersistentPeerDataService.java
similarity index 95%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PersistentPeerDataService.java
index 2b954a51..de3d3277 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PersistentPeerDataService.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PersistentRemoteHostsData.java
similarity index 87%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/PersistentRemoteHostsData.java
index c44461aa..1be8b761 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/PersistentRemoteHostsData.java
+++ b/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,
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/ApiPeerInfo.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/ApiPeerInfo.java
similarity index 54%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/ApiPeerInfo.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/ApiPeerInfo.java
index 63a7d000..ca2df7c3 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/ApiPeerInfo.java
+++ b/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) {
 }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApi.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/PeerSyncApi.java
similarity index 85%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApi.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/PeerSyncApi.java
index 64dfb9e5..cfa3192f 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApi.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClient.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/PeerSyncApiClient.java
similarity index 77%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClient.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/PeerSyncApiClient.java
index 1d650d49..b4da86ec 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClient.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClientDynamic.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/PeerSyncApiClientDynamic.java
similarity index 84%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClientDynamic.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/api/PeerSyncApiClientDynamic.java
index 2c9f6cf3..7d66b0e9 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/api/PeerSyncApiClientDynamic.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/structs/JKleppmannTreeNodeMetaPeer.java
similarity index 94%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peersync/structs/JKleppmannTreeNodeMetaPeer.java
index 4e36f609..5a91af89 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peersync/structs/JKleppmannTreeNodeMetaPeer.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/CertificateTools.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/CertificateTools.java
similarity index 98%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/CertificateTools.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/CertificateTools.java
index 64e002ce..a042c052 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/CertificateTools.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerInfoCertUpdateTxHook.java
similarity index 86%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerInfoCertUpdateTxHook.java
index 5f34c54e..1eb21dd8 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerInfoCertUpdateTxHook.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerRolesAugmentor.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerRolesAugmentor.java
similarity index 92%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerRolesAugmentor.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerRolesAugmentor.java
index 02698733..26601253 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerRolesAugmentor.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustManager.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerTrustManager.java
similarity index 93%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustManager.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerTrustManager.java
index ea7fe1dc..160bc993 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustManager.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustServerCustomizer.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerTrustServerCustomizer.java
similarity index 93%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustServerCustomizer.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/peertrust/PeerTrustServerCustomizer.java
index cf7531db..a45fa70c 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/peertrust/PeerTrustServerCustomizer.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/DeleterTxHook.java
similarity index 92%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/DeleterTxHook.java
index 21d93208..28f2b3f1 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/DeleterTxHook.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/JDataNormalRef.java
similarity index 88%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/JDataNormalRef.java
index 55ccfa29..3ef92fda 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataNormalRef.java
+++ b/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
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataRef.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/JDataRef.java
similarity index 82%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataRef.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/JDataRef.java
index 8a5be7f3..729d081c 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataRef.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/JDataRefcounted.java
similarity index 93%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/JDataRefcounted.java
index 8bfedda2..741fa0d7 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataRefcounted.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/RefcounterTxHook.java
similarity index 96%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/refcount/RefcounterTxHook.java
index 8fea7d6f..d48ce482 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RefcounterTxHook.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/ConflictResolver.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/ConflictResolver.java
similarity index 61%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/ConflictResolver.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/ConflictResolver.java
index da03eb9b..a45040b7 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/ConflictResolver.java
+++ b/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);
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/DefaultObjSyncHandler.java
similarity index 95%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/DefaultObjSyncHandler.java
index 223ca6e3..ff674e05 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/DefaultObjSyncHandler.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataRemote.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/JDataRemote.java
similarity index 87%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataRemote.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/JDataRemote.java
index b4e47411..4ddac751 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/JDataRemote.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/JDataRemoteDto.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/JDataRemoteDto.java
similarity index 78%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/JDataRemoteDto.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/JDataRemoteDto.java
index 4c2ef562..a081b7a4 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/JDataRemoteDto.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/JDataRemotePush.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/JDataRemotePush.java
similarity index 87%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/JDataRemotePush.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/JDataRemotePush.java
index 39616381..6f255606 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/JDataRemotePush.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/ObjSyncHandler.java
similarity index 77%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/ObjSyncHandler.java
index f247072e..d3ae1fcf 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/ObjSyncHandler.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/ReceivedObject.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/ReceivedObject.java
similarity index 60%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/ReceivedObject.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/ReceivedObject.java
index 022656ee..b632900b 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/ReceivedObject.java
+++ b/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) {
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjPusherTxHook.java
similarity index 90%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjPusherTxHook.java
index 0735949e..afda6b90 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjPusherTxHook.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDataWrapper.java
similarity index 89%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDataWrapper.java
index c9d7295d..0432861b 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectDataWrapper.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDeleter.java
similarity index 96%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectDeleter.java
index 6e9cf181..96c76470 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectDeleter.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectInitialSyncProcessor.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectInitialSyncProcessor.java
similarity index 81%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectInitialSyncProcessor.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectInitialSyncProcessor.java
index 15986ac8..4a9ad5bf 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectInitialSyncProcessor.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectMeta.java
similarity index 95%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteObjectMeta.java
index bdef1dbe..13ce4dc9 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteObjectMeta.java
+++ b/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.*;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteTransaction.java
similarity index 96%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/RemoteTransaction.java
index 47922e12..2a594555 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/RemoteTransaction.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/SyncHandler.java
similarity index 95%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/SyncHandler.java
index b44a7908..c50dfaa5 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/SyncHandler.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/SyncHandlerService.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/SyncHandlerService.java
similarity index 75%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/SyncHandlerService.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/SyncHandlerService.java
index 647e10cd..9e8f8757 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/SyncHandlerService.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/SyncHelper.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/SyncHelper.java
similarity index 93%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/SyncHelper.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/remoteobj/SyncHelper.java
index eea74edc..12665255 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/SyncHelper.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapper.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapper.java
deleted file mode 100644
index 27fe75a3..00000000
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapper.java
+++ /dev/null
@@ -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);
-}
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceClient.java
similarity index 90%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceClient.java
index b36c5ee5..8677187e 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceClient.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServer.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceServer.java
similarity index 92%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServer.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceServer.java
index ca163616..695de70e 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServer.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceServerImpl.java
similarity index 93%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RemoteObjectServiceServerImpl.java
index 6396fe44..7dd207f4 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RemoteObjectServiceServerImpl.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RpcChannelFactory.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RpcChannelFactory.java
similarity index 89%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RpcChannelFactory.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RpcChannelFactory.java
index 398e3e12..26035f9c 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RpcChannelFactory.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RpcClientFactory.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RpcClientFactory.java
similarity index 92%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RpcClientFactory.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/RpcClientFactory.java
index d765c422..4d61bb4e 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/RpcClientFactory.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/TemporaryReceivedObjectSerializer.java
similarity index 87%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/TemporaryReceivedObjectSerializer.java
index ce9840b8..5793f223 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryReceivedObjectSerializer.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryRemoteObjectSerializer.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/TemporaryRemoteObjectSerializer.java
similarity index 84%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryRemoteObjectSerializer.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/rpc/TemporaryRemoteObjectSerializer.java
index 4b475a5e..ea3cbd1c 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/TemporaryRemoteObjectSerializer.java
+++ b/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
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/syncmap/DtoMapper.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/syncmap/DtoMapper.java
new file mode 100644
index 00000000..28fc6024
--- /dev/null
+++ b/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);
+}
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapperService.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/syncmap/DtoMapperService.java
similarity index 94%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapperService.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/syncmap/DtoMapperService.java
index df8733dc..022c7c9f 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/syncmap/DtoMapperService.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerDelete.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeerDelete.java
similarity index 52%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerDelete.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeerDelete.java
index 315bcc81..735effd7 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerDelete.java
+++ b/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) {
 }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeerInfo.java
similarity index 72%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeerInfo.java
index 5cd2e561..7b53252c 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerInfo.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerPut.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeerPut.java
similarity index 50%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerPut.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeerPut.java
index 57fa1b15..42e33040 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeerPut.java
+++ b/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) {
 }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeers.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeers.java
similarity index 69%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeers.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/KnownPeers.java
index 5e7fe932..e90a7a93 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/KnownPeers.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerAddressInfo.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PeerAddressInfo.java
similarity index 59%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerAddressInfo.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PeerAddressInfo.java
index f77e4428..145ffee3 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerAddressInfo.java
+++ b/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) {
 }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerInfo.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PeerInfo.java
similarity index 56%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerInfo.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PeerInfo.java
index 1a2087b7..c9e7292c 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerInfo.java
+++ b/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) {
 }
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerManagementApi.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PeerManagementApi.java
similarity index 87%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerManagementApi.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PeerManagementApi.java
index aa19e6d1..46cf1447 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PeerManagementApi.java
+++ b/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;
 
diff --git a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PersistentPeerAddressApi.java b/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PersistentPeerAddressApi.java
similarity index 82%
rename from dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PersistentPeerAddressApi.java
rename to dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/webapi/PersistentPeerAddressApi.java
index 9eb8529d..95fce2ab 100644
--- a/dhfs-parent/sync-base/src/main/java/com/usatiuk/dhfs/repository/webapi/PersistentPeerAddressApi.java
+++ b/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.*;
 
diff --git a/dhfs-parent/sync-base/src/main/proto/dhfs_peer_discovery.proto b/dhfs-parent/sync-base/src/main/proto/dhfs_peer_discovery.proto
index 4831e31c..76b2453b 100644
--- a/dhfs-parent/sync-base/src/main/proto/dhfs_peer_discovery.proto
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/RefcounterTest.java b/dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/RefcounterTest.java
index d7b965ed..af3d4da6 100644
--- a/dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/RefcounterTest.java
+++ b/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;
diff --git a/dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/testobjs/TestRefcount.java b/dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/testobjs/TestRefcount.java
index fa92e91e..60ce9bec 100644
--- a/dhfs-parent/sync-base/src/test/java/com/usatiuk/dhfs/testobjs/TestRefcount.java
+++ b/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;
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/AutoCloseableNoThrow.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/AutoCloseableNoThrow.java
similarity index 75%
rename from dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/AutoCloseableNoThrow.java
rename to dhfs-parent/utils/src/main/java/com/usatiuk/utils/AutoCloseableNoThrow.java
index 29ec47ca..26f49a56 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/AutoCloseableNoThrow.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/AutoCloseableNoThrow.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
 public interface AutoCloseableNoThrow extends AutoCloseable {
     @Override
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/ByteUtils.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/ByteUtils.java
similarity index 93%
rename from dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/ByteUtils.java
rename to dhfs-parent/utils/src/main/java/com/usatiuk/utils/ByteUtils.java
index dba58508..f7075b40 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/ByteUtils.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/ByteUtils.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
 import java.nio.ByteBuffer;
 
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/DataLocker.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/DataLocker.java
similarity index 97%
rename from dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/DataLocker.java
rename to dhfs-parent/utils/src/main/java/com/usatiuk/utils/DataLocker.java
index 56ddf481..93e79238 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/DataLocker.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/DataLocker.java
@@ -1,6 +1,5 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
-import io.quarkus.logging.Log;
 import jakarta.annotation.Nonnull;
 import jakarta.annotation.Nullable;
 
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/HashSetDelayedBlockingQueue.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/HashSetDelayedBlockingQueue.java
similarity index 99%
rename from dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/HashSetDelayedBlockingQueue.java
rename to dhfs-parent/utils/src/main/java/com/usatiuk/utils/HashSetDelayedBlockingQueue.java
index 53c66af3..a7dcb81a 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/HashSetDelayedBlockingQueue.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/HashSetDelayedBlockingQueue.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
 import jakarta.annotation.Nullable;
 
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/RefcountedCloseable.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/RefcountedCloseable.java
similarity index 97%
rename from dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/RefcountedCloseable.java
rename to dhfs-parent/utils/src/main/java/com/usatiuk/utils/RefcountedCloseable.java
index c398f586..3ed16c88 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/RefcountedCloseable.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/RefcountedCloseable.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
 import io.quarkus.logging.Log;
 import org.apache.commons.lang3.mutable.MutableObject;
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/SerializationHelper.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/SerializationHelper.java
similarity index 97%
rename from dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/SerializationHelper.java
rename to dhfs-parent/utils/src/main/java/com/usatiuk/utils/SerializationHelper.java
index d285a821..2df57b06 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/SerializationHelper.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/SerializationHelper.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.UnsafeByteOperations;
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/StatusRuntimeExceptionNoStacktrace.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/StatusRuntimeExceptionNoStacktrace.java
similarity index 94%
rename from dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/StatusRuntimeExceptionNoStacktrace.java
rename to dhfs-parent/utils/src/main/java/com/usatiuk/utils/StatusRuntimeExceptionNoStacktrace.java
index 40897edc..963da69d 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/StatusRuntimeExceptionNoStacktrace.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/StatusRuntimeExceptionNoStacktrace.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
 import io.grpc.Metadata;
 import io.grpc.Status;
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/VoidFn.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFn.java
similarity index 68%
rename from dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/VoidFn.java
rename to dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFn.java
index e20d6707..46f4ff0c 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/VoidFn.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFn.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
 @FunctionalInterface
 public interface VoidFn {
diff --git a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/VoidFnThrows.java b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFnThrows.java
similarity index 74%
rename from dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/VoidFnThrows.java
rename to dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFnThrows.java
index 64dfe36f..ca33ad05 100644
--- a/dhfs-parent/utils/src/main/java/com/usatiuk/dhfs/utils/VoidFnThrows.java
+++ b/dhfs-parent/utils/src/main/java/com/usatiuk/utils/VoidFnThrows.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
 @FunctionalInterface
 public interface VoidFnThrows {
diff --git a/dhfs-parent/utils/src/test/java/com/usatiuk/dhfs/utils/HashSetDelayedBlockingQueueTest.java b/dhfs-parent/utils/src/test/java/com/usatiuk/utils/HashSetDelayedBlockingQueueTest.java
similarity index 99%
rename from dhfs-parent/utils/src/test/java/com/usatiuk/dhfs/utils/HashSetDelayedBlockingQueueTest.java
rename to dhfs-parent/utils/src/test/java/com/usatiuk/utils/HashSetDelayedBlockingQueueTest.java
index 5928825d..9f242bf1 100644
--- a/dhfs-parent/utils/src/test/java/com/usatiuk/dhfs/utils/HashSetDelayedBlockingQueueTest.java
+++ b/dhfs-parent/utils/src/test/java/com/usatiuk/utils/HashSetDelayedBlockingQueueTest.java
@@ -1,4 +1,4 @@
-package com.usatiuk.dhfs.utils;
+package com.usatiuk.utils;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/webui/src/PeerKnownCard.tsx b/webui/src/PeerKnownCard.tsx
index 6d79d08e..cc5764f8 100644
--- a/webui/src/PeerKnownCard.tsx
+++ b/webui/src/PeerKnownCard.tsx
@@ -22,19 +22,19 @@ export function PeerKnownCard({ peerInfo }: TPeerKnownCardProps) {
             <div className={"peerInfo"}>
                 <div>
                     <div>
-
-                    <span>UUID: </span>
-                    <span>{peerInfo.uuid}</span>
+                        <span>UUID: </span>
+                        <span>{peerInfo.uuid}</span>
                     </div>
                     <div>
-                        <span>{peerInfo.knownAddress ? "connected" : "not connected"}</span>
+                        <span>
+                            {peerInfo.knownAddress
+                                ? "connected"
+                                : "not connected"}
+                        </span>
                     </div>
                 </div>
                 <div>
-                    <fetcher.Form
-                        method="put"
-                        action={"/home/peers"}
-                    >
+                    <fetcher.Form method="put" action={"/home/peers"}>
                         <span>Manual address: </span>
                         <input
                             name="intent"
diff --git a/webui/src/PeerState.tsx b/webui/src/PeerState.tsx
index daefd684..bc1517bc 100644
--- a/webui/src/PeerState.tsx
+++ b/webui/src/PeerState.tsx
@@ -9,8 +9,8 @@ export function PeerState() {
     const loaderData = useLoaderData() as LoaderToType<typeof peerStateLoader>;
 
     const knownPeers = loaderData.knownPeers.peers
-        .filter((p) => p.uuid !== loaderData.knownPeers.selfUuid)
-        .map((p) => <PeerKnownCard peerInfo={p} key={p.uuid} />);
+        ?.filter((p) => p.uuid !== loaderData.knownPeers.selfUuid)
+        ?.map((p) => <PeerKnownCard peerInfo={p} key={p.uuid} />);
 
     const availablePeers = loaderData.availablePeers.map((p) => (
         <PeerAvailableCard peerInfo={p} key={p.uuid} />