From cd3fae4eb0c8c0d9fae5de426987f10a4d32f533 Mon Sep 17 00:00:00 2001
From: Xiao X <xiao@mathai.cloud>
Date: Wed, 3 Jun 2026 06:44:40 -0400
Subject: [PATCH] fix file directories after merge + config changes

---
 XACrypto.iml                                       |  2 +-
 pom.xml                                            | 14 ++++++++++++--
 .../xacrypto/zekerrijndael/ECB/Blowfish.java       |  0
 .../zekerrijndael/ECB/ciphers/AriaECB.java         |  0
 .../zekerrijndael/ECB/ciphers/BlowfishECB.java     |  0
 .../xacrypto/zekerrijndael/ECB/ciphers/SM4ECB.java |  0
 .../xacrypto/zekerrijndael/Factories.java          |  1 -
 .../caydenno1/xacrypto/zekerrijndael/GCM/AES.java  |  0
 .../xacrypto/zekerrijndael/GCM/BlockCipher.java    |  0
 .../caydenno1/xacrypto/zekerrijndael/GCM/GCM.java  |  0
 .../xacrypto/zekerrijndael/GCM/GHASH.java          |  0
 .../xacrypto/zekerrijndael/GCM/Result.java         |  0
 .../xacrypto/zekerrijndael/GCM/Serpent.java        |  2 --
 .../xacrypto/zekerrijndael/GCM/Twofish.java        |  1 -
 .../xacrypto/zekerrijndael/GCM/ciphers/AESGCM.java |  0
 .../zekerrijndael/GCM/ciphers/ARIAGCM.java         |  0
 .../zekerrijndael/GCM/ciphers/Camellia.java        |  0
 .../xacrypto/zekerrijndael/GCM/ciphers/SM4GCM.java |  0
 .../zekerrijndael/GCM/ciphers/SerpentGCM.java      |  3 ---
 .../zekerrijndael/GCM/ciphers/TwofishGCM.java      |  0
 .../xacrypto/zekerrijndael/Global/Aria.java        |  0
 .../xacrypto/zekerrijndael/UnchangingData.java     |  0
 22 files changed, 13 insertions(+), 10 deletions(-)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/ECB/Blowfish.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/AriaECB.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/BlowfishECB.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/SM4ECB.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/Factories.java (96%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/AES.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/BlockCipher.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/GCM.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/GHASH.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/Result.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/Serpent.java (98%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/Twofish.java (99%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/AESGCM.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/ARIAGCM.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/Camellia.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SM4GCM.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SerpentGCM.java (77%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/TwofishGCM.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/Global/Aria.java (100%)
 rename src/{ => main/java}/de/caydenno1/xacrypto/zekerrijndael/UnchangingData.java (100%)

diff --git a/XACrypto.iml b/XACrypto.iml
index a80f8af..abe781f 100644
--- a/XACrypto.iml
+++ b/XACrypto.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
+<module version="4">
   <component name="AdditionalModuleElements">
     <content url="file://$MODULE_DIR$" dumb="true">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
diff --git a/pom.xml b/pom.xml
index 8611de6..3a6620a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>de.caydenno1.xacrypto</groupId>
@@ -85,5 +85,15 @@
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>6</source>
+          <target>6</target>
+        </configuration>
+      </plugin>
+    </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/ECB/Blowfish.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/ECB/Blowfish.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/ECB/Blowfish.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/ECB/Blowfish.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/AriaECB.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/AriaECB.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/AriaECB.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/AriaECB.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/BlowfishECB.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/BlowfishECB.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/BlowfishECB.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/BlowfishECB.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/SM4ECB.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/SM4ECB.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/SM4ECB.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/ECB/ciphers/SM4ECB.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/Factories.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/Factories.java
similarity index 96%
rename from src/de/caydenno1/xacrypto/zekerrijndael/Factories.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/Factories.java
index a9e9b34..c6ae2d5 100644
--- a/src/de/caydenno1/xacrypto/zekerrijndael/Factories.java
+++ b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/Factories.java
@@ -5,7 +5,6 @@ import de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.AriaECB;
 import de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.BlowfishECB;
 import de.caydenno1.xacrypto.zekerrijndael.ECB.ciphers.SM4ECB;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.AES;
-import de.caydenno1.xacrypto.zekerrijndael.GCM.BlockCipher;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.ciphers.*;
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/AES.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/AES.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/AES.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/AES.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/BlockCipher.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/BlockCipher.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/BlockCipher.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/BlockCipher.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/GCM.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/GCM.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/GCM.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/GCM.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/GHASH.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/GHASH.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/GHASH.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/GHASH.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/Result.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/Result.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/Result.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/Result.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/Serpent.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/Serpent.java
similarity index 98%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/Serpent.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/Serpent.java
index 3b9fe8b..47be5c7 100644
--- a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/Serpent.java
+++ b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/Serpent.java
@@ -2,8 +2,6 @@ package de.caydenno1.xacrypto.zekerrijndael.GCM;
 
 import de.caydenno1.xacrypto.misc.XACryptoException;
 
-import java.lang.reflect.InvocationTargetException;
-
 import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.SERPENT_SBOX;
 import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.SERPENT_IBOX;
 import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.SERPENT_PHI;
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/Twofish.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/Twofish.java
similarity index 99%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/Twofish.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/Twofish.java
index 3212557..cf3900a 100644
--- a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/Twofish.java
+++ b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/Twofish.java
@@ -1,7 +1,6 @@
 package de.caydenno1.xacrypto.zekerrijndael.GCM;
 
 import de.caydenno1.xacrypto.misc.XACryptoException;
-import de.caydenno1.xacrypto.zekerrijndael.UnchangingData;
 
 import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.TWOFISH_Q0;
 import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.TWOFISH_Q1;
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/AESGCM.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/AESGCM.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/AESGCM.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/AESGCM.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/ARIAGCM.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/ARIAGCM.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/ARIAGCM.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/ARIAGCM.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/Camellia.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/Camellia.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/Camellia.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/Camellia.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SM4GCM.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SM4GCM.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SM4GCM.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SM4GCM.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SerpentGCM.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SerpentGCM.java
similarity index 77%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SerpentGCM.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SerpentGCM.java
index 8b4f02a..6a33299 100644
--- a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SerpentGCM.java
+++ b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/SerpentGCM.java
@@ -1,14 +1,11 @@
 package de.caydenno1.xacrypto.zekerrijndael.GCM.ciphers;
 
 import de.caydenno1.xacrypto.misc.XACryptoException;
-import de.caydenno1.xacrypto.zekerrijndael.GCM.BlockCipher;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.GCM;
 import de.caydenno1.xacrypto.zekerrijndael.GCM.Serpent;
 
 import java.lang.reflect.InvocationTargetException;
 
-import static de.caydenno1.xacrypto.zekerrijndael.UnchangingData.SERPENT_SBOX;
-
 public class SerpentGCM extends GCM {
     public SerpentGCM(byte[] key) throws XACryptoException, InvocationTargetException, NoSuchMethodException, IllegalAccessException { super(new Serpent(key)); }
 }
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/TwofishGCM.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/TwofishGCM.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/TwofishGCM.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/GCM/ciphers/TwofishGCM.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/Global/Aria.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/Global/Aria.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/Global/Aria.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/Global/Aria.java
diff --git a/src/de/caydenno1/xacrypto/zekerrijndael/UnchangingData.java b/src/main/java/de/caydenno1/xacrypto/zekerrijndael/UnchangingData.java
similarity index 100%
rename from src/de/caydenno1/xacrypto/zekerrijndael/UnchangingData.java
rename to src/main/java/de/caydenno1/xacrypto/zekerrijndael/UnchangingData.java