diff --git a/nac3core/build.rs b/nac3core/build.rs
index 4b50cebf..12a4bbb2 100644
--- a/nac3core/build.rs
+++ b/nac3core/build.rs
@@ -110,14 +110,14 @@ fn compile_irrt_test(irrt_dir: &Path, out_dir: &Path) {
             o
         })
         .unwrap();
-    println!("cargo:rerun-if-changed={path}", path = irrt_test_cpp_path.to_str().unwrap());
+    println!("cargo:rerun-if-changed={}", out_dir.to_str().unwrap());
 }
 
 fn main() {
     let out_dir = env::var("OUT_DIR").unwrap();
     let out_dir = Path::new(&out_dir);
 
-    let irrt_dir = Path::new("src/codegen/irrt");
+    let irrt_dir = Path::new("./irrt");
 
     compile_irrt(irrt_dir, out_dir);
 
diff --git a/nac3core/src/codegen/irrt/irrt.cpp b/nac3core/irrt/irrt.cpp
similarity index 100%
rename from nac3core/src/codegen/irrt/irrt.cpp
rename to nac3core/irrt/irrt.cpp
diff --git a/nac3core/src/codegen/irrt/irrt.hpp b/nac3core/irrt/irrt.hpp
similarity index 100%
rename from nac3core/src/codegen/irrt/irrt.hpp
rename to nac3core/irrt/irrt.hpp
diff --git a/nac3core/src/codegen/irrt/irrt_test.cpp b/nac3core/irrt/irrt_test.cpp
similarity index 100%
rename from nac3core/src/codegen/irrt/irrt_test.cpp
rename to nac3core/irrt/irrt_test.cpp