move ByteBuffer* to dedicated package

simerplaha · Nov 17, 2021 · bb0129b · bb0129b
1 parent de0dfb5
commit bb0129b
Show file tree

Hide file tree

Showing 41 changed files with 62 additions and 54 deletions.
diff --git a/core-performance/src/test/scala/swaydb/core/file/DBFileWriteReadPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/file/DBFileWriteReadPerformanceSpec.scala
@@ -18,7 +18,7 @@ package swaydb.core.file
 
 import swaydb.Benchmark
 import swaydb.core.TestData._
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.segment.block.reader.BlockRefReader
 import swaydb.core.segment.block.{BlockCache, BlockCacheState}

diff --git a/core-performance/src/test/scala/swaydb/core/file/ForceSavePerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/file/ForceSavePerformanceSpec.scala
@@ -19,7 +19,7 @@ package swaydb.core.file
 import swaydb.Benchmark
 import swaydb.config.ForceSave
 import swaydb.core.TestData.randomBytesSlice
-import swaydb.core.file.sweeper.ByteBufferCleaner
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferCleaner
 import swaydb.core.{TestBase, TestCaseSweeper}
 import swaydb.effect.Effect
 import swaydb.testkit.RunThis._

diff --git a/core-performance/src/test/scala/swaydb/core/segment/block/BlockReaderPerformanceSpec.scala b/core-performance/src/test/scala/swaydb/core/segment/block/BlockReaderPerformanceSpec.scala
@@ -18,7 +18,7 @@
 //
 //import swaydb.IOValues._
 //import swaydb.core.TestData._
-//import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+//import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 //import swaydb.core.file.sweeper.FileSweeper
 //import swaydb.core.file.{BlockCache, DBFile}
 //import swaydb.core.file.reader.FileReader

diff --git a/core-stress/src/test/scala/swaydb/core/io/file/DBFileStressWriteSpec.scala b/core-stress/src/test/scala/swaydb/core/io/file/DBFileStressWriteSpec.scala
@@ -20,7 +20,7 @@
 //import swaydb.testkit.RunThis._
 //import swaydb.core.TestData._
 //import swaydb.core.file.sweeper.FileSweeper
-//import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+//import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 //import swaydb.core.file.sweeper.FileSweeper
 //import swaydb.core.util.{Benchmark, BlockCacheFileIDGenerator}
 //import swaydb.core.{TestBase, TestSweeper}

diff --git a/core-tools/src/main/scala/swaydb/core/tool/AppendixRepairer.scala b/core-tools/src/main/scala/swaydb/core/tool/AppendixRepairer.scala
@@ -23,7 +23,7 @@ import swaydb.config.repairAppendix.AppendixRepairStrategy._
 import swaydb.config.repairAppendix.{AppendixRepairStrategy, OverlappingSegmentsException, SegmentInfoUnTyped}
 import swaydb.config.{ForceSave, MMAP}
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.level.AppendixLogCache
 import swaydb.core.log.serialiser.LogEntryWriter

diff --git a/core/src/main/scala/swaydb/core/Core.scala b/core/src/main/scala/swaydb/core/Core.scala
@@ -25,7 +25,7 @@ import swaydb.config.compaction.{CompactionConfig, LevelMeter}
 import swaydb.config.sequencer.Sequencer
 import swaydb.core.build.BuildValidator
 import swaydb.core.compaction.Compactor
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.level.zero.LevelZero
 import swaydb.core.log.LogEntry
 import swaydb.core.log.serialiser.LevelZeroLogEntryWriter

diff --git a/core/src/main/scala/swaydb/core/CoreInitializer.scala b/core/src/main/scala/swaydb/core/CoreInitializer.scala
@@ -26,8 +26,9 @@ import swaydb.core.build.{Build, BuildValidator}
 import swaydb.core.compaction._
 import swaydb.core.compaction.throttle.ThrottleCompactorCreator
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.file.sweeper.{ByteBufferSweeper, FileSweeper}
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.FileSweeper
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper
 import swaydb.core.level.zero.LevelZero
 import swaydb.core.level.{Level, LevelCloser, NextLevel}
 import swaydb.core.segment.{FunctionStore, block}

diff --git a/core/src/main/scala/swaydb/core/compaction/io/CompactionIO.scala b/core/src/main/scala/swaydb/core/compaction/io/CompactionIO.scala
@@ -18,7 +18,7 @@ package swaydb.core.compaction.io
 
 import swaydb.config.{MMAP, SegmentRefCacheLife}
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.level.PathsDistributor
 import swaydb.core.segment.{FunctionStore, Segment}

diff --git a/core/src/main/scala/swaydb/core/file/DBFile.scala b/core/src/main/scala/swaydb/core/file/DBFile.scala
@@ -20,8 +20,9 @@ import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.IO.ExceptionHandler
 import swaydb.config.ForceSave
 import swaydb.core.cache.Cache
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.file.sweeper.{ByteBufferCommand, FileSweeper, FileSweeperCommand, FileSweeperItem}
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.{FileSweeper, FileSweeperCommand, FileSweeperItem}
 import swaydb.effect.{Effect, IOStrategy, Reserve}
 import swaydb.slice.{Slice, SliceRO}
 import swaydb.{Error, IO}

diff --git a/core/src/main/scala/swaydb/core/file/MMAPFile.scala b/core/src/main/scala/swaydb/core/file/MMAPFile.scala
@@ -18,8 +18,8 @@ package swaydb.core.file
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.config.ForceSave
-import swaydb.core.file.sweeper.ByteBufferCommand
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.effect.{Effect, Reserve}
 import swaydb.slice.{Slice, SliceRO, Slices}
 

diff --git a/...core/file/sweeper/ByteBufferCleaner.scala → ...weeper/bytebuffer/ByteBufferCleaner.scala b/...core/file/sweeper/ByteBufferCleaner.scala → ...weeper/bytebuffer/ByteBufferCleaner.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package swaydb.core.file.sweeper
+package swaydb.core.file.sweeper.bytebuffer
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.IO

diff --git a/...core/file/sweeper/ByteBufferCommand.scala → ...weeper/bytebuffer/ByteBufferCommand.scala b/...core/file/sweeper/ByteBufferCommand.scala → ...weeper/bytebuffer/ByteBufferCommand.scala
@@ -1,8 +1,8 @@
-package swaydb.core.file.sweeper
+package swaydb.core.file.sweeper.bytebuffer
 
 import swaydb.config.ForceSave
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.{ByteBufferSweeperActor, State}
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.{ByteBufferSweeperActor, State}
 import swaydb.{Actor, ActorRef}
 
 import java.nio.MappedByteBuffer

diff --git a/...core/file/sweeper/ByteBufferSweeper.scala → ...weeper/bytebuffer/ByteBufferSweeper.scala b/...core/file/sweeper/ByteBufferSweeper.scala → ...weeper/bytebuffer/ByteBufferSweeper.scala
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package swaydb.core.file.sweeper
+package swaydb.core.file.sweeper.bytebuffer
 
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.ActorConfig.QueueOrder
 import swaydb.Bag.Implicits._
 import swaydb.Error.IO.ExceptionHandler
 import swaydb._
 import swaydb.core.cache.{Cache, CacheNoIO}
-import swaydb.core.file.sweeper.ByteBufferCleaner.Cleaner
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferCleaner.Cleaner
 import swaydb.effect.Effect
 import swaydb.utils.English
 import swaydb.utils.FiniteDurations.FiniteDurationImplicits

diff --git a/core/src/main/scala/swaydb/core/level/Level.scala b/core/src/main/scala/swaydb/core/level/Level.scala
@@ -24,7 +24,7 @@ import swaydb.config.compaction.{LevelMeter, LevelThrottle}
 import swaydb.config.storage.LevelStorage
 import swaydb.core.compaction.io.CompactionIO
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.level.seek._
 import swaydb.core.level.zero.LevelZero.LevelZeroLog

diff --git a/core/src/main/scala/swaydb/core/level/LevelCloser.scala b/core/src/main/scala/swaydb/core/level/LevelCloser.scala
@@ -19,8 +19,9 @@ package swaydb.core.level
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.Bag
 import swaydb.Bag.Implicits._
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.file.sweeper.{ByteBufferSweeper, FileSweeper}
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.FileSweeper
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper
 import swaydb.core.segment.cache.sweeper.MemorySweeper
 
 object LevelCloser extends LazyLogging {

diff --git a/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala b/core/src/main/scala/swaydb/core/level/zero/LevelZero.scala
@@ -25,7 +25,7 @@ import swaydb.config.compaction.{LevelMeter, LevelZeroThrottle}
 import swaydb.config.storage.Level0Storage
 import swaydb.config.{Atomic, MMAP, OptimiseWrites}
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.level.seek._
 import swaydb.core.level.zero.LevelZero.LevelZeroLog

diff --git a/core/src/main/scala/swaydb/core/log/Log.scala b/core/src/main/scala/swaydb/core/log/Log.scala
@@ -20,7 +20,7 @@ import com.typesafe.scalalogging.LazyLogging
 import swaydb.IO
 import swaydb.config.MMAP
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter}
 import swaydb.core.util.IDGenerator

diff --git a/core/src/main/scala/swaydb/core/log/Logs.scala b/core/src/main/scala/swaydb/core/log/Logs.scala
@@ -21,7 +21,7 @@ import swaydb.Error.Log.ExceptionHandler
 import swaydb.config.accelerate.{Accelerator, LevelZeroMeter}
 import swaydb.config.{MMAP, RecoveryMode}
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter}
 import swaydb.core.log.timer.Timer

diff --git a/core/src/main/scala/swaydb/core/log/PersistentLog.scala b/core/src/main/scala/swaydb/core/log/PersistentLog.scala
@@ -20,8 +20,9 @@ import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.Log.ExceptionHandler
 import swaydb.IO
 import swaydb.config.MMAP
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.file.sweeper.{ByteBufferCommand, ByteBufferSweeper, FileSweeper}
+import swaydb.core.file.sweeper.FileSweeper
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.{DBFile, ForceSaveApplier}
 import swaydb.core.log.serialiser.{LogEntryReader, LogEntrySerialiser, LogEntryWriter}
 import swaydb.effect.Effect._

diff --git a/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala b/core/src/main/scala/swaydb/core/log/applied/AppliedFunctionsLog.scala
@@ -19,7 +19,7 @@ package swaydb.core.log.applied
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.config.MMAP
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.log
 import swaydb.core.log.serialiser.{AppliedFunctionsLogEntryReader, AppliedFunctionsLogEntryWriter}

diff --git a/core/src/main/scala/swaydb/core/log/counter/CounterLog.scala b/core/src/main/scala/swaydb/core/log/counter/CounterLog.scala
@@ -19,7 +19,7 @@ package swaydb.core.log.counter
 import swaydb.IO
 import swaydb.config.MMAP
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.log.LogEntry
 import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter}
 import swaydb.slice.Slice

diff --git a/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLog.scala b/core/src/main/scala/swaydb/core/log/counter/PersistentCounterLog.scala
@@ -21,7 +21,7 @@ import swaydb.Error.Log.ExceptionHandler
 import swaydb.IO
 import swaydb.config.MMAP
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter}
 import swaydb.core.log.{Log, LogEntry, PersistentLog}

diff --git a/core/src/main/scala/swaydb/core/log/serialiser/AppendixLogEntryReader.scala b/core/src/main/scala/swaydb/core/log/serialiser/AppendixLogEntryReader.scala
@@ -18,7 +18,7 @@ package swaydb.core.log.serialiser
 
 import swaydb.config.{MMAP, SegmentRefCacheLife}
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.log.LogEntry
 import swaydb.core.segment.cache.sweeper.MemorySweeper

diff --git a/core/src/main/scala/swaydb/core/log/timer/Timer.scala b/core/src/main/scala/swaydb/core/log/timer/Timer.scala
@@ -19,7 +19,7 @@ package swaydb.core.log.timer
 import swaydb.IO
 import swaydb.config.MMAP
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.log.LogEntry
 import swaydb.core.log.counter.{CounterLog, PersistentCounterLog}
 import swaydb.core.log.serialiser.{CounterLogEntryReader, CounterLogEntryWriter, LogEntryReader, LogEntryWriter}

diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentMany.scala
@@ -24,7 +24,7 @@ import swaydb.config.{MMAP, SegmentRefCacheLife}
 import swaydb.core.cache.{Cache, CacheNoIO}
 import swaydb.core.compaction.io.CompactionIO
 import swaydb.core.file.reader.Reader
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.{FileSweeper, FileSweeperCommand}
 import swaydb.core.file.{DBFile, ForceSaveApplier}
 import swaydb.core.level.PathsDistributor

diff --git a/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala b/core/src/main/scala/swaydb/core/segment/PersistentSegmentOne.scala
@@ -22,7 +22,7 @@ import swaydb.IO
 import swaydb.config.compaction.CompactionConfig.CompactionParallelism
 import swaydb.config.{MMAP, SegmentRefCacheLife}
 import swaydb.core.compaction.io.CompactionIO
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.{FileSweeper, FileSweeperCommand}
 import swaydb.core.file.{DBFile, ForceSaveApplier}
 import swaydb.core.level.PathsDistributor

diff --git a/core/src/main/scala/swaydb/core/segment/Segment.scala b/core/src/main/scala/swaydb/core/segment/Segment.scala
@@ -20,7 +20,7 @@ import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.Segment.ExceptionHandler
 import swaydb.config.compaction.CompactionConfig.CompactionParallelism
 import swaydb.config.{MMAP, SegmentRefCacheLife}
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.{FileSweeper, FileSweeperItem}
 import swaydb.core.file.{DBFile, ForceSaveApplier}
 import swaydb.core.level.PathsDistributor

diff --git a/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala b/core/src/main/scala/swaydb/core/segment/SegmentSerialiser.scala
@@ -18,7 +18,7 @@ package swaydb.core.segment
 
 import swaydb.config.{MMAP, SegmentRefCacheLife}
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.log.serialiser.ValueSerialiser.MinMaxSerialiser
 import swaydb.core.segment.cache.sweeper.MemorySweeper

diff --git a/core/src/main/scala/swaydb/core/segment/defrag/DefragPersistentSegment.scala b/core/src/main/scala/swaydb/core/segment/defrag/DefragPersistentSegment.scala
@@ -20,7 +20,7 @@ import swaydb.config.compaction.CompactionConfig.CompactionParallelism
 import swaydb.config.{MMAP, SegmentRefCacheLife}
 import swaydb.core.compaction.io.CompactionIO
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.level.PathsDistributor
 import swaydb.core.segment._

diff --git a/core/src/main/scala/swaydb/core/segment/io/SegmentWriteIO.scala b/core/src/main/scala/swaydb/core/segment/io/SegmentWriteIO.scala
@@ -18,7 +18,7 @@ package swaydb.core.segment.io
 
 import swaydb.config.{MMAP, SegmentRefCacheLife}
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.level.PathsDistributor
 import swaydb.core.segment._

diff --git a/core/src/main/scala/swaydb/core/segment/io/SegmentWriteMemoryIO.scala b/core/src/main/scala/swaydb/core/segment/io/SegmentWriteMemoryIO.scala
@@ -19,7 +19,7 @@ package swaydb.core.segment.io
 import swaydb.Error.Segment.ExceptionHandler
 import swaydb.config.{MMAP, SegmentRefCacheLife}
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.level.PathsDistributor
 import swaydb.core.segment._

diff --git a/core/src/main/scala/swaydb/core/segment/io/SegmentWritePersistentIO.scala b/core/src/main/scala/swaydb/core/segment/io/SegmentWritePersistentIO.scala
@@ -19,7 +19,7 @@ package swaydb.core.segment.io
 import com.typesafe.scalalogging.LazyLogging
 import swaydb.Error.Segment.ExceptionHandler
 import swaydb.config.{ForceSave, MMAP, SegmentRefCacheLife}
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.sweeper.FileSweeper
 import swaydb.core.file.{DBFile, ForceSaveApplier}
 import swaydb.core.level.PathsDistributor

diff --git a/core/src/test/scala/swaydb/core/CommonAssertions.scala b/core/src/test/scala/swaydb/core/CommonAssertions.scala
@@ -27,7 +27,7 @@ import swaydb.config.compaction.PushStrategy
 import swaydb.config.{Atomic, OptimiseWrites}
 import swaydb.core.TestData._
 import swaydb.core.file.reader.{FileReader, Reader}
-import swaydb.core.file.sweeper.{ByteBufferCommand, ByteBufferSweeper}
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand
 import swaydb.core.level.zero.{LevelZero, LevelZeroLogCache}
 import swaydb.core.level.{Level, LevelRef, NextLevel}
 import swaydb.core.log.serialiser.{LogEntryWriter, RangeValueSerialiser, ValueSerialiser}

diff --git a/core/src/test/scala/swaydb/core/TestCaseSweeper.scala b/core/src/test/scala/swaydb/core/TestCaseSweeper.scala
@@ -21,8 +21,9 @@ import swaydb.configs.level.DefaultExecutionContext
 import swaydb.core.TestSweeper._
 import swaydb.core.cache.{Cache, CacheNoIO}
 import swaydb.core.compaction.io.CompactionIO
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.file.sweeper.{ByteBufferSweeper, FileSweeper}
+import swaydb.core.file.sweeper.FileSweeper
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.file.{DBFile, ForceSaveApplier}
 import swaydb.core.level.LevelRef
 import swaydb.core.log.counter.CounterLog

diff --git a/core/src/test/scala/swaydb/core/TestSweeper.scala b/core/src/test/scala/swaydb/core/TestSweeper.scala
@@ -20,8 +20,9 @@ import swaydb.ActorConfig
 import swaydb.config.MemoryCache
 import swaydb.configs.level.DefaultExecutionContext
 import swaydb.core.CommonAssertions._
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.file.sweeper.{ByteBufferSweeper, FileSweeper}
+import swaydb.core.file.sweeper.FileSweeper
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.segment.block.{BlockCache, BlockCacheState}
 import swaydb.core.segment.cache.sweeper.MemorySweeper
 import swaydb.utils.StorageUnits._

diff --git a/core/src/test/scala/swaydb/core/file/MMAPFileSpec.scala b/core/src/test/scala/swaydb/core/file/MMAPFileSpec.scala
@@ -20,7 +20,7 @@ import org.scalamock.scalatest.MockFactory
 import swaydb.IOValues._
 import swaydb.core.CommonAssertions._
 import swaydb.core.TestData._
-import swaydb.core.file.sweeper.ByteBufferCleaner
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferCleaner
 import swaydb.core.{TestBase, TestCaseSweeper, TestForceSave}
 import swaydb.effect.Effect
 import swaydb.slice.Slice

diff --git a/...ydb/core/file/ByteBufferSweeperSpec.scala → ...er/bytebuffer/ByteBufferSweeperSpec.scala b/...ydb/core/file/ByteBufferSweeperSpec.scala → ...er/bytebuffer/ByteBufferSweeperSpec.scala
@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-package swaydb.core.file
+package swaydb.core.file.sweeper.bytebuffer
 
 import org.scalamock.scalatest.MockFactory
 import org.scalatest.OptionValues._
 import swaydb.IOValues._
 import swaydb.core.CommonAssertions.randomThreadSafeIOStrategy
 import swaydb.core.TestCaseSweeper._
 import swaydb.core.TestData._
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
-import swaydb.core.file.sweeper.{ByteBufferCommand, ByteBufferSweeper, FileSweeper}
+import swaydb.core.file.sweeper.FileSweeper
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.{DBFile, ForceSaveApplier, MMAPFile}
 import swaydb.core.{TestBase, TestCaseSweeper, TestExecutionContext, TestForceSave}
 import swaydb.effect.Effect
 import swaydb.testkit.RunThis._

diff --git a/core/src/test/scala/swaydb/core/log/MapTestUtil.scala b/core/src/test/scala/swaydb/core/log/MapTestUtil.scala
@@ -22,8 +22,8 @@ import swaydb.config.MMAP
 import swaydb.core.TestCaseSweeper._
 import swaydb.core.TestData._
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferCommand
-import swaydb.core.file.sweeper.ByteBufferSweeper.{ByteBufferSweeperActor, State}
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferCommand
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.{ByteBufferSweeperActor, State}
 import swaydb.core.log.counter.{CounterLog, PersistentCounterLog}
 import swaydb.core.log.serialiser.{LogEntryReader, LogEntryWriter}
 import swaydb.core.log.timer.Timer

diff --git a/core/src/test/scala/swaydb/core/log/timer/TimerSpec.scala b/core/src/test/scala/swaydb/core/log/timer/TimerSpec.scala
@@ -18,7 +18,7 @@ package swaydb.core.log.timer
 
 import swaydb.config.MMAP
 import swaydb.core.file.ForceSaveApplier
-import swaydb.core.file.sweeper.ByteBufferSweeper.ByteBufferSweeperActor
+import swaydb.core.file.sweeper.bytebuffer.ByteBufferSweeper.ByteBufferSweeperActor
 import swaydb.core.log.LogEntry
 import swaydb.core.log.MapTestUtil._
 import swaydb.core.log.counter.CounterLog