diff --git a/.github/workflows/ci-hamr.yml b/.github/workflows/ci-hamr.yml
index 52e3965..4582f89 100644
--- a/.github/workflows/ci-hamr.yml
+++ b/.github/workflows/ci-hamr.yml
@@ -47,7 +47,7 @@ jobs:
         id: cache-osate
         uses: actions/cache@v4
         with:
-          path: kekinian/hamr/codegen/bin/linux/osate
+          path: kekinian/bin/linux/osate
           key: ${{ runner.os }}-${{ hashFiles('kekinian/hamr/codegen/jvm/src/main/resources/phantom_versions.properties') }}-osate
       - name: Build
         run: |
@@ -67,9 +67,9 @@ jobs:
           
           sireum
 
-          cp $SIREUM_HOME/bin/sireum.jar $SIREUM_HOME/hamr/codegen/bin/sireum.jar
-          $SIREUM_HOME/hamr/codegen/bin/build.cmd install-osate-gumbo
-          export OSATE_HOME=$SIREUM_HOME/hamr/codegen/bin/linux/osate
+          #cp $SIREUM_HOME/bin/sireum.jar $SIREUM_HOME/hamr/codegen/bin/sireum.jar
+          sireum slang run $SIREUM_HOME/hamr/codegen/bin/build.cmd install-osate-gumbo
+          export OSATE_HOME=$SIREUM_HOME/bin/linux/osate
 
           export MICROKIT_BOARD=qemu_virt_aarch64
           export MICROKIT_SDK=/root/microkit/release/microkit-sdk-1.4.1-dev.14+cf88629
diff --git a/micro-examples/microkit/aadl_port_types/data/array/readme.md b/micro-examples/microkit/aadl_port_types/data/array/readme.md
index c86f7fa..5d02816 100644
--- a/micro-examples/microkit/aadl_port_types/data/array/readme.md
+++ b/micro-examples/microkit/aadl_port_types/data/array/readme.md
@@ -91,10 +91,10 @@
 
 1. *OPTIONAL* Rerun codegen
    
-    Launch the Slash script [micro-examples/microkit/aadl_port_types/data/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
+    Launch the Slash script [micro-examples/microkit/aadl_port_types/data/array/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
 
    ```
-   micro-examples/microkit/aadl_port_types/data/aadl/bin/run-hamr.cmd
+   micro-examples/microkit/aadl_port_types/data/array/aadl/bin/run-hamr.cmd
    ```
 
 1. Build and simulate the image
@@ -104,7 +104,7 @@
     ```
     export MICROKIT_BOARD=qemu_virt_aarch64
     export MICROKIT_SDK=/root/microkit/release/microkit-sdk-1.4.1-dev.14+cf88629
-    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/data/hamr/microkit
+    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/data/array/hamr/microkit
     make qemu
     ```
 
diff --git a/micro-examples/microkit/aadl_port_types/data/base_type/readme.md b/micro-examples/microkit/aadl_port_types/data/base_type/readme.md
index 629de5a..02dc566 100644
--- a/micro-examples/microkit/aadl_port_types/data/base_type/readme.md
+++ b/micro-examples/microkit/aadl_port_types/data/base_type/readme.md
@@ -91,10 +91,10 @@
 
 1. *OPTIONAL* Rerun codegen
    
-    Launch the Slash script [micro-examples/microkit/aadl_port_types/data/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
+    Launch the Slash script [micro-examples/microkit/aadl_port_types/data/base_type/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
 
    ```
-   micro-examples/microkit/aadl_port_types/data/aadl/bin/run-hamr.cmd
+   micro-examples/microkit/aadl_port_types/data/base_type/aadl/bin/run-hamr.cmd
    ```
 
 1. Build and simulate the image
@@ -104,7 +104,7 @@
     ```
     export MICROKIT_BOARD=qemu_virt_aarch64
     export MICROKIT_SDK=/root/microkit/release/microkit-sdk-1.4.1-dev.14+cf88629
-    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/data/hamr/microkit
+    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/data/base_type/hamr/microkit
     make qemu
     ```
 
diff --git a/micro-examples/microkit/aadl_port_types/data/struct/readme.md b/micro-examples/microkit/aadl_port_types/data/struct/readme.md
index 9ac438c..c7e4cec 100644
--- a/micro-examples/microkit/aadl_port_types/data/struct/readme.md
+++ b/micro-examples/microkit/aadl_port_types/data/struct/readme.md
@@ -91,10 +91,10 @@
 
 1. *OPTIONAL* Rerun codegen
    
-    Launch the Slash script [micro-examples/microkit/aadl_port_types/data/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
+    Launch the Slash script [micro-examples/microkit/aadl_port_types/data/struct/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
 
    ```
-   micro-examples/microkit/aadl_port_types/data/aadl/bin/run-hamr.cmd
+   micro-examples/microkit/aadl_port_types/data/struct/aadl/bin/run-hamr.cmd
    ```
 
 1. Build and simulate the image
@@ -104,7 +104,7 @@
     ```
     export MICROKIT_BOARD=qemu_virt_aarch64
     export MICROKIT_SDK=/root/microkit/release/microkit-sdk-1.4.1-dev.14+cf88629
-    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/data/hamr/microkit
+    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/data/struct/hamr/microkit
     make qemu
     ```
 
diff --git a/micro-examples/microkit/aadl_port_types/event_data/array/readme.md b/micro-examples/microkit/aadl_port_types/event_data/array/readme.md
index 7a52eee..3592516 100644
--- a/micro-examples/microkit/aadl_port_types/event_data/array/readme.md
+++ b/micro-examples/microkit/aadl_port_types/event_data/array/readme.md
@@ -90,10 +90,10 @@
 
 1. *OPTIONAL* Rerun codegen
    
-    Launch the Slash script [micro-examples/microkit/aadl_port_types/event_data/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
+    Launch the Slash script [micro-examples/microkit/aadl_port_types/event_data/array/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
 
    ```
-   micro-examples/microkit/aadl_port_types/event_data/aadl/bin/run-hamr.cmd
+   micro-examples/microkit/aadl_port_types/event_data/array/aadl/bin/run-hamr.cmd
    ```
 
 1. Build and simulate the image
@@ -103,7 +103,7 @@
     ```
     export MICROKIT_BOARD=qemu_virt_aarch64
     export MICROKIT_SDK=/root/microkit/release/microkit-sdk-1.4.1-dev.14+cf88629
-    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/event_data/hamr/microkit
+    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/event_data/array/hamr/microkit
     make qemu
     ```
 
diff --git a/micro-examples/microkit/aadl_port_types/event_data/base_type/readme.md b/micro-examples/microkit/aadl_port_types/event_data/base_type/readme.md
index a69bdee..937eb7a 100644
--- a/micro-examples/microkit/aadl_port_types/event_data/base_type/readme.md
+++ b/micro-examples/microkit/aadl_port_types/event_data/base_type/readme.md
@@ -90,10 +90,10 @@
 
 1. *OPTIONAL* Rerun codegen
    
-    Launch the Slash script [micro-examples/microkit/aadl_port_types/event_data/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
+    Launch the Slash script [micro-examples/microkit/aadl_port_types/event_data/base_type/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
 
    ```
-   micro-examples/microkit/aadl_port_types/event_data/aadl/bin/run-hamr.cmd
+   micro-examples/microkit/aadl_port_types/event_data/base_type/aadl/bin/run-hamr.cmd
    ```
 
 1. Build and simulate the image
@@ -103,7 +103,7 @@
     ```
     export MICROKIT_BOARD=qemu_virt_aarch64
     export MICROKIT_SDK=/root/microkit/release/microkit-sdk-1.4.1-dev.14+cf88629
-    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/event_data/hamr/microkit
+    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/event_data/base_type/hamr/microkit
     make qemu
     ```
 
diff --git a/micro-examples/microkit/aadl_port_types/event_data/struct/readme.md b/micro-examples/microkit/aadl_port_types/event_data/struct/readme.md
index 628a021..d7a0914 100644
--- a/micro-examples/microkit/aadl_port_types/event_data/struct/readme.md
+++ b/micro-examples/microkit/aadl_port_types/event_data/struct/readme.md
@@ -90,10 +90,10 @@
 
 1. *OPTIONAL* Rerun codegen
    
-    Launch the Slash script [micro-examples/microkit/aadl_port_types/event_data/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
+    Launch the Slash script [micro-examples/microkit/aadl_port_types/event_data/struct/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
 
    ```
-   micro-examples/microkit/aadl_port_types/event_data/aadl/bin/run-hamr.cmd
+   micro-examples/microkit/aadl_port_types/event_data/struct/aadl/bin/run-hamr.cmd
    ```
 
 1. Build and simulate the image
@@ -103,7 +103,7 @@
     ```
     export MICROKIT_BOARD=qemu_virt_aarch64
     export MICROKIT_SDK=/root/microkit/release/microkit-sdk-1.4.1-dev.14+cf88629
-    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/event_data/hamr/microkit
+    cd $HOME/INSPECTA-models/micro-examples/microkit/aadl_port_types/event_data/struct/hamr/microkit
     make qemu
     ```
 
diff --git a/micro-examples/microkit/port_queues/event_data_array/readme.md b/micro-examples/microkit/port_queues/event_data_array/readme.md
index b4826e8..46683a8 100644
--- a/micro-examples/microkit/port_queues/event_data_array/readme.md
+++ b/micro-examples/microkit/port_queues/event_data_array/readme.md
@@ -91,10 +91,10 @@
 
 1. *OPTIONAL* Rerun codegen
    
-    Launch the Slash script [micro-examples/microkit/port_queues/event_data_struct/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
+    Launch the Slash script [micro-examples/microkit/port_queues/event_data_array/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
 
    ```
-   micro-examples/microkit/port_queues/event_data_struct/aadl/bin/run-hamr.cmd
+   micro-examples/microkit/port_queues/event_data_array/aadl/bin/run-hamr.cmd
    ```
 
 1. Build and simulate the image
@@ -104,7 +104,7 @@
     ```
     export MICROKIT_BOARD=qemu_virt_aarch64
     export MICROKIT_SDK=/root/microkit/release/microkit-sdk-1.4.1-dev.14+cf88629
-    cd $HOME/INSPECTA-models/micro-examples/microkit/port_queues/event_data_struct/hamr/microkit
+    cd $HOME/INSPECTA-models/micro-examples/microkit/port_queues/event_data_array/hamr/microkit
     make qemu
     ```
 
diff --git a/micro-examples/microkit/port_queues/event_data_base_types/readme.md b/micro-examples/microkit/port_queues/event_data_base_types/readme.md
index 71195c2..0538163 100644
--- a/micro-examples/microkit/port_queues/event_data_base_types/readme.md
+++ b/micro-examples/microkit/port_queues/event_data_base_types/readme.md
@@ -91,10 +91,10 @@
 
 1. *OPTIONAL* Rerun codegen
    
-    Launch the Slash script [micro-examples/microkit/port_queues/event_data/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
+    Launch the Slash script [micro-examples/microkit/port_queues/event_data_base_types/aadl/bin/run-hamr.cmd](aadl/bin/run-hamr.cmd) from the command line.  
 
    ```
-   micro-examples/microkit/port_queues/event_data/aadl/bin/run-hamr.cmd
+   micro-examples/microkit/port_queues/event_data_base_types/aadl/bin/run-hamr.cmd
    ```
 
 1. Build and simulate the image
@@ -104,7 +104,7 @@
     ```
     export MICROKIT_BOARD=qemu_virt_aarch64
     export MICROKIT_SDK=/root/microkit/release/microkit-sdk-1.4.1-dev.14+cf88629
-    cd $HOME/INSPECTA-models/micro-examples/microkit/port_queues/event_data/hamr/microkit
+    cd $HOME/INSPECTA-models/micro-examples/microkit/port_queues/event_data_base_types/hamr/microkit
     make qemu
     ```