diff --git a/src/main/java/com/r35157/nenjim/hubd/ctx/ContextManager.java b/src/main/tjava/com/r35157/nenjim/hubd/ctx/ContextManager.tjava
similarity index 50%
rename from src/main/java/com/r35157/nenjim/hubd/ctx/ContextManager.java
rename to src/main/tjava/com/r35157/nenjim/hubd/ctx/ContextManager.tjava
index dbd1826..720afae 100644
--- a/src/main/java/com/r35157/nenjim/hubd/ctx/ContextManager.java
+++ b/src/main/tjava/com/r35157/nenjim/hubd/ctx/ContextManager.tjava
@@ -1,11 +1,9 @@
 package com.r35157.nenjim.hubd.ctx;
 
-import com.r35157.nenjim.valuetypes.ctx.ContextId;
-
 import java.util.Set;
 
 public interface ContextManager {
     Context getDefault();
-    Context get(ContextId contextName);
-    Set<ContextId> getList();
+    Context get(ΩContextIdΩ contextName);
+    Set<ΩContextIdΩ> getList();
 }
diff --git a/src/main/java/com/r35157/nenjim/hubd/journal/Journal.java b/src/main/tjava/com/r35157/nenjim/hubd/journal/Journal.tjava
similarity index 89%
rename from src/main/java/com/r35157/nenjim/hubd/journal/Journal.java
rename to src/main/tjava/com/r35157/nenjim/hubd/journal/Journal.tjava
index 5e4ac24..b95ac3a 100644
--- a/src/main/java/com/r35157/nenjim/hubd/journal/Journal.java
+++ b/src/main/tjava/com/r35157/nenjim/hubd/journal/Journal.tjava
@@ -3,7 +3,6 @@ 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.journal.JournalId;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Date;
@@ -11,7 +10,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 public record Journal(
-    @NotNull JournalId id,
+    @NotNull ΩJournalIdΩ id,
     @NotNull String name,
     @NotNull Set<Release> releases
 ) {
diff --git a/src/main/java/com/r35157/nenjim/hubd/module/Dependency.java b/src/main/tjava/com/r35157/nenjim/hubd/module/Dependency.tjava
similarity index 54%
rename from src/main/java/com/r35157/nenjim/hubd/module/Dependency.java
rename to src/main/tjava/com/r35157/nenjim/hubd/module/Dependency.tjava
index 134dff1..f4d023b 100644
--- a/src/main/java/com/r35157/nenjim/hubd/module/Dependency.java
+++ b/src/main/tjava/com/r35157/nenjim/hubd/module/Dependency.tjava
@@ -1,9 +1,8 @@
 package com.r35157.nenjim.hubd.module;
 
-import com.r35157.nenjim.valuetypes.journal.JournalId;
 import org.jetbrains.annotations.NotNull;
 
 public record Dependency(
-        @NotNull JournalId dependencyId
+        @NotNull ΩJournalIdΩ dependencyId
 ) {
 }
diff --git a/src/main/java/com/r35157/nenjim/hubd/module/Release.java b/src/main/tjava/com/r35157/nenjim/hubd/module/Release.tjava
similarity index 79%
rename from src/main/java/com/r35157/nenjim/hubd/module/Release.java
rename to src/main/tjava/com/r35157/nenjim/hubd/module/Release.tjava
index ead5f7c..e3ef498 100644
--- a/src/main/java/com/r35157/nenjim/hubd/module/Release.java
+++ b/src/main/tjava/com/r35157/nenjim/hubd/module/Release.tjava
@@ -1,6 +1,5 @@
 package com.r35157.nenjim.hubd.module;
 
-import com.r35157.libs.valuetypes.basic.Checksum;
 import com.r35157.libs.valuetypes.basic.SemanticVersion;
 import org.jetbrains.annotations.NotNull;
 
@@ -10,6 +9,6 @@ import java.util.Set;
 public record Release(
         @NotNull SemanticVersion version,
         @NotNull Date releaseDate,
-        @NotNull Checksum checksum,
+        @NotNull ΩChecksumΩ checksum,
         @NotNull Set<Dependency> dependencies
 ) {}