diff --git a/src/main/java/com/r35157/nenjim/hubd/Module.java b/src/main/java/com/r35157/nenjim/hubd/Module.java
deleted file mode 100644
index c97b23c..0000000
--- a/src/main/java/com/r35157/nenjim/hubd/Module.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.r35157.nenjim.hubd;
-
-public record Module() {
-}
diff --git a/src/main/java/com/r35157/nenjim/hubd/NenjimHub.java b/src/main/java/com/r35157/nenjim/hubd/NenjimHub.java
index 6c40cd5..2685456 100644
--- a/src/main/java/com/r35157/nenjim/hubd/NenjimHub.java
+++ b/src/main/java/com/r35157/nenjim/hubd/NenjimHub.java
@@ -1,5 +1,6 @@
 package com.r35157.nenjim.hubd;
 
+import com.r35157.nenjim.hubd.journal.Journal;
 import org.jetbrains.annotations.NotNull;
 
 public interface NenjimHub {
diff --git a/src/main/java/com/r35157/nenjim/hubd/Context.java b/src/main/java/com/r35157/nenjim/hubd/ctx/Context.java
similarity index 88%
rename from src/main/java/com/r35157/nenjim/hubd/Context.java
rename to src/main/java/com/r35157/nenjim/hubd/ctx/Context.java
index 527ab77..fa5dec4 100644
--- a/src/main/java/com/r35157/nenjim/hubd/Context.java
+++ b/src/main/java/com/r35157/nenjim/hubd/ctx/Context.java
@@ -1,4 +1,4 @@
-package com.r35157.nenjim.hubd;
+package com.r35157.nenjim.hubd.ctx;
 
 import com.r35157.libs.valuetypes.basic.SemanticVersion;
 
diff --git a/src/main/java/com/r35157/nenjim/hubd/ctx/ContextManager.java b/src/main/java/com/r35157/nenjim/hubd/ctx/ContextManager.java
new file mode 100644
index 0000000..caa4da8
--- /dev/null
+++ b/src/main/java/com/r35157/nenjim/hubd/ctx/ContextManager.java
@@ -0,0 +1,4 @@
+package com.r35157.nenjim.hubd.ctx;
+
+public interface ContextManager {
+}
diff --git a/src/main/java/com/r35157/nenjim/hubd/Journal.java b/src/main/java/com/r35157/nenjim/hubd/journal/Journal.java
similarity index 82%
rename from src/main/java/com/r35157/nenjim/hubd/Journal.java
rename to src/main/java/com/r35157/nenjim/hubd/journal/Journal.java
index 86360f4..a3952ce 100644
--- a/src/main/java/com/r35157/nenjim/hubd/Journal.java
+++ b/src/main/java/com/r35157/nenjim/hubd/journal/Journal.java
@@ -1,6 +1,8 @@
-package com.r35157.nenjim.hubd;
+package com.r35157.nenjim.hubd.journal;
 
 import com.r35157.libs.valuetypes.basic.SemanticVersion;
+import com.r35157.nenjim.hubd.module.Dependency;
+import com.r35157.nenjim.hubd.module.Release;
 import com.r35157.nenjim.valuetypes.NenjimJournalId;
 import org.jetbrains.annotations.NotNull;
 
diff --git a/src/main/java/com/r35157/nenjim/hubd/journal/JournalManager.java b/src/main/java/com/r35157/nenjim/hubd/journal/JournalManager.java
new file mode 100644
index 0000000..1a10d2d
--- /dev/null
+++ b/src/main/java/com/r35157/nenjim/hubd/journal/JournalManager.java
@@ -0,0 +1,4 @@
+package com.r35157.nenjim.hubd.journal;
+
+public interface JournalManager {
+}
diff --git a/src/main/java/com/r35157/nenjim/hubd/Dependency.java b/src/main/java/com/r35157/nenjim/hubd/module/Dependency.java
similarity index 81%
rename from src/main/java/com/r35157/nenjim/hubd/Dependency.java
rename to src/main/java/com/r35157/nenjim/hubd/module/Dependency.java
index a29b637..3d10a33 100644
--- a/src/main/java/com/r35157/nenjim/hubd/Dependency.java
+++ b/src/main/java/com/r35157/nenjim/hubd/module/Dependency.java
@@ -1,4 +1,4 @@
-package com.r35157.nenjim.hubd;
+package com.r35157.nenjim.hubd.module;
 
 import org.jetbrains.annotations.NotNull;
 import com.r35157.nenjim.valuetypes.NenjimJournalId;
diff --git a/src/main/java/com/r35157/nenjim/hubd/module/Module.java b/src/main/java/com/r35157/nenjim/hubd/module/Module.java
new file mode 100644
index 0000000..ec7899f
--- /dev/null
+++ b/src/main/java/com/r35157/nenjim/hubd/module/Module.java
@@ -0,0 +1,4 @@
+package com.r35157.nenjim.hubd.module;
+
+public record Module() {
+}
diff --git a/src/main/java/com/r35157/nenjim/hubd/Release.java b/src/main/java/com/r35157/nenjim/hubd/module/Release.java
similarity index 90%
rename from src/main/java/com/r35157/nenjim/hubd/Release.java
rename to src/main/java/com/r35157/nenjim/hubd/module/Release.java
index 2ed18a9..ead5f7c 100644
--- a/src/main/java/com/r35157/nenjim/hubd/Release.java
+++ b/src/main/java/com/r35157/nenjim/hubd/module/Release.java
@@ -1,4 +1,4 @@
-package com.r35157.nenjim.hubd;
+package com.r35157.nenjim.hubd.module;
 
 import com.r35157.libs.valuetypes.basic.Checksum;
 import com.r35157.libs.valuetypes.basic.SemanticVersion;