diff --git a/build.xml b/build.xml
index 978c8a6..7981bba 100644
--- a/build.xml
+++ b/build.xml
@@ -4,7 +4,10 @@
     JavaCard Applet for the Kyber Post-Quantum-Cryptography Algorithm
   </description>
 
-  <property name="JCSDK" value="./oracle_javacard_sdks/jc305u4_kit" />
+  <property environment="env"/>
+  <property name="EXPORT" value="crystal.cap" />
+  <property name="RID" value="A000000648" />
+  <property name="AID" value="2F0002" />
 
   <target name="clean">
     <delete dir="build" />
@@ -12,7 +15,7 @@
 
   <target name="check.sdk">
     <condition property="jcsdk.exists">
-      <available file="${JCSDK}" type="dir" />
+      <available file="${env.JC_HOME}" type="dir" />
     </condition>
   </target>
 
@@ -22,27 +25,38 @@
     </condition>
   </target>
 
+  <target name="check.build.dir">
+    <condition property="build.dir.exists">
+      <available file="build" type="dir" />
+    </condition>
+  </target>
+
+  <target name="build.dir" depends="check.build.dir" unless="build.dir.exists">
+    <mkdir dir="build" />
+  </target>
+
   <target name="setup" depends="check.sdk" if="jcsdk.exists">
     <mkdir dir="tools"/>
     <get src="https://github.com/martinpaljak/ant-javacard/releases/download/v24.11.19/ant-javacard.jar" dest="tools" skipexisting="true"/>
     <get src="https://github.com/martinpaljak/GlobalPlatformPro/releases/download/v24.10.15/gp.jar" dest="tools" skipexisting="true"/>
   </target>
 
-  <target name="build" depends="clean,check.tool" if="tool.exists">
+  <target name="build" depends="clean,check.tool,build.dir" if="tool.exists">
     <!-- ant-javacard task from javacard.pro -->
     <taskdef name="javacard" classname="pro.javacard.ant.JavaCard" classpath="tools/ant-javacard.jar" />
-    <javacard jckit="${JCSDK}">
-      <cap output="build/cyber.cap" aid="A000000648" sources="src" targetsdk="./oracle_javacard_sdks/jc221_kit">
-        <applet class="org.hacdc.cyber.Cyber" aid="A0000006482F0002" />
+    <javacard jckit="${env.JC_HOME}">
+      <cap aid="${RID}" sources="src/org/hacdc/crystal" targetsdk="${env.JC_CLASSIC_HOME}">
+        <applet class="org.hacdc.crystal.Crystal" aid="${RID}${AID}" />
       </cap>
     </javacard>
+    <!-- <move file="CRYSTAL-TEMP.cap" tofile="build/crystal.cap" /> -->
   </target>
 
   <!-- Install Applet -->
   <target name="install" depends="build">
     <java jar="tools/gp.jar" fork="true">
       <arg value="-reinstall" />
-      <arg value="build/cyber.cap" />
+      <arg value="build/crystal.cap" />
     </java>
   </target>
 
diff --git a/env.ps1 b/env.ps1
new file mode 100644
index 0000000..b1dfd8e
--- /dev/null
+++ b/env.ps1
@@ -0,0 +1,3 @@
+$Env:JC_HOME = $PWD.Path + '\oracle_javacard_sdks\jc305u4_kit';
+$Env:JC_CLASSIC_HOME = $PWD.Path + '\oracle_javacard_sdks\jc221_kit';
+$Env:PATH = $Env:JAVA_HOME + '\bin;' + $Env:ANT_HOME + '\bin;' + $Env:JC_HOME + '\bin;' + $Env:JC_CLASSIC_HOME + '\bin;' + $Env:PATH;
diff --git a/src/org/hacdc/cyber/Cyber.java b/src/org/hacdc/crystal/Crystal.java
similarity index 81%
rename from src/org/hacdc/cyber/Cyber.java
rename to src/org/hacdc/crystal/Crystal.java
index a381330..c128c2c 100644
--- a/src/org/hacdc/cyber/Cyber.java
+++ b/src/org/hacdc/crystal/Crystal.java
@@ -3,10 +3,10 @@ package org.hacdc.cyber;
 import javacard.framework.APDU;
 import javacard.framework.Applet;
 
-public class Cyber extends Applet {
+public class Crystal extends Applet {
     public static void install(byte[] buffer, short offset, byte length){
 		// GP-compliant JavaCard applet registration
-		new Cyber().register();
+		new Crystal().register();
 	}
 
     public void process(APDU apdu){