130 files changed, 15 insertions, 12 deletions

diff --git a/primrose/.gitignore b/src/.gitignore
index aeb024c..aeb024c 100644
--- a/primrose/.gitignore
+++ b/src/.gitignore
diff --git a/primrose/Cargo.toml b/src/Cargo.toml
index 34a9889..d3658ac 100644
--- a/primrose/Cargo.toml
+++ b/src/Cargo.toml
@@ -2,9 +2,9 @@
 resolver = "2"
 members = [
     "crates/primrose",
-    "crates/primrose-library",
-    "crates/candelabra-cli",
-    "crates/candelabra-benchmarker"
+    "crates/library",
+    "crates/cli",
+    "crates/benchmarker"
 ]
 
 [workspace.dependencies]
diff --git a/primrose/README.md b/src/README.md
index 604468b..604468b 100644
--- a/primrose/README.md
+++ b/src/README.md
diff --git a/primrose/crates/candelabra-benchmarker/Cargo.toml b/src/crates/benchmarker/Cargo.toml
index 5f2327e..3f542fc 100644
--- a/primrose/crates/candelabra-benchmarker/Cargo.toml
+++ b/src/crates/benchmarker/Cargo.toml
@@ -4,11 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+log = { workspace = true }
+
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-log = { workspace = true }
-primrose-library = { path = "../primrose-library" }
 rand = { workspace = true }
 
+primrose-library = { path = "../library" }
+
 [dev-dependencies]
 env_logger = { workspace = true }
\ No newline at end of file
diff --git a/primrose/crates/candelabra-benchmarker/examples/run_vec.rs b/src/crates/benchmarker/examples/run_vec.rs
index 0c93bbb..0c93bbb 100644
--- a/primrose/crates/candelabra-benchmarker/examples/run_vec.rs
+++ b/src/crates/benchmarker/examples/run_vec.rs
diff --git a/primrose/crates/candelabra-benchmarker/src/bench.rs b/src/crates/benchmarker/src/bench.rs
index 9c4cf74..9c4cf74 100644
--- a/primrose/crates/candelabra-benchmarker/src/bench.rs
+++ b/src/crates/benchmarker/src/bench.rs
diff --git a/primrose/crates/candelabra-benchmarker/src/container.rs b/src/crates/benchmarker/src/container.rs
index 39e2288..39e2288 100644
--- a/primrose/crates/candelabra-benchmarker/src/container.rs
+++ b/src/crates/benchmarker/src/container.rs
diff --git a/primrose/crates/candelabra-benchmarker/src/indexable.rs b/src/crates/benchmarker/src/indexable.rs
index 066ad8a..a30a1f4 100644
--- a/primrose/crates/candelabra-benchmarker/src/indexable.rs
+++ b/src/crates/benchmarker/src/indexable.rs
@@ -4,7 +4,7 @@ use log::debug;
 use primrose_library::traits::{Container, Indexable};
 use rand::{distributions::Standard, prelude::Distribution, random};
 
-use crate::{benchmark_op, BenchmarkResult, Observation, Results};
+use crate::{benchmark_op, Observation, Results};
 
 /// Benchmark [`primrose_library::traits::Indexable`] operations
 pub trait IndexableExt<E> {
diff --git a/primrose/crates/candelabra-benchmarker/src/lib.rs b/src/crates/benchmarker/src/lib.rs
index e6fc69b..e6fc69b 100644
--- a/primrose/crates/candelabra-benchmarker/src/lib.rs
+++ b/src/crates/benchmarker/src/lib.rs
diff --git a/primrose/crates/candelabra-benchmarker/src/results.rs b/src/crates/benchmarker/src/results.rs
index 3c0783f..3c0783f 100644
--- a/primrose/crates/candelabra-benchmarker/src/results.rs
+++ b/src/crates/benchmarker/src/results.rs
diff --git a/primrose/crates/candelabra-benchmarker/src/stack.rs b/src/crates/benchmarker/src/stack.rs
index 7680548..7680548 100644
--- a/primrose/crates/candelabra-benchmarker/src/stack.rs
+++ b/src/crates/benchmarker/src/stack.rs
diff --git a/primrose/crates/candelabra-cli/Cargo.toml b/src/crates/cli/Cargo.toml
index 659e7ef..c6dc852 100644
--- a/primrose/crates/candelabra-cli/Cargo.toml
+++ b/src/crates/cli/Cargo.toml
@@ -10,7 +10,7 @@ default-run = "candelabra-cli"
 log = { workspace = true }
 env_logger = { workspace = true }
 primrose = { path = "../primrose" }
-candelabra-benchmarker = { path = "../candelabra-benchmarker" }
+candelabra-benchmarker = { path = "../benchmarker" }
 anyhow = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
diff --git a/primrose/crates/candelabra-cli/src/cache.rs b/src/crates/cli/src/cache.rs
index 598cad1..598cad1 100644
--- a/primrose/crates/candelabra-cli/src/cache.rs
+++ b/src/crates/cli/src/cache.rs
diff --git a/primrose/crates/candelabra-cli/src/candidates.rs b/src/crates/cli/src/candidates.rs
index d134307..d134307 100644
--- a/primrose/crates/candelabra-cli/src/candidates.rs
+++ b/src/crates/cli/src/candidates.rs
diff --git a/primrose/crates/candelabra-cli/src/cost/benchmark.rs b/src/crates/cli/src/cost/benchmark.rs
index a4824d9..a4824d9 100644
--- a/primrose/crates/candelabra-cli/src/cost/benchmark.rs
+++ b/src/crates/cli/src/cost/benchmark.rs
diff --git a/primrose/crates/candelabra-cli/src/cost/mod.rs b/src/crates/cli/src/cost/mod.rs
index eda5957..eda5957 100644
--- a/primrose/crates/candelabra-cli/src/cost/mod.rs
+++ b/src/crates/cli/src/cost/mod.rs
diff --git a/primrose/crates/candelabra-cli/src/main.rs b/src/crates/cli/src/main.rs
index 00c85cc..00c85cc 100644
--- a/primrose/crates/candelabra-cli/src/main.rs
+++ b/src/crates/cli/src/main.rs
diff --git a/primrose/crates/candelabra-cli/src/paths.rs b/src/crates/cli/src/paths.rs
index 639e1c5..639e1c5 100644
--- a/primrose/crates/candelabra-cli/src/paths.rs
+++ b/src/crates/cli/src/paths.rs
diff --git a/primrose/crates/candelabra-cli/src/project.rs b/src/crates/cli/src/project.rs
index 8d04c94..8d04c94 100644
--- a/primrose/crates/candelabra-cli/src/project.rs
+++ b/src/crates/cli/src/project.rs
diff --git a/primrose/crates/primrose-library/Cargo.toml b/src/crates/library/Cargo.toml
index 5231ed9..5231ed9 100644
--- a/primrose/crates/primrose-library/Cargo.toml
+++ b/src/crates/library/Cargo.toml
diff --git a/primrose/crates/primrose-library/src/eager_sorted_vector.rs b/src/crates/library/src/eager_sorted_vector.rs
index 9be45d0..9be45d0 100644
--- a/primrose/crates/primrose-library/src/eager_sorted_vector.rs
+++ b/src/crates/library/src/eager_sorted_vector.rs
diff --git a/primrose/crates/primrose-library/src/eager_unique_vector.rs b/src/crates/library/src/eager_unique_vector.rs
index 68ba78f..68ba78f 100644
--- a/primrose/crates/primrose-library/src/eager_unique_vector.rs
+++ b/src/crates/library/src/eager_unique_vector.rs
diff --git a/primrose/crates/primrose-library/src/hashset.rs b/src/crates/library/src/hashset.rs
index d7d8915..d7d8915 100644
--- a/primrose/crates/primrose-library/src/hashset.rs
+++ b/src/crates/library/src/hashset.rs
diff --git a/primrose/crates/primrose-library/src/lazy_sorted_vector.rs b/src/crates/library/src/lazy_sorted_vector.rs
index 5ead065..5ead065 100644
--- a/primrose/crates/primrose-library/src/lazy_sorted_vector.rs
+++ b/src/crates/library/src/lazy_sorted_vector.rs
diff --git a/primrose/crates/primrose-library/src/lazy_unique_vector.rs b/src/crates/library/src/lazy_unique_vector.rs
index 9b5e60c..9b5e60c 100644
--- a/primrose/crates/primrose-library/src/lazy_unique_vector.rs
+++ b/src/crates/library/src/lazy_unique_vector.rs
diff --git a/primrose/crates/primrose-library/src/lib.rs b/src/crates/library/src/lib.rs
index 19ff7af..19ff7af 100644
--- a/primrose/crates/primrose-library/src/lib.rs
+++ b/src/crates/library/src/lib.rs
diff --git a/primrose/crates/primrose-library/src/list.rs b/src/crates/library/src/list.rs
index 40ac771..40ac771 100644
--- a/primrose/crates/primrose-library/src/list.rs
+++ b/src/crates/library/src/list.rs
diff --git a/primrose/crates/primrose-library/src/proptest/mod.rs b/src/crates/library/src/proptest/mod.rs
index 7807854..7807854 100644
--- a/primrose/crates/primrose-library/src/proptest/mod.rs
+++ b/src/crates/library/src/proptest/mod.rs
diff --git a/primrose/crates/primrose-library/src/proptest/strategies.rs b/src/crates/library/src/proptest/strategies.rs
index d087fcc..d087fcc 100644
--- a/primrose/crates/primrose-library/src/proptest/strategies.rs
+++ b/src/crates/library/src/proptest/strategies.rs
diff --git a/primrose/crates/primrose-library/src/traits.rs b/src/crates/library/src/traits.rs
index a33f3d9..a33f3d9 100644
--- a/primrose/crates/primrose-library/src/traits.rs
+++ b/src/crates/library/src/traits.rs
diff --git a/primrose/crates/primrose-library/src/treeset.rs b/src/crates/library/src/treeset.rs
index 4e2b213..4e2b213 100644
--- a/primrose/crates/primrose-library/src/treeset.rs
+++ b/src/crates/library/src/treeset.rs
diff --git a/primrose/crates/primrose-library/src/vector.rs b/src/crates/library/src/vector.rs
index 38293c8..38293c8 100644
--- a/primrose/crates/primrose-library/src/vector.rs
+++ b/src/crates/library/src/vector.rs
diff --git a/primrose/crates/primrose/Cargo.toml b/src/crates/primrose/Cargo.toml
index c413154..80dfdab 100644
--- a/primrose/crates/primrose/Cargo.toml
+++ b/src/crates/primrose/Cargo.toml
@@ -5,14 +5,15 @@ authors = ["Xueying Qin <qinxy1995@gmail.com>"]
 edition = "2021"
 
 [dependencies]
-primrose-library = { path = "../primrose-library" }
-peg = "0.8.0"
-indicatif = "0.16.2"
-rand = { workspace = true }
-thiserror = { workspace = true }
 log = { workspace = true }
 env_logger = { workspace = true }
 
+rand = { workspace = true }
+thiserror = { workspace = true }
+peg = "0.8.0"
+
+primrose-library = { path = "../library" }
+
 [dev-dependencies]
 criterion = "0.3.5"
 
diff --git a/primrose/crates/primrose/benches/criterion_benchmark.rs b/src/crates/primrose/benches/criterion_benchmark.rs
index 6bdc214..6bdc214 100644
--- a/primrose/crates/primrose/benches/criterion_benchmark.rs
+++ b/src/crates/primrose/benches/criterion_benchmark.rs
diff --git a/primrose/crates/primrose/src/analysis.rs b/src/crates/primrose/src/analysis.rs
index ec2f803..ec2f803 100644
--- a/primrose/crates/primrose/src/analysis.rs
+++ b/src/crates/primrose/src/analysis.rs
diff --git a/primrose/crates/primrose/src/bounded_ops.rs b/src/crates/primrose/src/bounded_ops.rs
index 0ca598f..0ca598f 100644
--- a/primrose/crates/primrose/src/bounded_ops.rs
+++ b/src/crates/primrose/src/bounded_ops.rs
diff --git a/primrose/crates/primrose/src/codegen.rs b/src/crates/primrose/src/codegen.rs
index d56c2b3..d56c2b3 100644
--- a/primrose/crates/primrose/src/codegen.rs
+++ b/src/crates/primrose/src/codegen.rs
diff --git a/primrose/crates/primrose/src/description.rs b/src/crates/primrose/src/description.rs
index 29eeb44..29eeb44 100644
--- a/primrose/crates/primrose/src/description.rs
+++ b/src/crates/primrose/src/description.rs
diff --git a/primrose/crates/primrose/src/error.rs b/src/crates/primrose/src/error.rs
index 990f80e..990f80e 100644
--- a/primrose/crates/primrose/src/error.rs
+++ b/src/crates/primrose/src/error.rs
diff --git a/primrose/crates/primrose/src/inference.rs b/src/crates/primrose/src/inference.rs
index 9cf4783..9cf4783 100644
--- a/primrose/crates/primrose/src/inference.rs
+++ b/src/crates/primrose/src/inference.rs
diff --git a/primrose/crates/primrose/src/lib.rs b/src/crates/primrose/src/lib.rs
index a283f28..a283f28 100644
--- a/primrose/crates/primrose/src/lib.rs
+++ b/src/crates/primrose/src/lib.rs
diff --git a/primrose/crates/primrose/src/library_specs.rs b/src/crates/primrose/src/library_specs.rs
index 6b30ae6..6b30ae6 100644
--- a/primrose/crates/primrose/src/library_specs.rs
+++ b/src/crates/primrose/src/library_specs.rs
diff --git a/primrose/crates/primrose/src/main.rs b/src/crates/primrose/src/main.rs
index d307942..d307942 100644
--- a/primrose/crates/primrose/src/main.rs
+++ b/src/crates/primrose/src/main.rs
diff --git a/primrose/crates/primrose/src/parser.rs b/src/crates/primrose/src/parser.rs
index 47ae8e3..47ae8e3 100644
--- a/primrose/crates/primrose/src/parser.rs
+++ b/src/crates/primrose/src/parser.rs
diff --git a/primrose/crates/primrose/src/run_matching.rs b/src/crates/primrose/src/run_matching.rs
index c494f50..c494f50 100644
--- a/primrose/crates/primrose/src/run_matching.rs
+++ b/src/crates/primrose/src/run_matching.rs
diff --git a/primrose/crates/primrose/src/selector.rs b/src/crates/primrose/src/selector.rs
index fcfd0c6..fcfd0c6 100644
--- a/primrose/crates/primrose/src/selector.rs
+++ b/src/crates/primrose/src/selector.rs
diff --git a/primrose/crates/primrose/src/source_file.rs b/src/crates/primrose/src/source_file.rs
index 0884015..0884015 100644
--- a/primrose/crates/primrose/src/source_file.rs
+++ b/src/crates/primrose/src/source_file.rs
diff --git a/primrose/crates/primrose/src/spec_map.rs b/src/crates/primrose/src/spec_map.rs
index 22b84c8..22b84c8 100644
--- a/primrose/crates/primrose/src/spec_map.rs
+++ b/src/crates/primrose/src/spec_map.rs
diff --git a/primrose/crates/primrose/src/tools/mod.rs b/src/crates/primrose/src/tools/mod.rs
index ebee9b5..ebee9b5 100644
--- a/primrose/crates/primrose/src/tools/mod.rs
+++ b/src/crates/primrose/src/tools/mod.rs
diff --git a/primrose/crates/primrose/src/type_check.rs b/src/crates/primrose/src/type_check.rs
index 29a8d2a..29a8d2a 100644
--- a/primrose/crates/primrose/src/type_check.rs
+++ b/src/crates/primrose/src/type_check.rs
diff --git a/primrose/crates/primrose/src/types.rs b/src/crates/primrose/src/types.rs
index 6c459fc..6c459fc 100644
--- a/primrose/crates/primrose/src/types.rs
+++ b/src/crates/primrose/src/types.rs
diff --git a/primrose/racket_specs/combinators.rkt b/src/racket_specs/combinators.rkt
index a74296b..a74296b 100644
--- a/primrose/racket_specs/combinators.rkt
+++ b/src/racket_specs/combinators.rkt
diff --git a/primrose/racket_specs/container-setup.rkt b/src/racket_specs/container-setup.rkt
index 0d5cd79..0d5cd79 100644
--- a/primrose/racket_specs/container-setup.rkt
+++ b/src/racket_specs/container-setup.rkt
diff --git a/primrose/racket_specs/indexable-setup.rkt b/src/racket_specs/indexable-setup.rkt
index ddd6239..ddd6239 100644
--- a/primrose/racket_specs/indexable-setup.rkt
+++ b/src/racket_specs/indexable-setup.rkt
diff --git a/primrose/racket_specs/stack-setup.rkt b/src/racket_specs/stack-setup.rkt
index 336cf8d..336cf8d 100644
--- a/primrose/racket_specs/stack-setup.rkt
+++ b/src/racket_specs/stack-setup.rkt
diff --git a/primrose/rust-toolchain.toml b/src/rust-toolchain.toml
index 271800c..271800c 100644
--- a/primrose/rust-toolchain.toml
+++ b/src/rust-toolchain.toml
diff --git a/primrose/scripts/b_asc_con_3.sh b/src/scripts/b_asc_con_3.sh
index 3befd9d..3befd9d 100755
--- a/primrose/scripts/b_asc_con_3.sh
+++ b/src/scripts/b_asc_con_3.sh
diff --git a/primrose/scripts/b_asc_con_5.sh b/src/scripts/b_asc_con_5.sh
index 32b3f61..32b3f61 100755
--- a/primrose/scripts/b_asc_con_5.sh
+++ b/src/scripts/b_asc_con_5.sh
diff --git a/primrose/scripts/b_asc_con_7.sh b/src/scripts/b_asc_con_7.sh
index 843a7d1..843a7d1 100755
--- a/primrose/scripts/b_asc_con_7.sh
+++ b/src/scripts/b_asc_con_7.sh
diff --git a/primrose/scripts/b_asc_con_9.sh b/src/scripts/b_asc_con_9.sh
index 78134e5..78134e5 100755
--- a/primrose/scripts/b_asc_con_9.sh
+++ b/src/scripts/b_asc_con_9.sh
diff --git a/primrose/scripts/b_asc_con_ra_3.sh b/src/scripts/b_asc_con_ra_3.sh
index 8346f4c..8346f4c 100755
--- a/primrose/scripts/b_asc_con_ra_3.sh
+++ b/src/scripts/b_asc_con_ra_3.sh
diff --git a/primrose/scripts/b_asc_con_ra_5.sh b/src/scripts/b_asc_con_ra_5.sh
index 9cb1cda..9cb1cda 100755
--- a/primrose/scripts/b_asc_con_ra_5.sh
+++ b/src/scripts/b_asc_con_ra_5.sh
diff --git a/primrose/scripts/b_asc_con_ra_7.sh b/src/scripts/b_asc_con_ra_7.sh
index c797868..c797868 100755
--- a/primrose/scripts/b_asc_con_ra_7.sh
+++ b/src/scripts/b_asc_con_ra_7.sh
diff --git a/primrose/scripts/b_asc_con_ra_9.sh b/src/scripts/b_asc_con_ra_9.sh
index f60be36..f60be36 100755
--- a/primrose/scripts/b_asc_con_ra_9.sh
+++ b/src/scripts/b_asc_con_ra_9.sh
diff --git a/primrose/scripts/b_des_con_3.sh b/src/scripts/b_des_con_3.sh
index c00c125..c00c125 100755
--- a/primrose/scripts/b_des_con_3.sh
+++ b/src/scripts/b_des_con_3.sh
diff --git a/primrose/scripts/b_des_con_5.sh b/src/scripts/b_des_con_5.sh
index b870f59..b870f59 100755
--- a/primrose/scripts/b_des_con_5.sh
+++ b/src/scripts/b_des_con_5.sh
diff --git a/primrose/scripts/b_des_con_7.sh b/src/scripts/b_des_con_7.sh
index ca11765..ca11765 100755
--- a/primrose/scripts/b_des_con_7.sh
+++ b/src/scripts/b_des_con_7.sh
diff --git a/primrose/scripts/b_des_con_9.sh b/src/scripts/b_des_con_9.sh
index 1d34895..1d34895 100755
--- a/primrose/scripts/b_des_con_9.sh
+++ b/src/scripts/b_des_con_9.sh
diff --git a/primrose/scripts/b_des_con_ra_3.sh b/src/scripts/b_des_con_ra_3.sh
index fe7c0a0..fe7c0a0 100755
--- a/primrose/scripts/b_des_con_ra_3.sh
+++ b/src/scripts/b_des_con_ra_3.sh
diff --git a/primrose/scripts/b_des_con_ra_5.sh b/src/scripts/b_des_con_ra_5.sh
index 3769ff5..3769ff5 100755
--- a/primrose/scripts/b_des_con_ra_5.sh
+++ b/src/scripts/b_des_con_ra_5.sh
diff --git a/primrose/scripts/b_des_con_ra_7.sh b/src/scripts/b_des_con_ra_7.sh
index 9c3a7c9..9c3a7c9 100755
--- a/primrose/scripts/b_des_con_ra_7.sh
+++ b/src/scripts/b_des_con_ra_7.sh
diff --git a/primrose/scripts/b_des_con_ra_9.sh b/src/scripts/b_des_con_ra_9.sh
index 5d70bf4..5d70bf4 100755
--- a/primrose/scripts/b_des_con_ra_9.sh
+++ b/src/scripts/b_des_con_ra_9.sh
diff --git a/primrose/scripts/b_stack_con_3.sh b/src/scripts/b_stack_con_3.sh
index 3317bd7..3317bd7 100755
--- a/primrose/scripts/b_stack_con_3.sh
+++ b/src/scripts/b_stack_con_3.sh
diff --git a/primrose/scripts/b_stack_con_5.sh b/src/scripts/b_stack_con_5.sh
index ff7c2ea..ff7c2ea 100755
--- a/primrose/scripts/b_stack_con_5.sh
+++ b/src/scripts/b_stack_con_5.sh
diff --git a/primrose/scripts/b_stack_con_7.sh b/src/scripts/b_stack_con_7.sh
index f04d5f5..f04d5f5 100755
--- a/primrose/scripts/b_stack_con_7.sh
+++ b/src/scripts/b_stack_con_7.sh
diff --git a/primrose/scripts/b_stack_con_9.sh b/src/scripts/b_stack_con_9.sh
index 9347fb6..9347fb6 100755
--- a/primrose/scripts/b_stack_con_9.sh
+++ b/src/scripts/b_stack_con_9.sh
diff --git a/primrose/scripts/b_unique_asc_con_3.sh b/src/scripts/b_unique_asc_con_3.sh
index 13fa6c3..13fa6c3 100755
--- a/primrose/scripts/b_unique_asc_con_3.sh
+++ b/src/scripts/b_unique_asc_con_3.sh
diff --git a/primrose/scripts/b_unique_asc_con_5.sh b/src/scripts/b_unique_asc_con_5.sh
index cd8fd68..cd8fd68 100755
--- a/primrose/scripts/b_unique_asc_con_5.sh
+++ b/src/scripts/b_unique_asc_con_5.sh
diff --git a/primrose/scripts/b_unique_asc_con_7.sh b/src/scripts/b_unique_asc_con_7.sh
index 1a76def..1a76def 100755
--- a/primrose/scripts/b_unique_asc_con_7.sh
+++ b/src/scripts/b_unique_asc_con_7.sh
diff --git a/primrose/scripts/b_unique_asc_con_9.sh b/src/scripts/b_unique_asc_con_9.sh
index fba4841..fba4841 100755
--- a/primrose/scripts/b_unique_asc_con_9.sh
+++ b/src/scripts/b_unique_asc_con_9.sh
diff --git a/primrose/scripts/b_unique_asc_con_ra_3.sh b/src/scripts/b_unique_asc_con_ra_3.sh
index 7ef5b22..7ef5b22 100755
--- a/primrose/scripts/b_unique_asc_con_ra_3.sh
+++ b/src/scripts/b_unique_asc_con_ra_3.sh
diff --git a/primrose/scripts/b_unique_asc_con_ra_5.sh b/src/scripts/b_unique_asc_con_ra_5.sh
index a32ee2f..a32ee2f 100755
--- a/primrose/scripts/b_unique_asc_con_ra_5.sh
+++ b/src/scripts/b_unique_asc_con_ra_5.sh
diff --git a/primrose/scripts/b_unique_asc_con_ra_7.sh b/src/scripts/b_unique_asc_con_ra_7.sh
index ea16baf..ea16baf 100755
--- a/primrose/scripts/b_unique_asc_con_ra_7.sh
+++ b/src/scripts/b_unique_asc_con_ra_7.sh
diff --git a/primrose/scripts/b_unique_asc_con_ra_9.sh b/src/scripts/b_unique_asc_con_ra_9.sh
index 8dff946..8dff946 100755
--- a/primrose/scripts/b_unique_asc_con_ra_9.sh
+++ b/src/scripts/b_unique_asc_con_ra_9.sh
diff --git a/primrose/scripts/b_unique_con_3.sh b/src/scripts/b_unique_con_3.sh
index 10cd4c4..10cd4c4 100755
--- a/primrose/scripts/b_unique_con_3.sh
+++ b/src/scripts/b_unique_con_3.sh
diff --git a/primrose/scripts/b_unique_con_5.sh b/src/scripts/b_unique_con_5.sh
index fbf8073..fbf8073 100755
--- a/primrose/scripts/b_unique_con_5.sh
+++ b/src/scripts/b_unique_con_5.sh
diff --git a/primrose/scripts/b_unique_con_7.sh b/src/scripts/b_unique_con_7.sh
index c2bbf29..c2bbf29 100755
--- a/primrose/scripts/b_unique_con_7.sh
+++ b/src/scripts/b_unique_con_7.sh
diff --git a/primrose/scripts/b_unique_con_9.sh b/src/scripts/b_unique_con_9.sh
index dd16dfc..dd16dfc 100755
--- a/primrose/scripts/b_unique_con_9.sh
+++ b/src/scripts/b_unique_con_9.sh
diff --git a/primrose/scripts/b_unique_con_ra_3.sh b/src/scripts/b_unique_con_ra_3.sh
index fbcac8d..fbcac8d 100755
--- a/primrose/scripts/b_unique_con_ra_3.sh
+++ b/src/scripts/b_unique_con_ra_3.sh
diff --git a/primrose/scripts/b_unique_con_ra_5.sh b/src/scripts/b_unique_con_ra_5.sh
index 6845931..6845931 100755
--- a/primrose/scripts/b_unique_con_ra_5.sh
+++ b/src/scripts/b_unique_con_ra_5.sh
diff --git a/primrose/scripts/b_unique_con_ra_7.sh b/src/scripts/b_unique_con_ra_7.sh
index 8b62c27..8b62c27 100755
--- a/primrose/scripts/b_unique_con_ra_7.sh
+++ b/src/scripts/b_unique_con_ra_7.sh
diff --git a/primrose/scripts/b_unique_con_ra_9.sh b/src/scripts/b_unique_con_ra_9.sh
index f756117..f756117 100755
--- a/primrose/scripts/b_unique_con_ra_9.sh
+++ b/src/scripts/b_unique_con_ra_9.sh
diff --git a/primrose/tests/.gitignore b/src/tests/.gitignore
index e9a847e..e9a847e 100644
--- a/primrose/tests/.gitignore
+++ b/src/tests/.gitignore
diff --git a/primrose/tests/Cargo.toml b/src/tests/Cargo.toml
index e7372e9..e7372e9 100644
--- a/primrose/tests/Cargo.toml
+++ b/src/tests/Cargo.toml
diff --git a/primrose/tests/b_asc_con/Cargo.toml b/src/tests/b_asc_con/Cargo.toml
index 654d8ab..654d8ab 100644
--- a/primrose/tests/b_asc_con/Cargo.toml
+++ b/src/tests/b_asc_con/Cargo.toml
diff --git a/primrose/tests/b_asc_con/src/main.rs b/src/tests/b_asc_con/src/main.rs
index 0d18aee..0d18aee 100644
--- a/primrose/tests/b_asc_con/src/main.rs
+++ b/src/tests/b_asc_con/src/main.rs
diff --git a/primrose/tests/b_asc_con/src/types.pr.rs b/src/tests/b_asc_con/src/types.pr.rs
index 12d3d02..12d3d02 100644
--- a/primrose/tests/b_asc_con/src/types.pr.rs
+++ b/src/tests/b_asc_con/src/types.pr.rs
diff --git a/primrose/tests/b_asc_con_ra/Cargo.toml b/src/tests/b_asc_con_ra/Cargo.toml
index 9bbe454..9bbe454 100644
--- a/primrose/tests/b_asc_con_ra/Cargo.toml
+++ b/src/tests/b_asc_con_ra/Cargo.toml
diff --git a/primrose/tests/b_asc_con_ra/src/main.rs b/src/tests/b_asc_con_ra/src/main.rs
index 0d18aee..0d18aee 100644
--- a/primrose/tests/b_asc_con_ra/src/main.rs
+++ b/src/tests/b_asc_con_ra/src/main.rs
diff --git a/primrose/tests/b_asc_con_ra/src/types.pr.rs b/src/tests/b_asc_con_ra/src/types.pr.rs
index 4d33cb9..4d33cb9 100644
--- a/primrose/tests/b_asc_con_ra/src/types.pr.rs
+++ b/src/tests/b_asc_con_ra/src/types.pr.rs
diff --git a/primrose/tests/b_des_con/Cargo.toml b/src/tests/b_des_con/Cargo.toml
index b1d0d61..b1d0d61 100644
--- a/primrose/tests/b_des_con/Cargo.toml
+++ b/src/tests/b_des_con/Cargo.toml
diff --git a/primrose/tests/b_des_con/src/main.rs b/src/tests/b_des_con/src/main.rs
index b64347b..b64347b 100644
--- a/primrose/tests/b_des_con/src/main.rs
+++ b/src/tests/b_des_con/src/main.rs
diff --git a/primrose/tests/b_des_con/src/types.pr.rs b/src/tests/b_des_con/src/types.pr.rs
index 63f15ff..63f15ff 100644
--- a/primrose/tests/b_des_con/src/types.pr.rs
+++ b/src/tests/b_des_con/src/types.pr.rs
diff --git a/primrose/tests/b_des_con_ra/Cargo.toml b/src/tests/b_des_con_ra/Cargo.toml
index 5ea4fd4..5ea4fd4 100644
--- a/primrose/tests/b_des_con_ra/Cargo.toml
+++ b/src/tests/b_des_con_ra/Cargo.toml
diff --git a/primrose/tests/b_des_con_ra/src/main.rs b/src/tests/b_des_con_ra/src/main.rs
index b64347b..b64347b 100644
--- a/primrose/tests/b_des_con_ra/src/main.rs
+++ b/src/tests/b_des_con_ra/src/main.rs
diff --git a/primrose/tests/b_des_con_ra/src/types.pr.rs b/src/tests/b_des_con_ra/src/types.pr.rs
index db5adb0..db5adb0 100644
--- a/primrose/tests/b_des_con_ra/src/types.pr.rs
+++ b/src/tests/b_des_con_ra/src/types.pr.rs
diff --git a/primrose/tests/b_stack_con/Cargo.toml b/src/tests/b_stack_con/Cargo.toml
index 6668e3d..6668e3d 100644
--- a/primrose/tests/b_stack_con/Cargo.toml
+++ b/src/tests/b_stack_con/Cargo.toml
diff --git a/primrose/tests/b_stack_con/src/main.rs b/src/tests/b_stack_con/src/main.rs
index 7c83f6b..7c83f6b 100644
--- a/primrose/tests/b_stack_con/src/main.rs
+++ b/src/tests/b_stack_con/src/main.rs
diff --git a/primrose/tests/b_stack_con/src/types.pr.rs b/src/tests/b_stack_con/src/types.pr.rs
index 525fdee..525fdee 100644
--- a/primrose/tests/b_stack_con/src/types.pr.rs
+++ b/src/tests/b_stack_con/src/types.pr.rs
diff --git a/primrose/tests/b_unique_asc_con/Cargo.toml b/src/tests/b_unique_asc_con/Cargo.toml
index 8d4c00f..8d4c00f 100644
--- a/primrose/tests/b_unique_asc_con/Cargo.toml
+++ b/src/tests/b_unique_asc_con/Cargo.toml
diff --git a/primrose/tests/b_unique_asc_con/src/main.rs b/src/tests/b_unique_asc_con/src/main.rs
index 2eac169..2eac169 100644
--- a/primrose/tests/b_unique_asc_con/src/main.rs
+++ b/src/tests/b_unique_asc_con/src/main.rs
diff --git a/primrose/tests/b_unique_asc_con/src/types.pr.rs b/src/tests/b_unique_asc_con/src/types.pr.rs
index e84858e..e84858e 100644
--- a/primrose/tests/b_unique_asc_con/src/types.pr.rs
+++ b/src/tests/b_unique_asc_con/src/types.pr.rs
diff --git a/primrose/tests/b_unique_asc_con_ra/Cargo.toml b/src/tests/b_unique_asc_con_ra/Cargo.toml
index bb3fb42..bb3fb42 100644
--- a/primrose/tests/b_unique_asc_con_ra/Cargo.toml
+++ b/src/tests/b_unique_asc_con_ra/Cargo.toml
diff --git a/primrose/tests/b_unique_asc_con_ra/src/main.rs b/src/tests/b_unique_asc_con_ra/src/main.rs
index 2eac169..2eac169 100644
--- a/primrose/tests/b_unique_asc_con_ra/src/main.rs
+++ b/src/tests/b_unique_asc_con_ra/src/main.rs
diff --git a/primrose/tests/b_unique_asc_con_ra/src/types.pr.rs b/src/tests/b_unique_asc_con_ra/src/types.pr.rs
index ed64180..ed64180 100644
--- a/primrose/tests/b_unique_asc_con_ra/src/types.pr.rs
+++ b/src/tests/b_unique_asc_con_ra/src/types.pr.rs
diff --git a/primrose/tests/b_unique_con/Cargo.toml b/src/tests/b_unique_con/Cargo.toml
index 3ad6e18..3ad6e18 100644
--- a/primrose/tests/b_unique_con/Cargo.toml
+++ b/src/tests/b_unique_con/Cargo.toml
diff --git a/primrose/tests/b_unique_con/src/main.rs b/src/tests/b_unique_con/src/main.rs
index a2b4246..a2b4246 100644
--- a/primrose/tests/b_unique_con/src/main.rs
+++ b/src/tests/b_unique_con/src/main.rs
diff --git a/primrose/tests/b_unique_con/src/types.pr.rs b/src/tests/b_unique_con/src/types.pr.rs
index 7393cce..7393cce 100644
--- a/primrose/tests/b_unique_con/src/types.pr.rs
+++ b/src/tests/b_unique_con/src/types.pr.rs
diff --git a/primrose/tests/b_unique_con_ra/Cargo.toml b/src/tests/b_unique_con_ra/Cargo.toml
index 8bc19d5..8bc19d5 100644
--- a/primrose/tests/b_unique_con_ra/Cargo.toml
+++ b/src/tests/b_unique_con_ra/Cargo.toml
diff --git a/primrose/tests/b_unique_con_ra/src/main.rs b/src/tests/b_unique_con_ra/src/main.rs
index a2b4246..a2b4246 100644
--- a/primrose/tests/b_unique_con_ra/src/main.rs
+++ b/src/tests/b_unique_con_ra/src/main.rs
diff --git a/primrose/tests/b_unique_con_ra/src/types.pr.rs b/src/tests/b_unique_con_ra/src/types.pr.rs
index 7562dd7..7562dd7 100644
--- a/primrose/tests/b_unique_con_ra/src/types.pr.rs
+++ b/src/tests/b_unique_con_ra/src/types.pr.rs
diff --git a/primrose/tests/example_comp/Cargo.toml b/src/tests/example_comp/Cargo.toml
index 67639f2..67639f2 100644
--- a/primrose/tests/example_comp/Cargo.toml
+++ b/src/tests/example_comp/Cargo.toml
diff --git a/primrose/tests/example_comp/src/main.rs b/src/tests/example_comp/src/main.rs
index d87425b..d87425b 100644
--- a/primrose/tests/example_comp/src/main.rs
+++ b/src/tests/example_comp/src/main.rs
diff --git a/primrose/tests/example_comp/src/types.pr.rs b/src/tests/example_comp/src/types.pr.rs
index ed64180..ed64180 100644
--- a/primrose/tests/example_comp/src/types.pr.rs
+++ b/src/tests/example_comp/src/types.pr.rs
diff --git a/primrose/tests/example_stack/Cargo.toml b/src/tests/example_stack/Cargo.toml
index 3010313..3010313 100644
--- a/primrose/tests/example_stack/Cargo.toml
+++ b/src/tests/example_stack/Cargo.toml
diff --git a/primrose/tests/example_stack/src/main.rs b/src/tests/example_stack/src/main.rs
index daa44d0..daa44d0 100644
--- a/primrose/tests/example_stack/src/main.rs
+++ b/src/tests/example_stack/src/main.rs
diff --git a/primrose/tests/example_stack/src/types.pr.rs b/src/tests/example_stack/src/types.pr.rs
index 525fdee..525fdee 100644
--- a/primrose/tests/example_stack/src/types.pr.rs
+++ b/src/tests/example_stack/src/types.pr.rs
diff --git a/primrose/tests/example_unique/Cargo.toml b/src/tests/example_unique/Cargo.toml
index 732c903..732c903 100644
--- a/primrose/tests/example_unique/Cargo.toml
+++ b/src/tests/example_unique/Cargo.toml
diff --git a/primrose/tests/example_unique/src/main.rs b/src/tests/example_unique/src/main.rs
index 0f6c143..0f6c143 100644
--- a/primrose/tests/example_unique/src/main.rs
+++ b/src/tests/example_unique/src/main.rs
diff --git a/primrose/tests/example_unique/src/types.pr.rs b/src/tests/example_unique/src/types.pr.rs
index 7393cce..7393cce 100644
--- a/primrose/tests/example_unique/src/types.pr.rs
+++ b/src/tests/example_unique/src/types.pr.rs