refactor

32 files changed, 59 insertions, 59 deletions

diff --git a/src/main/java/com/keuin/kbackupfabric/KBCommands.java b/src/main/java/com/keuin/kbackupfabric/KBCommands.java
index 1b52b6b..90a4130 100644
--- a/src/main/java/com/keuin/kbackupfabric/KBCommands.java
+++ b/src/main/java/com/keuin/kbackupfabric/KBCommands.java
@@ -1,5 +1,9 @@
 package com.keuin.kbackupfabric;
 
+import com.keuin.kbackupfabric.backup.BackupFilesystemUtil;
+import com.keuin.kbackupfabric.backup.name.IncrementalBackupFileNameEncoder;
+import com.keuin.kbackupfabric.backup.name.PrimitiveBackupFileNameEncoder;
+import com.keuin.kbackupfabric.backup.suggestion.BackupNameSuggestionProvider;
 import com.keuin.kbackupfabric.metadata.MetadataHolder;
 import com.keuin.kbackupfabric.operation.BackupOperation;
 import com.keuin.kbackupfabric.operation.DeleteOperation;
@@ -9,10 +13,6 @@ import com.keuin.kbackupfabric.operation.backup.method.ConfiguredBackupMethod;
 import com.keuin.kbackupfabric.operation.backup.method.ConfiguredIncrementalBackupMethod;
 import com.keuin.kbackupfabric.operation.backup.method.ConfiguredPrimitiveBackupMethod;
 import com.keuin.kbackupfabric.util.PrintUtil;
-import com.keuin.kbackupfabric.util.backup.BackupFilesystemUtil;
-import com.keuin.kbackupfabric.util.backup.name.IncrementalBackupFileNameEncoder;
-import com.keuin.kbackupfabric.util.backup.name.PrimitiveBackupFileNameEncoder;
-import com.keuin.kbackupfabric.util.backup.suggestion.BackupNameSuggestionProvider;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.server.MinecraftServer;
@@ -26,8 +26,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
+import static com.keuin.kbackupfabric.backup.BackupFilesystemUtil.*;
 import static com.keuin.kbackupfabric.util.PrintUtil.*;
-import static com.keuin.kbackupfabric.util.backup.BackupFilesystemUtil.*;
 
 public final class KBCommands {
 
@@ -273,12 +273,12 @@ public final class KBCommands {
             ConfiguredBackupMethod method = !incremental ? new ConfiguredPrimitiveBackupMethod(
                     new PrimitiveBackupFileNameEncoder().encode(customBackupName, LocalDateTime.now()),
                     getLevelPath(server),
-                    getBackupSaveDirectory(server).getAbsolutePath()
+                    getBackupSaveDirectory(server).getCanonicalPath()
             ) : new ConfiguredIncrementalBackupMethod(
                     new IncrementalBackupFileNameEncoder().encode(customBackupName, LocalDateTime.now()),
                     getLevelPath(server),
-                    getBackupSaveDirectory(server).getAbsolutePath(),
-                    getIncrementalBackupBaseDirectory(server).getAbsolutePath()
+                    getBackupSaveDirectory(server).getCanonicalPath(),
+                    getIncrementalBackupBaseDirectory(server).getCanonicalPath()
             );
 
             // dispatch to operation worker
diff --git a/src/main/java/com/keuin/kbackupfabric/KBCommandsRegister.java b/src/main/java/com/keuin/kbackupfabric/KBCommandsRegister.java
index d9ace66..b9baf44 100644
--- a/src/main/java/com/keuin/kbackupfabric/KBCommandsRegister.java
+++ b/src/main/java/com/keuin/kbackupfabric/KBCommandsRegister.java
@@ -1,7 +1,7 @@
 package com.keuin.kbackupfabric;
 
+import com.keuin.kbackupfabric.backup.suggestion.BackupNameSuggestionProvider;
 import com.keuin.kbackupfabric.util.PermissionValidator;
-import com.keuin.kbackupfabric.util.backup.suggestion.BackupNameSuggestionProvider;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import net.minecraft.server.command.CommandManager;
diff --git a/src/main/java/com/keuin/kbackupfabric/KBPluginEvents.java b/src/main/java/com/keuin/kbackupfabric/KBPluginEvents.java
index 3cb2dbe..1d90864 100644
--- a/src/main/java/com/keuin/kbackupfabric/KBPluginEvents.java
+++ b/src/main/java/com/keuin/kbackupfabric/KBPluginEvents.java
@@ -1,9 +1,9 @@
 package com.keuin.kbackupfabric;
 
+import com.keuin.kbackupfabric.backup.BackupFilesystemUtil;
+import com.keuin.kbackupfabric.backup.suggestion.BackupNameSuggestionProvider;
 import com.keuin.kbackupfabric.metadata.BackupMetadata;
 import com.keuin.kbackupfabric.metadata.MetadataHolder;
-import com.keuin.kbackupfabric.util.backup.BackupFilesystemUtil;
-import com.keuin.kbackupfabric.util.backup.suggestion.BackupNameSuggestionProvider;
 import com.keuin.kbackupfabric.util.PrintUtil;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.fabric.api.event.server.ServerStartCallback;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/BackupFilesystemUtil.java b/src/main/java/com/keuin/kbackupfabric/backup/BackupFilesystemUtil.java
index 28ede70..49fe6a0 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/BackupFilesystemUtil.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/BackupFilesystemUtil.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup;
+package com.keuin.kbackupfabric.backup;
 
 import com.keuin.kbackupfabric.util.ReflectionUtils;
 import net.minecraft.server.MinecraftServer;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/BackupNameTimeFormatter.java b/src/main/java/com/keuin/kbackupfabric/backup/BackupNameTimeFormatter.java
index 3811ae8..bcf5d18 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/BackupNameTimeFormatter.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/BackupNameTimeFormatter.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup;
+package com.keuin.kbackupfabric.backup;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollection.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollection.java
index 16d95e6..2d07fb4 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollection.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollection.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.incremental;
+package com.keuin.kbackupfabric.backup.incremental;
 
 import java.io.Serializable;
 import java.util.*;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollectionFactory.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollectionFactory.java
index 2f3761c..0e02606 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollectionFactory.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollectionFactory.java
@@ -1,8 +1,8 @@
-package com.keuin.kbackupfabric.util.backup.incremental;
+package com.keuin.kbackupfabric.backup.incremental;
 
+import com.keuin.kbackupfabric.backup.incremental.identifier.FileIdentifierProvider;
+import com.keuin.kbackupfabric.backup.incremental.identifier.ObjectIdentifier;
 import com.keuin.kbackupfabric.util.PrintUtil;
-import com.keuin.kbackupfabric.util.backup.incremental.identifier.FileIdentifierProvider;
-import com.keuin.kbackupfabric.util.backup.incremental.identifier.ObjectIdentifier;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollectionSerializer.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollectionSerializer.java
index 6f9b792..f45d4d0 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollectionSerializer.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollectionSerializer.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.incremental;
+package com.keuin.kbackupfabric.backup.incremental;
 
 import java.io.*;
 import java.util.Objects;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectElement.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/ObjectElement.java
index cbb886e..0bb7873 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectElement.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/ObjectElement.java
@@ -1,6 +1,6 @@
-package com.keuin.kbackupfabric.util.backup.incremental;
+package com.keuin.kbackupfabric.backup.incremental;
 
-import com.keuin.kbackupfabric.util.backup.incremental.identifier.ObjectIdentifier;
+import com.keuin.kbackupfabric.backup.incremental.identifier.ObjectIdentifier;
 
 import java.io.Serializable;
 import java.util.Objects;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/FileIdentifierProvider.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/FileIdentifierProvider.java
index 3fbe284..e1039d6 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/FileIdentifierProvider.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/FileIdentifierProvider.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.incremental.identifier;
+package com.keuin.kbackupfabric.backup.incremental.identifier;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/ObjectIdentifier.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/ObjectIdentifier.java
index aece07d..07cd390 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/ObjectIdentifier.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/ObjectIdentifier.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.incremental.identifier;
+package com.keuin.kbackupfabric.backup.incremental.identifier;
 
 import java.io.Serializable;
 
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/Sha256Identifier.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/Sha256Identifier.java
index c1c87e1..50e6aa4 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/Sha256Identifier.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/Sha256Identifier.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.incremental.identifier;
+package com.keuin.kbackupfabric.backup.incremental.identifier;
 
 import com.keuin.kbackupfabric.util.BytesUtil;
 
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/SingleHashIdentifier.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/SingleHashIdentifier.java
index 0f62f2b..9fd61c8 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/SingleHashIdentifier.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/SingleHashIdentifier.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.incremental.identifier;
+package com.keuin.kbackupfabric.backup.incremental.identifier;
 
 import com.keuin.kbackupfabric.util.BytesUtil;
 
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/StorageObjectLoader.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/StorageObjectLoader.java
index 96bc295..55dd6bd 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/StorageObjectLoader.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/identifier/StorageObjectLoader.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.incremental.identifier;
+package com.keuin.kbackupfabric.backup.incremental.identifier;
 
 import java.io.File;
 import java.util.Objects;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/manager/IncrementalBackupStorageManager.java b/src/main/java/com/keuin/kbackupfabric/backup/incremental/manager/IncrementalBackupStorageManager.java
index 6fd339b..1984362 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/incremental/manager/IncrementalBackupStorageManager.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/incremental/manager/IncrementalBackupStorageManager.java
@@ -1,10 +1,10 @@
-package com.keuin.kbackupfabric.util.backup.incremental.manager;
+package com.keuin.kbackupfabric.backup.incremental.manager;
 
+import com.keuin.kbackupfabric.backup.incremental.ObjectCollection;
+import com.keuin.kbackupfabric.backup.incremental.ObjectElement;
+import com.keuin.kbackupfabric.backup.incremental.identifier.ObjectIdentifier;
+import com.keuin.kbackupfabric.backup.incremental.identifier.StorageObjectLoader;
 import com.keuin.kbackupfabric.util.PrintUtil;
-import com.keuin.kbackupfabric.util.backup.incremental.ObjectCollection;
-import com.keuin.kbackupfabric.util.backup.incremental.ObjectElement;
-import com.keuin.kbackupfabric.util.backup.incremental.identifier.ObjectIdentifier;
-import com.keuin.kbackupfabric.util.backup.incremental.identifier.StorageObjectLoader;
 
 import java.io.File;
 import java.io.FileNotFoundException;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/name/BackupFileNameEncoder.java b/src/main/java/com/keuin/kbackupfabric/backup/name/BackupFileNameEncoder.java
index 8ebc7ff..8ad91f7 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/name/BackupFileNameEncoder.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/name/BackupFileNameEncoder.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.name;
+package com.keuin.kbackupfabric.backup.name;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/name/IncrementalBackupFileNameEncoder.java b/src/main/java/com/keuin/kbackupfabric/backup/name/IncrementalBackupFileNameEncoder.java
index 926f47c..8910d7f 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/name/IncrementalBackupFileNameEncoder.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/name/IncrementalBackupFileNameEncoder.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.name;
+package com.keuin.kbackupfabric.backup.name;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/name/PrimitiveBackupFileNameEncoder.java b/src/main/java/com/keuin/kbackupfabric/backup/name/PrimitiveBackupFileNameEncoder.java
index ef15ae7..c8e73f9 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/name/PrimitiveBackupFileNameEncoder.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/name/PrimitiveBackupFileNameEncoder.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.name;
+package com.keuin.kbackupfabric.backup.name;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/provider/AvailableBackupProvider.java b/src/main/java/com/keuin/kbackupfabric/backup/provider/AvailableBackupProvider.java
index caa0e84..43a7a01 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/provider/AvailableBackupProvider.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/provider/AvailableBackupProvider.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.provider;
+package com.keuin.kbackupfabric.backup.provider;
 
 /**
  * List all backup in disk. Provide their basic information as soon as possible.
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/provider/IncrementalBackupInformation.java b/src/main/java/com/keuin/kbackupfabric/backup/provider/IncrementalBackupInformation.java
index 861d210..4c4f847 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/provider/IncrementalBackupInformation.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/provider/IncrementalBackupInformation.java
@@ -1,6 +1,6 @@
-package com.keuin.kbackupfabric.util.backup.provider;
+package com.keuin.kbackupfabric.backup.provider;
 
-import com.keuin.kbackupfabric.util.backup.name.BackupFileNameEncoder;
+import com.keuin.kbackupfabric.backup.name.BackupFileNameEncoder;
 
 import java.time.LocalDateTime;
 
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/provider/PrimitiveBackupInformation.java b/src/main/java/com/keuin/kbackupfabric/backup/provider/PrimitiveBackupInformation.java
index d3d2db8..53f049c 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/provider/PrimitiveBackupInformation.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/provider/PrimitiveBackupInformation.java
@@ -1,6 +1,6 @@
-package com.keuin.kbackupfabric.util.backup.provider;
+package com.keuin.kbackupfabric.backup.provider;
 
-import com.keuin.kbackupfabric.util.backup.name.BackupFileNameEncoder;
+import com.keuin.kbackupfabric.backup.name.BackupFileNameEncoder;
 
 import java.time.LocalDateTime;
 
diff --git a/src/main/java/com/keuin/kbackupfabric/util/backup/suggestion/BackupNameSuggestionProvider.java b/src/main/java/com/keuin/kbackupfabric/backup/suggestion/BackupNameSuggestionProvider.java
index 01152c2..9eb6981 100644
--- a/src/main/java/com/keuin/kbackupfabric/util/backup/suggestion/BackupNameSuggestionProvider.java
+++ b/src/main/java/com/keuin/kbackupfabric/backup/suggestion/BackupNameSuggestionProvider.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.suggestion;
+package com.keuin.kbackupfabric.backup.suggestion;
 
 import com.mojang.brigadier.suggestion.SuggestionProvider;
 import com.mojang.brigadier.suggestion.Suggestions;
diff --git a/src/main/java/com/keuin/kbackupfabric/exception/ZipUtilException.java b/src/main/java/com/keuin/kbackupfabric/exception/ZipUtilException.java
index 88b1d18..24301f0 100644
--- a/src/main/java/com/keuin/kbackupfabric/exception/ZipUtilException.java
+++ b/src/main/java/com/keuin/kbackupfabric/exception/ZipUtilException.java
@@ -1,7 +1,7 @@
 package com.keuin.kbackupfabric.exception;
 
 public class ZipUtilException extends Exception {
-    public ZipUtilException(String string) {
-        super(string);
+    public ZipUtilException(String message) {
+        super(message);
     }
 }
diff --git a/src/main/java/com/keuin/kbackupfabric/operation/DeleteOperation.java b/src/main/java/com/keuin/kbackupfabric/operation/DeleteOperation.java
index 3ae09f5..7ebff0a 100644
--- a/src/main/java/com/keuin/kbackupfabric/operation/DeleteOperation.java
+++ b/src/main/java/com/keuin/kbackupfabric/operation/DeleteOperation.java
@@ -1,8 +1,8 @@
 package com.keuin.kbackupfabric.operation;
 
+import com.keuin.kbackupfabric.backup.suggestion.BackupNameSuggestionProvider;
 import com.keuin.kbackupfabric.operation.abstracts.InvokableAsyncBlockingOperation;
 import com.keuin.kbackupfabric.util.PrintUtil;
-import com.keuin.kbackupfabric.util.backup.suggestion.BackupNameSuggestionProvider;
 import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.command.ServerCommandSource;
@@ -10,9 +10,9 @@ import net.minecraft.server.command.ServerCommandSource;
 import java.io.File;
 import java.io.IOException;
 
+import static com.keuin.kbackupfabric.backup.BackupFilesystemUtil.getBackupSaveDirectory;
 import static com.keuin.kbackupfabric.util.PrintUtil.msgErr;
 import static com.keuin.kbackupfabric.util.PrintUtil.msgInfo;
-import static com.keuin.kbackupfabric.util.backup.BackupFilesystemUtil.getBackupSaveDirectory;
 import static org.apache.commons.io.FileUtils.forceDelete;
 
 public class DeleteOperation extends InvokableAsyncBlockingOperation {
diff --git a/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/PrimitiveBackupFeedback.java b/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/PrimitiveBackupFeedback.java
index 3bcd012..e8844a2 100644
--- a/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/PrimitiveBackupFeedback.java
+++ b/src/main/java/com/keuin/kbackupfabric/operation/backup/feedback/PrimitiveBackupFeedback.java
@@ -1,6 +1,6 @@
 package com.keuin.kbackupfabric.operation.backup.feedback;
 
-import static com.keuin.kbackupfabric.util.backup.BackupFilesystemUtil.getFriendlyFileSizeString;
+import static com.keuin.kbackupfabric.backup.BackupFilesystemUtil.getFriendlyFileSizeString;
 
 public class PrimitiveBackupFeedback implements BackupFeedback {
     private final boolean success;
diff --git a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java
index b5d2463..60b825e 100644
--- a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java
+++ b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredIncrementalBackupMethod.java
@@ -1,13 +1,13 @@
 package com.keuin.kbackupfabric.operation.backup.method;
 
+import com.keuin.kbackupfabric.backup.incremental.ObjectCollection;
+import com.keuin.kbackupfabric.backup.incremental.ObjectCollectionFactory;
+import com.keuin.kbackupfabric.backup.incremental.ObjectCollectionSerializer;
+import com.keuin.kbackupfabric.backup.incremental.identifier.Sha256Identifier;
+import com.keuin.kbackupfabric.backup.incremental.manager.IncrementalBackupStorageManager;
 import com.keuin.kbackupfabric.operation.backup.feedback.IncrementalBackupFeedback;
 import com.keuin.kbackupfabric.util.FilesystemUtil;
 import com.keuin.kbackupfabric.util.PrintUtil;
-import com.keuin.kbackupfabric.util.backup.incremental.ObjectCollection;
-import com.keuin.kbackupfabric.util.backup.incremental.ObjectCollectionFactory;
-import com.keuin.kbackupfabric.util.backup.incremental.ObjectCollectionSerializer;
-import com.keuin.kbackupfabric.util.backup.incremental.identifier.Sha256Identifier;
-import com.keuin.kbackupfabric.util.backup.incremental.manager.IncrementalBackupStorageManager;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredPrimitiveBackupMethod.java b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredPrimitiveBackupMethod.java
index 1c3c9f6..87a3043 100644
--- a/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredPrimitiveBackupMethod.java
+++ b/src/main/java/com/keuin/kbackupfabric/operation/backup/method/ConfiguredPrimitiveBackupMethod.java
@@ -1,14 +1,14 @@
 package com.keuin.kbackupfabric.operation.backup.method;
 
+import com.keuin.kbackupfabric.backup.BackupFilesystemUtil;
+import com.keuin.kbackupfabric.backup.BackupNameTimeFormatter;
+import com.keuin.kbackupfabric.backup.name.PrimitiveBackupFileNameEncoder;
 import com.keuin.kbackupfabric.exception.ZipUtilException;
 import com.keuin.kbackupfabric.metadata.BackupMetadata;
 import com.keuin.kbackupfabric.operation.backup.feedback.PrimitiveBackupFeedback;
 import com.keuin.kbackupfabric.util.FilesystemUtil;
 import com.keuin.kbackupfabric.util.PrintUtil;
 import com.keuin.kbackupfabric.util.ZipUtil;
-import com.keuin.kbackupfabric.util.backup.BackupFilesystemUtil;
-import com.keuin.kbackupfabric.util.backup.BackupNameTimeFormatter;
-import com.keuin.kbackupfabric.util.backup.name.PrimitiveBackupFileNameEncoder;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/test/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollectionFactoryTest.java b/src/test/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollectionFactoryTest.java
index 3f722a4..9a2a73c 100644
--- a/src/test/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollectionFactoryTest.java
+++ b/src/test/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollectionFactoryTest.java
@@ -1,6 +1,6 @@
-package com.keuin.kbackupfabric.util.backup.incremental;
+package com.keuin.kbackupfabric.backup.incremental;
 
-import com.keuin.kbackupfabric.util.backup.incremental.identifier.Sha256Identifier;
+import com.keuin.kbackupfabric.backup.incremental.identifier.Sha256Identifier;
 import org.junit.Test;
 
 import java.io.File;
diff --git a/src/test/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollectionSerializerTest.java b/src/test/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollectionSerializerTest.java
index 0edfe01..bd25215 100644
--- a/src/test/java/com/keuin/kbackupfabric/util/backup/incremental/ObjectCollectionSerializerTest.java
+++ b/src/test/java/com/keuin/kbackupfabric/backup/incremental/ObjectCollectionSerializerTest.java
@@ -1,6 +1,6 @@
-package com.keuin.kbackupfabric.util.backup.incremental;
+package com.keuin.kbackupfabric.backup.incremental;
 
-import com.keuin.kbackupfabric.util.backup.incremental.identifier.Sha256Identifier;
+import com.keuin.kbackupfabric.backup.incremental.identifier.Sha256Identifier;
 import org.junit.Test;
 
 import java.io.File;
diff --git a/src/test/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/Sha256IdentifierTest.java b/src/test/java/com/keuin/kbackupfabric/backup/incremental/identifier/Sha256IdentifierTest.java
index f799a95..9cd1762 100644
--- a/src/test/java/com/keuin/kbackupfabric/util/backup/incremental/identifier/Sha256IdentifierTest.java
+++ b/src/test/java/com/keuin/kbackupfabric/backup/incremental/identifier/Sha256IdentifierTest.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.incremental.identifier;
+package com.keuin.kbackupfabric.backup.incremental.identifier;
 
 import org.junit.Test;
 
diff --git a/src/test/java/com/keuin/kbackupfabric/util/backup/name/IncrementalBackupFileNameEncoderTest.java b/src/test/java/com/keuin/kbackupfabric/backup/name/IncrementalBackupFileNameEncoderTest.java
index e5fedd7..f9695d5 100644
--- a/src/test/java/com/keuin/kbackupfabric/util/backup/name/IncrementalBackupFileNameEncoderTest.java
+++ b/src/test/java/com/keuin/kbackupfabric/backup/name/IncrementalBackupFileNameEncoderTest.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.name;
+package com.keuin.kbackupfabric.backup.name;
 
 import org.junit.Test;
 
diff --git a/src/test/java/com/keuin/kbackupfabric/util/backup/name/PrimitiveBackupFileNameEncoderTest.java b/src/test/java/com/keuin/kbackupfabric/backup/name/PrimitiveBackupFileNameEncoderTest.java
index abc19d5..bb5f64b 100644
--- a/src/test/java/com/keuin/kbackupfabric/util/backup/name/PrimitiveBackupFileNameEncoderTest.java
+++ b/src/test/java/com/keuin/kbackupfabric/backup/name/PrimitiveBackupFileNameEncoderTest.java
@@ -1,4 +1,4 @@
-package com.keuin.kbackupfabric.util.backup.name;
+package com.keuin.kbackupfabric.backup.name;
 
 import org.junit.Test;