diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index fe9b550..c901845 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -87,7 +87,7 @@ RUN mkdir -p /home/vscode/.local/share/CMakeTools \
     && chown vscode:conda /home/vscode/.local/share/CMakeTools/cmake-tools-kits.json
 
 # Install the yardl tool
-ARG YARDL_VERSION=0.6.3
+ARG YARDL_VERSION=0.6.5
 RUN wget --quiet "https://github.com/microsoft/yardl/releases/download/v${YARDL_VERSION}/yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
     && tar -xzf "yardl_${YARDL_VERSION}_linux_x86_64.tar.gz" \
     && mv yardl "/opt/conda/envs/${CONDA_ENVIRONMENT_NAME}/bin/" \
diff --git a/PETSIRD b/PETSIRD
index 96c1dc0..fa2f043 160000
--- a/PETSIRD
+++ b/PETSIRD
@@ -1 +1 @@
-Subproject commit 96c1dc0120fea2900b504fad1ab241aa2b1bd7d9
+Subproject commit fa2f04321cba17233817062d64251ed4df72caf9
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
index 74cc7fb..1020ae4 100644
--- a/cpp/CMakeLists.txt
+++ b/cpp/CMakeLists.txt
@@ -16,19 +16,15 @@ else()
   add_compile_options(-Wall -Wextra -pedantic)
 endif()
 
-set(PETSIRD_dir ../PETSIRD/cpp/generated)
-add_subdirectory(${PETSIRD_dir} PETSIRD_generated)
+set(PETSIRD_dir ../PETSIRD/cpp/)
+add_subdirectory(${PETSIRD_dir} PETSIRD)
 
 # Add any packages, below is an example for ROOT (unlikely you'll need that one though!)
 # find_package(ROOT REQUIRED COMPONENTS Tree)
 
 # Example lines for a new executable
 # add_executable(my_prog my_prog.cpp)
-# target_include_directories(my_prog PUBLIC ${PETSIRD_dir})
-# needed for helpers
-# target_include_directories(my_prog PUBLIC ${PETSIRD_dir}/..)
-# target_include_directories(my_prog PUBLIC ${PETSIRD_dir}/../helpers/include)
-# target_link_libraries(my_prog PUBLIC petsird_generated)
+# target_link_libraries(my_prog PUBLIC petsird_helpers)
 
 # add any dependencies on packages here
 # target_link_libraries(my_prog PUBLIC ROOT::Tree)
diff --git a/justfile b/justfile
index c62a5c4..37d2a03 100644
--- a/justfile
+++ b/justfile
@@ -17,3 +17,5 @@ default: run
     cd cpp/build; \
     ninja
 
+@run: build
+    echo Something here
\ No newline at end of file