diff --git a/.gitmodules b/.gitmodules
index 5b4e273..7b19da1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "onnx-mlir"]
 	path = onnx-mlir
 	url = https://github.com/onnx/onnx-mlir.git
+[submodule "backend-simulators/pim/pimsim-nn"]
+	path = backend-simulators/pim/pimsim-nn
+	url = https://github.com/wangxy-2000/pimsim-nn.git
diff --git a/backend-simulators/pim-simulator/.gitignore b/backend-simulators/pim/pim-simulator/.gitignore
similarity index 100%
rename from backend-simulators/pim-simulator/.gitignore
rename to backend-simulators/pim/pim-simulator/.gitignore
diff --git a/backend-simulators/pim-simulator/Cargo.lock b/backend-simulators/pim/pim-simulator/Cargo.lock
similarity index 100%
rename from backend-simulators/pim-simulator/Cargo.lock
rename to backend-simulators/pim/pim-simulator/Cargo.lock
diff --git a/backend-simulators/pim-simulator/Cargo.toml b/backend-simulators/pim/pim-simulator/Cargo.toml
similarity index 100%
rename from backend-simulators/pim-simulator/Cargo.toml
rename to backend-simulators/pim/pim-simulator/Cargo.toml
diff --git a/backend-simulators/pim-simulator/src/bin/pim-simulator/main.rs b/backend-simulators/pim/pim-simulator/src/bin/pim-simulator/main.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/bin/pim-simulator/main.rs
rename to backend-simulators/pim/pim-simulator/src/bin/pim-simulator/main.rs
diff --git a/backend-simulators/pim-simulator/src/lib/cpu/crossbar.rs b/backend-simulators/pim/pim-simulator/src/lib/cpu/crossbar.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/cpu/crossbar.rs
rename to backend-simulators/pim/pim-simulator/src/lib/cpu/crossbar.rs
diff --git a/backend-simulators/pim-simulator/src/lib/cpu/mod.rs b/backend-simulators/pim/pim-simulator/src/lib/cpu/mod.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/cpu/mod.rs
rename to backend-simulators/pim/pim-simulator/src/lib/cpu/mod.rs
diff --git a/backend-simulators/pim-simulator/src/lib/instruction_set/helper.rs b/backend-simulators/pim/pim-simulator/src/lib/instruction_set/helper.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/instruction_set/helper.rs
rename to backend-simulators/pim/pim-simulator/src/lib/instruction_set/helper.rs
diff --git a/backend-simulators/pim-simulator/src/lib/instruction_set/instruction_data.rs b/backend-simulators/pim/pim-simulator/src/lib/instruction_set/instruction_data.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/instruction_set/instruction_data.rs
rename to backend-simulators/pim/pim-simulator/src/lib/instruction_set/instruction_data.rs
diff --git a/backend-simulators/pim-simulator/src/lib/instruction_set/isa.rs b/backend-simulators/pim/pim-simulator/src/lib/instruction_set/isa.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/instruction_set/isa.rs
rename to backend-simulators/pim/pim-simulator/src/lib/instruction_set/isa.rs
diff --git a/backend-simulators/pim-simulator/src/lib/instruction_set/mod.rs b/backend-simulators/pim/pim-simulator/src/lib/instruction_set/mod.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/instruction_set/mod.rs
rename to backend-simulators/pim/pim-simulator/src/lib/instruction_set/mod.rs
diff --git a/backend-simulators/pim-simulator/src/lib/json_to_instruction/json_isa.rs b/backend-simulators/pim/pim-simulator/src/lib/json_to_instruction/json_isa.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/json_to_instruction/json_isa.rs
rename to backend-simulators/pim/pim-simulator/src/lib/json_to_instruction/json_isa.rs
diff --git a/backend-simulators/pim-simulator/src/lib/json_to_instruction/json_to_executor.rs b/backend-simulators/pim/pim-simulator/src/lib/json_to_instruction/json_to_executor.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/json_to_instruction/json_to_executor.rs
rename to backend-simulators/pim/pim-simulator/src/lib/json_to_instruction/json_to_executor.rs
diff --git a/backend-simulators/pim-simulator/src/lib/json_to_instruction/mod.rs b/backend-simulators/pim/pim-simulator/src/lib/json_to_instruction/mod.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/json_to_instruction/mod.rs
rename to backend-simulators/pim/pim-simulator/src/lib/json_to_instruction/mod.rs
diff --git a/backend-simulators/pim-simulator/src/lib/memory_manager/mod.rs b/backend-simulators/pim/pim-simulator/src/lib/memory_manager/mod.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/memory_manager/mod.rs
rename to backend-simulators/pim/pim-simulator/src/lib/memory_manager/mod.rs
diff --git a/backend-simulators/pim-simulator/src/lib/memory_manager/type_traits.rs b/backend-simulators/pim/pim-simulator/src/lib/memory_manager/type_traits.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/memory_manager/type_traits.rs
rename to backend-simulators/pim/pim-simulator/src/lib/memory_manager/type_traits.rs
diff --git a/backend-simulators/pim-simulator/src/lib/pimcore.rs b/backend-simulators/pim/pim-simulator/src/lib/pimcore.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/pimcore.rs
rename to backend-simulators/pim/pim-simulator/src/lib/pimcore.rs
diff --git a/backend-simulators/pim-simulator/src/lib/send_recv.rs b/backend-simulators/pim/pim-simulator/src/lib/send_recv.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/send_recv.rs
rename to backend-simulators/pim/pim-simulator/src/lib/send_recv.rs
diff --git a/backend-simulators/pim-simulator/src/lib/tracing/disable.rs b/backend-simulators/pim/pim-simulator/src/lib/tracing/disable.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/tracing/disable.rs
rename to backend-simulators/pim/pim-simulator/src/lib/tracing/disable.rs
diff --git a/backend-simulators/pim-simulator/src/lib/tracing/mod.rs b/backend-simulators/pim/pim-simulator/src/lib/tracing/mod.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/tracing/mod.rs
rename to backend-simulators/pim/pim-simulator/src/lib/tracing/mod.rs
diff --git a/backend-simulators/pim-simulator/src/lib/tracing/pretty_print.rs b/backend-simulators/pim/pim-simulator/src/lib/tracing/pretty_print.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/tracing/pretty_print.rs
rename to backend-simulators/pim/pim-simulator/src/lib/tracing/pretty_print.rs
diff --git a/backend-simulators/pim-simulator/src/lib/tracing/tracing_isa.rs b/backend-simulators/pim/pim-simulator/src/lib/tracing/tracing_isa.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/tracing/tracing_isa.rs
rename to backend-simulators/pim/pim-simulator/src/lib/tracing/tracing_isa.rs
diff --git a/backend-simulators/pim-simulator/src/lib/utility.rs b/backend-simulators/pim/pim-simulator/src/lib/utility.rs
similarity index 100%
rename from backend-simulators/pim-simulator/src/lib/utility.rs
rename to backend-simulators/pim/pim-simulator/src/lib/utility.rs
diff --git a/backend-simulators/pim-simulator/tests/A.txt b/backend-simulators/pim/pim-simulator/tests/A.txt
similarity index 100%
rename from backend-simulators/pim-simulator/tests/A.txt
rename to backend-simulators/pim/pim-simulator/tests/A.txt
diff --git a/backend-simulators/pim-simulator/tests/B.txt b/backend-simulators/pim/pim-simulator/tests/B.txt
similarity index 100%
rename from backend-simulators/pim-simulator/tests/B.txt
rename to backend-simulators/pim/pim-simulator/tests/B.txt
diff --git a/backend-simulators/pim-simulator/tests/X.txt b/backend-simulators/pim/pim-simulator/tests/X.txt
similarity index 100%
rename from backend-simulators/pim-simulator/tests/X.txt
rename to backend-simulators/pim/pim-simulator/tests/X.txt
diff --git a/backend-simulators/pim-simulator/tests/big_mul.rs b/backend-simulators/pim/pim-simulator/tests/big_mul.rs
similarity index 90%
rename from backend-simulators/pim-simulator/tests/big_mul.rs
rename to backend-simulators/pim/pim-simulator/tests/big_mul.rs
index be95a75..4f898e0 100644
--- a/backend-simulators/pim-simulator/tests/big_mul.rs
+++ b/backend-simulators/pim/pim-simulator/tests/big_mul.rs
@@ -20,11 +20,11 @@ where
     let mut cpu = CPU::new(0);
     cpu.reserve_crossbar(1, 1024 * size_of::<f32>(),  1024);
     let (memory, crossbars) = cpu.host().get_memory_crossbar();
-    let matrix = simple_read(Path::new("./tests/B.txt")) ;
+    let matrix = simple_read(Path::new("B.txt")) ;
 
     
     crossbars.get_mut(0).unwrap().execute_store( &matrix).unwrap();
-    let vector = simple_read(Path::new("./tests/A.txt"));
+    let vector = simple_read(Path::new("A.txt"));
     memory.execute_store(0, &vector).unwrap();
 
     let mut inst_builder = InstructionsBuilder::new();
@@ -57,7 +57,7 @@ where
             .cpu_mut()
             .host()
             .load::<f32>(1024 * size_of::<f32>(), 1024*size_of::<f32>()).unwrap()[0].iter().zip(
-        simple_read(Path::new("./tests/X.txt")) ).all(|(&a,b) : (&f32, f32)| {a-b < 0.001}),
+        simple_read(Path::new("X.txt")) ).all(|(&a,b) : (&f32, f32)| {a-b < 0.001}),
         "Wrong result for {}",
         err
     );
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/config.json b/backend-simulators/pim/pim-simulator/tests/data/Gemm/config.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/config.json
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/config.json
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_0.json b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_0.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_0.json
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_0.json
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_0/crossbar_0.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_0/crossbar_0.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_0/crossbar_0.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_0/crossbar_0.bin
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_0/crossbar_1.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_0/crossbar_1.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_0/crossbar_1.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_0/crossbar_1.bin
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_0/crossbar_2.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_0/crossbar_2.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_0/crossbar_2.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_0/crossbar_2.bin
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_1.json b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_1.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_1.json
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_1.json
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_2.json b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_2.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_2.json
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_2.json
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_2/crossbar_0.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_2/crossbar_0.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_2/crossbar_0.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_2/crossbar_0.bin
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_2/crossbar_1.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_2/crossbar_1.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_2/crossbar_1.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_2/crossbar_1.bin
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_2/crossbar_2.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_2/crossbar_2.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_2/crossbar_2.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_2/crossbar_2.bin
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_3.json b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_3.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_3.json
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_3.json
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_4.json b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_4.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_4.json
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_4.json
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_4/crossbar_0.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_4/crossbar_0.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_4/crossbar_0.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_4/crossbar_0.bin
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_4/crossbar_1.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_4/crossbar_1.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_4/crossbar_1.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_4/crossbar_1.bin
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_4/crossbar_2.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_4/crossbar_2.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_4/crossbar_2.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_4/crossbar_2.bin
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/core_5.json b/backend-simulators/pim/pim-simulator/tests/data/Gemm/core_5.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/core_5.json
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/core_5.json
diff --git a/backend-simulators/pim-simulator/tests/data/Gemm/memory.bin b/backend-simulators/pim/pim-simulator/tests/data/Gemm/memory.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/Gemm/memory.bin
rename to backend-simulators/pim/pim-simulator/tests/data/Gemm/memory.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/config.json b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/config.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/config.json
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/config.json
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_0.json b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_0.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_0.json
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_0.json
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_0.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_0.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_0.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_0.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_1.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_1.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_1.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_1.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_2.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_2.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_2.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_0/crossbar_2.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_1.json b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_1.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_1.json
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_1.json
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_2.json b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_2.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_2.json
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_2.json
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_0.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_0.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_0.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_0.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_1.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_1.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_1.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_1.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_2.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_2.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_2.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_2/crossbar_2.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_3.json b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_3.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_3.json
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_3.json
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_4.json b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_4.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_4.json
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_4.json
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_0.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_0.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_0.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_0.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_1.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_1.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_1.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_1.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_2.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_2.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_2.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_4/crossbar_2.bin
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/core_5.json b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_5.json
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/core_5.json
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/core_5.json
diff --git a/backend-simulators/pim-simulator/tests/data/GemmWithConst/memory.bin b/backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/memory.bin
similarity index 100%
rename from backend-simulators/pim-simulator/tests/data/GemmWithConst/memory.bin
rename to backend-simulators/pim/pim-simulator/tests/data/GemmWithConst/memory.bin
diff --git a/backend-simulators/pim-simulator/tests/es_runner.rs b/backend-simulators/pim/pim-simulator/tests/es_runner.rs
similarity index 96%
rename from backend-simulators/pim-simulator/tests/es_runner.rs
rename to backend-simulators/pim/pim-simulator/tests/es_runner.rs
index 8273ae0..40e0e5e 100644
--- a/backend-simulators/pim-simulator/tests/es_runner.rs
+++ b/backend-simulators/pim/pim-simulator/tests/es_runner.rs
@@ -43,7 +43,7 @@ fn collect_json_from_subfolders<P: AsRef<Path>>(root: P) -> Result<Vec<(Value, V
 
 #[test]
 fn json_folder_tester() {
-    let examples = collect_json_from_subfolders("./tests/data").unwrap();
+    let examples = collect_json_from_subfolders("data").unwrap();
     for example in examples {
         let (config, cores) = example;
         json_to_executor::json_to_executor(config, cores.iter()).execute();
diff --git a/backend-simulators/pim-simulator/tests/placeholder.rs b/backend-simulators/pim/pim-simulator/tests/placeholder.rs
similarity index 100%
rename from backend-simulators/pim-simulator/tests/placeholder.rs
rename to backend-simulators/pim/pim-simulator/tests/placeholder.rs
diff --git a/backend-simulators/pim-simulator/tests/simd.rs b/backend-simulators/pim/pim-simulator/tests/simd.rs
similarity index 100%
rename from backend-simulators/pim-simulator/tests/simd.rs
rename to backend-simulators/pim/pim-simulator/tests/simd.rs
diff --git a/backend-simulators/pim-simulator/tests/sync.rs b/backend-simulators/pim/pim-simulator/tests/sync.rs
similarity index 100%
rename from backend-simulators/pim-simulator/tests/sync.rs
rename to backend-simulators/pim/pim-simulator/tests/sync.rs
diff --git a/backend-simulators/pim/pimsim-nn b/backend-simulators/pim/pimsim-nn
new file mode 160000
index 0000000..3e3442b
--- /dev/null
+++ b/backend-simulators/pim/pimsim-nn
@@ -0,0 +1 @@
+Subproject commit 3e3442b66354282e600c5c45990af0e92aecf0f9