diff --git a/sgx-jvm/hsm-tool/build.gradle b/hsm-tool/build.gradle
similarity index 100%
rename from sgx-jvm/hsm-tool/build.gradle
rename to hsm-tool/build.gradle
diff --git a/sgx-jvm/hsm-tool/libs/CryptoServerCXI.jar b/hsm-tool/libs/CryptoServerCXI.jar
similarity index 100%
rename from sgx-jvm/hsm-tool/libs/CryptoServerCXI.jar
rename to hsm-tool/libs/CryptoServerCXI.jar
diff --git a/sgx-jvm/hsm-tool/libs/CryptoServerJCE.jar b/hsm-tool/libs/CryptoServerJCE.jar
similarity index 100%
rename from sgx-jvm/hsm-tool/libs/CryptoServerJCE.jar
rename to hsm-tool/libs/CryptoServerJCE.jar
diff --git a/sgx-jvm/hsm-tool/src/main/kotlin/com/r3cev/sgx/config/ToolConfig.kt b/hsm-tool/src/main/kotlin/com/r3cev/sgx/config/ToolConfig.kt
similarity index 100%
rename from sgx-jvm/hsm-tool/src/main/kotlin/com/r3cev/sgx/config/ToolConfig.kt
rename to hsm-tool/src/main/kotlin/com/r3cev/sgx/config/ToolConfig.kt
diff --git a/sgx-jvm/hsm-tool/src/main/kotlin/com/r3cev/sgx/hsmtool/Main.kt b/hsm-tool/src/main/kotlin/com/r3cev/sgx/hsmtool/Main.kt
similarity index 100%
rename from sgx-jvm/hsm-tool/src/main/kotlin/com/r3cev/sgx/hsmtool/Main.kt
rename to hsm-tool/src/main/kotlin/com/r3cev/sgx/hsmtool/Main.kt
diff --git a/sgx-jvm/hsm-tool/src/main/kotlin/com/r3cev/sgx/utils/ConfigUtilities.kt b/hsm-tool/src/main/kotlin/com/r3cev/sgx/utils/ConfigUtilities.kt
similarity index 100%
rename from sgx-jvm/hsm-tool/src/main/kotlin/com/r3cev/sgx/utils/ConfigUtilities.kt
rename to hsm-tool/src/main/kotlin/com/r3cev/sgx/utils/ConfigUtilities.kt
diff --git a/sgx-jvm/hsm-tool/src/main/kotlin/com/r3cev/sgx/utils/HsmErrors.kt b/hsm-tool/src/main/kotlin/com/r3cev/sgx/utils/HsmErrors.kt
similarity index 100%
rename from sgx-jvm/hsm-tool/src/main/kotlin/com/r3cev/sgx/utils/HsmErrors.kt
rename to hsm-tool/src/main/kotlin/com/r3cev/sgx/utils/HsmErrors.kt
diff --git a/sgx-jvm/hsm-tool/src/main/resources/com/r3cev/sgx/config/sgxtool.cfg b/hsm-tool/src/main/resources/com/r3cev/sgx/config/sgxtool.cfg
similarity index 100%
rename from sgx-jvm/hsm-tool/src/main/resources/com/r3cev/sgx/config/sgxtool.cfg
rename to hsm-tool/src/main/resources/com/r3cev/sgx/config/sgxtool.cfg
diff --git a/sgx-jvm/hsm-tool/src/main/resources/com/r3cev/sgx/utils/hsm_errors b/hsm-tool/src/main/resources/com/r3cev/sgx/utils/hsm_errors
similarity index 100%
rename from sgx-jvm/hsm-tool/src/main/resources/com/r3cev/sgx/utils/hsm_errors
rename to hsm-tool/src/main/resources/com/r3cev/sgx/utils/hsm_errors