diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCore.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/Base2WarpCore.java
similarity index 94%
rename from gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCore.java
rename to gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/Base2WarpCore.java
index 5f3f7670..efabd3e8 100644
--- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCore.java
+++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/Base2WarpCore.java
@@ -1,4 +1,4 @@
-package love.distributedrebirth.numberxd.base2t.part.warp;
+package love.distributedrebirth.numberxd.base2t;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -14,7 +14,6 @@ import love.distributedrebirth.bassboonyd.jmx.MBeanStoreKeyᴶᴹˣ;
 import love.distributedrebirth.bassboonyd.jmx.DefaultEnumInstanceᴶᴹˣ;
 import love.distributedrebirth.bassboonyd.jmx.GuageCounterᴶᴹˣ;
 import love.distributedrebirth.bassboonyd.jmx.StringAttributeᴶᴹˣ;
-import love.distributedrebirth.numberxd.base2t.Base2PartsFactory;
 import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartKeyʸᴰ;
 import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartʸᴰ;
 import love.distributedrebirth.warpme.core.WaterBucket;
@@ -23,9 +22,9 @@ import love.distributedrebirth.warpme.core.WaterCipherHeart;
 import love.distributedrebirth.warpme.core.WaterCipherHeartTone;
 
 @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天")
-@BãßBȍőnClassInfoʸᴰ(name = "TOSWarpCore", purpose = "The warpcore writer and armor manager.")
+@BãßBȍőnClassInfoʸᴰ(name = "Base2WarpCore", purpose = "The warpcore writer and armor manager.")
 @BãßBȍőnPackageInfoʸᴰ(name = "love.distributedrebirth.numberxd")
-public enum TOSWarpCore implements DefaultEnumInstanceᴶᴹˣ<TOSWarpCore,MBeanStoreKeyᴶᴹˣ> {
+public enum Base2WarpCore implements DefaultEnumInstanceᴶᴹˣ<Base2WarpCore,MBeanStoreKeyᴶᴹˣ> {
 	
 	INSTANCE;
 	
@@ -38,7 +37,7 @@ public enum TOSWarpCore implements DefaultEnumInstanceᴶᴹˣ<TOSWarpCore,MBean
 	private final BãßBȍőnCoffinOpenʸᴰ<MBeanStoreKeyᴶᴹˣ> BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance();
 	public BãßBȍőnCoffinʸᴰ<MBeanStoreKeyᴶᴹˣ> GET_BBC() { return BBC; }
 	
-	private TOSWarpCore() {
+	private Base2WarpCore() {
 		BBC.BOON_INIT(this);
 		BȍőnJmxInit(MBeanStoreKeyᴶᴹˣ.JMX);
 		warpCoreReads = BȍőnJmxInitGuageCounter(MBeanStoreKeyᴶᴹˣ.JMX, "warpCoreReads", "The amount of warpcore reads.");
diff --git a/gdxapp4d-lib-numberxd/src/test/java/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreTest.java b/gdxapp4d-lib-numberxd/src/test/java/love/distributedrebirth/numberxd/base2t/Base2WarpCoreTest.java
similarity index 79%
rename from gdxapp4d-lib-numberxd/src/test/java/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreTest.java
rename to gdxapp4d-lib-numberxd/src/test/java/love/distributedrebirth/numberxd/base2t/Base2WarpCoreTest.java
index 50310a70..295edc4d 100644
--- a/gdxapp4d-lib-numberxd/src/test/java/love/distributedrebirth/numberxd/base2t/part/warp/TOSWarpCoreTest.java
+++ b/gdxapp4d-lib-numberxd/src/test/java/love/distributedrebirth/numberxd/base2t/Base2WarpCoreTest.java
@@ -1,17 +1,18 @@
-package love.distributedrebirth.numberxd.base2t.part.warp;
+package love.distributedrebirth.numberxd.base2t;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
+import love.distributedrebirth.numberxd.base2t.Base2WarpCore;
 import love.distributedrebirth.warpme.core.WaterBucket;
 
 @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天")
-public class TOSWarpCoreTest {
+public class Base2WarpCoreTest {
 
 	@Test
 	public void testCurrentWarpCore() {
-		WaterBucket warpCore = TOSWarpCore.INSTANCE.BãßCurrentWarpCore();
+		WaterBucket warpCore = Base2WarpCore.INSTANCE.BãßCurrentWarpCore();
 		Assertions.assertNotNull(warpCore);
 		Assertions.assertNotNull(warpCore.theWater());
 		Assertions.assertNotNull(warpCore.theWater().getName());
@@ -23,19 +24,19 @@ public class TOSWarpCoreTest {
 	
 	@Test
 	public void testValidateWarpCore() {
-		WaterBucket warpCore = TOSWarpCore.INSTANCE.BãßCurrentWarpCore();
+		WaterBucket warpCore = Base2WarpCore.INSTANCE.BãßCurrentWarpCore();
 		
 		warpCore.theWater().getCipherHearts().get(5).getHeartTones().get(0).setChinaKey("零");
 		warpCore.theWater().getCipherHearts().get(5).getHeartTones().get(1).setChinaKey("零");
 		IllegalArgumentException thrownKey = Assertions.assertThrows(IllegalArgumentException.class, () -> {
-			TOSWarpCore.INSTANCE.BãßValidateWarpCore(warpCore);
+			Base2WarpCore.INSTANCE.BãßValidateWarpCore(warpCore);
 		});
 		Assertions.assertEquals("Duplicate chinaKey: 零", thrownKey.getMessage());
 		
 		warpCore.theWater().getCipherHearts().get(4).getHeartTones().get(0).setChinaValue("pink");
 		warpCore.theWater().getCipherHearts().get(4).getHeartTones().get(1).setChinaValue("pink");
 		IllegalArgumentException thrownValue = Assertions.assertThrows(IllegalArgumentException.class, () -> {
-			TOSWarpCore.INSTANCE.BãßValidateWarpCore(warpCore);
+			Base2WarpCore.INSTANCE.BãßValidateWarpCore(warpCore);
 		});
 		Assertions.assertEquals("Duplicate chinaValue: pink", thrownValue.getMessage());
 	}
diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java
index 4f6f3970..925e4395 100644
--- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java
+++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java
@@ -123,7 +123,6 @@ public class GDXAppTos4BootFactory {
 				"love.distributedrebirth.numberxd,"+
 				"love.distributedrebirth.numberxd.base2t,"+
 				"love.distributedrebirth.numberxd.base2t.part,"+
-				"love.distributedrebirth.numberxd.base2t.part.warp,"+
 				"love.distributedrebirth.numberxd.base2t.type,"+
 				"love.distributedrebirth.numberxd.base2t.typexl,"+
 				"love.distributedrebirth.numberxd.x4o,"+
diff --git a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java
index 37ea0f06..c1ff71fd 100644
--- a/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java
+++ b/gdxapp4d-vrgem4/src/main/java/love/distributedrebirth/gdxapp4d/vrgem4/GDXAppVrGem4Activator.java
@@ -32,7 +32,7 @@ import love.distributedrebirth.gdxapp4d.vrgem4.screen.ScreenIntroMission;
 import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService;
 import love.distributedrebirth.numberxd.base2t.Base2PartsFactory;
 import love.distributedrebirth.numberxd.base2t.Base2Terminator;
-import love.distributedrebirth.numberxd.base2t.part.warp.TOSWarpCore;
+import love.distributedrebirth.numberxd.base2t.Base2WarpCore;
 import love.distributedrebirth.unicode4d.BaseGlyphSet;
 import love.distributedrebirth.warpme.ship.WaterShipOcean;
 
@@ -142,7 +142,7 @@ public class GDXAppVrGem4Activator implements BundleActivator {
 		*/
 		if (!bootArgs.isWarpCoreNoLock()) {
 			bootScreen.bootLine("warpcore-lock: BãßLockWarpCipher");
-			TOSWarpCore.INSTANCE.BãßLockWarpCipher(v -> {});
+			Base2WarpCore.INSTANCE.BãßLockWarpCipher(v -> {});
 		} else {
 			bootScreen.bootLine("warpcore-nolock: requested");
 		}
@@ -238,7 +238,7 @@ public class GDXAppVrGem4Activator implements BundleActivator {
 				BaseGlyphSet.values()[0],
 				Base2Terminator.INSTANCE,
 				Base2PartsFactory.INSTANCE,
-				TOSWarpCore.INSTANCE
+				Base2WarpCore.INSTANCE
 		};
 	}
 }
diff --git a/pom.xml b/pom.xml
index a25c020d..82ecf6db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,6 @@
 			love.distributedrebirth.numberxd,
 			love.distributedrebirth.numberxd.base2t,
 			love.distributedrebirth.numberxd.base2t.part,
-			love.distributedrebirth.numberxd.base2t.part.warp,
 			love.distributedrebirth.numberxd.base2t.type,
 			love.distributedrebirth.numberxd.base2t.typexl,
 			love.distributedrebirth.numberxd.x4o,