diff --git a/.gitignore b/.gitignore
index 47456c5290d671210dd19bcaae0280ae3c303916..2545bb91eae3159463b3e121d5e5babd5baaee87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,5 +43,5 @@ farith/
 # mac artifacts
 
 .DS_Store
-/src_common/why3.conf
+/common/why3.conf
 /_opam/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 869f6d408256bbc78084ea3d8a086e84ad5a9b90..fc09e9eba8ce74c800e66b0428a42a5662e4d44e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -64,7 +64,7 @@ generate-static:
   - if [ ! -d _opam ]; then echo "no local switch in the CI cache, we setup a new switch"; opam-2.1 switch create --yes --no-install . $OCAML_COMPILER; fi
   - eval `opam-2.1 config env`
   - opam-2.1 remote add uptodate https://opam.ocaml.org/
-  - sed -e "s/; FOR STATIC//" -i src_colibri2/bin/dune
+  - sed -e "s/; FOR STATIC//" -i colibri2/bin/dune
   - git config --global --add safe.directory /builds/pub/colibrics
   - opam-2.1 install . --deps-only --with-test --with-doc --yes --depext-only
   - opam-2.1 install . --deps-only --with-test --with-doc --yes
diff --git a/Makefile b/Makefile
index 309ee6e85998f690935644df6aeec0c4750b78fe..79d97d703bfe3847ee0bec5509a47df8df198d8f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
 
 all:
 	dune build --root=$$(pwd) @install colibri2.opam colibrics.opam colibrilib.opam \
-	src_colibri2/bin/colibri2_stage0.exe
+	colibri2/bin/colibri2_stage0.exe
 
 test:
 	dune runtest --root=$$(pwd)
@@ -81,7 +81,7 @@ uninstall:
 # file headers
 ###############
 
-WHY3_FILES = $(addprefix src_colibri2/popop_lib/, cmdline.ml cmdline.mli	\
+WHY3_FILES = $(addprefix colibri2/popop_lib/, cmdline.ml cmdline.mli	\
 	debug.ml debug.mli exn_printer.ml exn_printer.mli hashcons.ml		\
 	hashcons.mli lists.ml lists.mli loc.ml loc.mli number.ml number.mli	\
 	opt.ml opt.mli pp.ml pp.mli print_tree.ml print_tree.mli		\
@@ -89,26 +89,26 @@ WHY3_FILES = $(addprefix src_colibri2/popop_lib/, cmdline.ml cmdline.mli	\
 	sysutil.mli util.ml util.mli warning.ml warning.mli weakhtbl.ml		\
 	weakhtbl.mli )
 
-OCAML_FILES = $(addprefix src_colibri2/popop_lib/, map_intf.ml exthtbl.ml	\
+OCAML_FILES = $(addprefix colibri2/popop_lib/, map_intf.ml exthtbl.ml	\
 	exthtbl.mli extmap.ml extmap.mli extset.ml extset.mli )
 
-FRAMAC_FILES = $(addprefix src_colibri2/popop_lib/, intmap.ml intmap_hetero.ml	\
+FRAMAC_FILES = $(addprefix colibri2/popop_lib/, intmap.ml intmap_hetero.ml	\
 	intmap.mli intmap_hetero.mli bag.ml bag.mli)
 
-JC_FILES = $(addprefix src_colibri2/popop_lib/, leftistheap.ml leftistheap.mli)
+JC_FILES = $(addprefix colibri2/popop_lib/, leftistheap.ml leftistheap.mli)
 
-WITAN_FILES = src_colibri2/stdlib/std.ml src_colibri2/stdlib/std.mli		\
-	src_colibri2/stdlib/hashtbl_hetero.ml					\
-	src_colibri2/stdlib/hashtbl_hetero.mli					\
-	src_colibri2/stdlib/hashtbl_hetero_sig.ml				\
-	src_colibri2/stdlib/map_hetero.ml src_colibri2/stdlib/map_hetero.mli	\
-	src_colibri2/stdlib/map_hetero_sig.ml src_colibri2/stdlib/keys.mli	\
-	src_colibri2/stdlib/keys_sig.ml src_colibri2/stdlib/comp_keys.ml	\
-	src_colibri2/stdlib/comp_keys.mli src_colibri2/bin/options.ml
+WITAN_FILES = colibri2/stdlib/std.ml colibri2/stdlib/std.mli		\
+	colibri2/stdlib/hashtbl_hetero.ml					\
+	colibri2/stdlib/hashtbl_hetero.mli					\
+	colibri2/stdlib/hashtbl_hetero_sig.ml				\
+	colibri2/stdlib/map_hetero.ml colibri2/stdlib/map_hetero.mli	\
+	colibri2/stdlib/map_hetero_sig.ml colibri2/stdlib/keys.mli	\
+	colibri2/stdlib/keys_sig.ml colibri2/stdlib/comp_keys.ml	\
+	colibri2/stdlib/comp_keys.mli colibri2/bin/options.ml
 
 COLIBRI2_FILES = Makefile  \
 	$(filter-out $(WHY3_FILES) $(OCAML_FILES) $(FRAMAC_FILES) $(JC_FILES) $(WITAN_FILES) \
-	, $(wildcard src_colibri2/*/*/*.ml* src_colibri2/*/*.ml* src_colibri2/*.ml*))
+	, $(wildcard colibri2/*/*/*.ml* colibri2/*/*.ml* colibri2/*.ml*))
 
 COLIBRICS_FILES =
 
diff --git a/src_colibri2/bin/.ocamlformat b/colibri2/bin/.ocamlformat
similarity index 100%
rename from src_colibri2/bin/.ocamlformat
rename to colibri2/bin/.ocamlformat
diff --git a/src_colibri2/bin/dune b/colibri2/bin/dune
similarity index 100%
rename from src_colibri2/bin/dune
rename to colibri2/bin/dune
diff --git a/src_colibri2/bin/main.ml b/colibri2/bin/main.ml
similarity index 100%
rename from src_colibri2/bin/main.ml
rename to colibri2/bin/main.ml
diff --git a/src_colibri2/bin/options.ml b/colibri2/bin/options.ml
similarity index 100%
rename from src_colibri2/bin/options.ml
rename to colibri2/bin/options.ml
diff --git a/src_colibri2/core/.ocamlformat b/colibri2/core/.ocamlformat
similarity index 100%
rename from src_colibri2/core/.ocamlformat
rename to colibri2/core/.ocamlformat
diff --git a/src_colibri2/core/.ocamlformat-ignore b/colibri2/core/.ocamlformat-ignore
similarity index 100%
rename from src_colibri2/core/.ocamlformat-ignore
rename to colibri2/core/.ocamlformat-ignore
diff --git a/src_colibri2/core/choice_group.ml b/colibri2/core/choice_group.ml
similarity index 100%
rename from src_colibri2/core/choice_group.ml
rename to colibri2/core/choice_group.ml
diff --git a/src_colibri2/core/choice_group.mli b/colibri2/core/choice_group.mli
similarity index 100%
rename from src_colibri2/core/choice_group.mli
rename to colibri2/core/choice_group.mli
diff --git a/src_colibri2/core/colibri2_core.ml b/colibri2/core/colibri2_core.ml
similarity index 100%
rename from src_colibri2/core/colibri2_core.ml
rename to colibri2/core/colibri2_core.ml
diff --git a/src_colibri2/core/colibri2_core.mli b/colibri2/core/colibri2_core.mli
similarity index 100%
rename from src_colibri2/core/colibri2_core.mli
rename to colibri2/core/colibri2_core.mli
diff --git a/src_colibri2/core/datastructure.ml b/colibri2/core/datastructure.ml
similarity index 100%
rename from src_colibri2/core/datastructure.ml
rename to colibri2/core/datastructure.ml
diff --git a/src_colibri2/core/datastructure.mli b/colibri2/core/datastructure.mli
similarity index 100%
rename from src_colibri2/core/datastructure.mli
rename to colibri2/core/datastructure.mli
diff --git a/src_colibri2/core/demon.ml b/colibri2/core/demon.ml
similarity index 100%
rename from src_colibri2/core/demon.ml
rename to colibri2/core/demon.ml
diff --git a/src_colibri2/core/demon.mli b/colibri2/core/demon.mli
similarity index 100%
rename from src_colibri2/core/demon.mli
rename to colibri2/core/demon.mli
diff --git a/src_colibri2/core/dune b/colibri2/core/dune
similarity index 100%
rename from src_colibri2/core/dune
rename to colibri2/core/dune
diff --git a/src_colibri2/core/egraph.ml b/colibri2/core/egraph.ml
similarity index 100%
rename from src_colibri2/core/egraph.ml
rename to colibri2/core/egraph.ml
diff --git a/src_colibri2/core/egraph.mli b/colibri2/core/egraph.mli
similarity index 100%
rename from src_colibri2/core/egraph.mli
rename to colibri2/core/egraph.mli
diff --git a/src_colibri2/core/env.ml b/colibri2/core/env.ml
similarity index 100%
rename from src_colibri2/core/env.ml
rename to colibri2/core/env.ml
diff --git a/src_colibri2/core/env.mli b/colibri2/core/env.mli
similarity index 100%
rename from src_colibri2/core/env.mli
rename to colibri2/core/env.mli
diff --git a/src_colibri2/core/events.ml b/colibri2/core/events.ml
similarity index 100%
rename from src_colibri2/core/events.ml
rename to colibri2/core/events.ml
diff --git a/src_colibri2/core/events.mli b/colibri2/core/events.mli
similarity index 100%
rename from src_colibri2/core/events.mli
rename to colibri2/core/events.mli
diff --git a/src_colibri2/core/ground.ml b/colibri2/core/ground.ml
similarity index 100%
rename from src_colibri2/core/ground.ml
rename to colibri2/core/ground.ml
diff --git a/src_colibri2/core/ground.mli b/colibri2/core/ground.mli
similarity index 100%
rename from src_colibri2/core/ground.mli
rename to colibri2/core/ground.mli
diff --git a/src_colibri2/core/interp.ml b/colibri2/core/interp.ml
similarity index 100%
rename from src_colibri2/core/interp.ml
rename to colibri2/core/interp.ml
diff --git a/src_colibri2/core/interp.mli b/colibri2/core/interp.mli
similarity index 100%
rename from src_colibri2/core/interp.mli
rename to colibri2/core/interp.mli
diff --git a/src_colibri2/core/options.ml b/colibri2/core/options.ml
similarity index 100%
rename from src_colibri2/core/options.ml
rename to colibri2/core/options.ml
diff --git a/src_colibri2/core/options.mli b/colibri2/core/options.mli
similarity index 100%
rename from src_colibri2/core/options.mli
rename to colibri2/core/options.mli
diff --git a/src_colibri2/core/structures/domKind.ml b/colibri2/core/structures/domKind.ml
similarity index 100%
rename from src_colibri2/core/structures/domKind.ml
rename to colibri2/core/structures/domKind.ml
diff --git a/src_colibri2/core/structures/domKind.mli b/colibri2/core/structures/domKind.mli
similarity index 100%
rename from src_colibri2/core/structures/domKind.mli
rename to colibri2/core/structures/domKind.mli
diff --git a/src_colibri2/core/structures/dune b/colibri2/core/structures/dune
similarity index 100%
rename from src_colibri2/core/structures/dune
rename to colibri2/core/structures/dune
diff --git a/src_colibri2/core/structures/expr.ml b/colibri2/core/structures/expr.ml
similarity index 100%
rename from src_colibri2/core/structures/expr.ml
rename to colibri2/core/structures/expr.ml
diff --git a/src_colibri2/core/structures/nodes.ml b/colibri2/core/structures/nodes.ml
similarity index 100%
rename from src_colibri2/core/structures/nodes.ml
rename to colibri2/core/structures/nodes.ml
diff --git a/src_colibri2/core/structures/nodes.mli b/colibri2/core/structures/nodes.mli
similarity index 100%
rename from src_colibri2/core/structures/nodes.mli
rename to colibri2/core/structures/nodes.mli
diff --git a/src_colibri2/core/structures/term.ml b/colibri2/core/structures/term.ml
similarity index 100%
rename from src_colibri2/core/structures/term.ml
rename to colibri2/core/structures/term.ml
diff --git a/src_colibri2/core/theory.ml b/colibri2/core/theory.ml
similarity index 100%
rename from src_colibri2/core/theory.ml
rename to colibri2/core/theory.ml
diff --git a/src_colibri2/dune b/colibri2/dune
similarity index 100%
rename from src_colibri2/dune
rename to colibri2/dune
diff --git a/src_colibri2/popop_lib/IArray.ml b/colibri2/popop_lib/IArray.ml
similarity index 100%
rename from src_colibri2/popop_lib/IArray.ml
rename to colibri2/popop_lib/IArray.ml
diff --git a/src_colibri2/popop_lib/IArray.mli b/colibri2/popop_lib/IArray.mli
similarity index 100%
rename from src_colibri2/popop_lib/IArray.mli
rename to colibri2/popop_lib/IArray.mli
diff --git a/src_colibri2/popop_lib/TimeWheel.ml b/colibri2/popop_lib/TimeWheel.ml
similarity index 100%
rename from src_colibri2/popop_lib/TimeWheel.ml
rename to colibri2/popop_lib/TimeWheel.ml
diff --git a/src_colibri2/popop_lib/TimeWheel.mli b/colibri2/popop_lib/TimeWheel.mli
similarity index 100%
rename from src_colibri2/popop_lib/TimeWheel.mli
rename to colibri2/popop_lib/TimeWheel.mli
diff --git a/src_colibri2/popop_lib/bag.ml b/colibri2/popop_lib/bag.ml
similarity index 100%
rename from src_colibri2/popop_lib/bag.ml
rename to colibri2/popop_lib/bag.ml
diff --git a/src_colibri2/popop_lib/bag.mli b/colibri2/popop_lib/bag.mli
similarity index 100%
rename from src_colibri2/popop_lib/bag.mli
rename to colibri2/popop_lib/bag.mli
diff --git a/src_colibri2/popop_lib/cmdline.ml b/colibri2/popop_lib/cmdline.ml
similarity index 100%
rename from src_colibri2/popop_lib/cmdline.ml
rename to colibri2/popop_lib/cmdline.ml
diff --git a/src_colibri2/popop_lib/cmdline.mli b/colibri2/popop_lib/cmdline.mli
similarity index 100%
rename from src_colibri2/popop_lib/cmdline.mli
rename to colibri2/popop_lib/cmdline.mli
diff --git a/src_colibri2/popop_lib/dune b/colibri2/popop_lib/dune
similarity index 100%
rename from src_colibri2/popop_lib/dune
rename to colibri2/popop_lib/dune
diff --git a/src_colibri2/popop_lib/enum.ml b/colibri2/popop_lib/enum.ml
similarity index 100%
rename from src_colibri2/popop_lib/enum.ml
rename to colibri2/popop_lib/enum.ml
diff --git a/src_colibri2/popop_lib/enum.mli b/colibri2/popop_lib/enum.mli
similarity index 100%
rename from src_colibri2/popop_lib/enum.mli
rename to colibri2/popop_lib/enum.mli
diff --git a/src_colibri2/popop_lib/exn_printer.ml b/colibri2/popop_lib/exn_printer.ml
similarity index 100%
rename from src_colibri2/popop_lib/exn_printer.ml
rename to colibri2/popop_lib/exn_printer.ml
diff --git a/src_colibri2/popop_lib/exn_printer.mli b/colibri2/popop_lib/exn_printer.mli
similarity index 100%
rename from src_colibri2/popop_lib/exn_printer.mli
rename to colibri2/popop_lib/exn_printer.mli
diff --git a/src_colibri2/popop_lib/exthtbl.ml b/colibri2/popop_lib/exthtbl.ml
similarity index 100%
rename from src_colibri2/popop_lib/exthtbl.ml
rename to colibri2/popop_lib/exthtbl.ml
diff --git a/src_colibri2/popop_lib/exthtbl.mli b/colibri2/popop_lib/exthtbl.mli
similarity index 100%
rename from src_colibri2/popop_lib/exthtbl.mli
rename to colibri2/popop_lib/exthtbl.mli
diff --git a/src_colibri2/popop_lib/extmap.ml b/colibri2/popop_lib/extmap.ml
similarity index 100%
rename from src_colibri2/popop_lib/extmap.ml
rename to colibri2/popop_lib/extmap.ml
diff --git a/src_colibri2/popop_lib/extmap.mli b/colibri2/popop_lib/extmap.mli
similarity index 100%
rename from src_colibri2/popop_lib/extmap.mli
rename to colibri2/popop_lib/extmap.mli
diff --git a/src_colibri2/popop_lib/extset.ml b/colibri2/popop_lib/extset.ml
similarity index 100%
rename from src_colibri2/popop_lib/extset.ml
rename to colibri2/popop_lib/extset.ml
diff --git a/src_colibri2/popop_lib/extset.mli b/colibri2/popop_lib/extset.mli
similarity index 100%
rename from src_colibri2/popop_lib/extset.mli
rename to colibri2/popop_lib/extset.mli
diff --git a/src_colibri2/popop_lib/hashcons.ml b/colibri2/popop_lib/hashcons.ml
similarity index 100%
rename from src_colibri2/popop_lib/hashcons.ml
rename to colibri2/popop_lib/hashcons.ml
diff --git a/src_colibri2/popop_lib/hashcons.mli b/colibri2/popop_lib/hashcons.mli
similarity index 100%
rename from src_colibri2/popop_lib/hashcons.mli
rename to colibri2/popop_lib/hashcons.mli
diff --git a/src_colibri2/popop_lib/intmap.ml b/colibri2/popop_lib/intmap.ml
similarity index 100%
rename from src_colibri2/popop_lib/intmap.ml
rename to colibri2/popop_lib/intmap.ml
diff --git a/src_colibri2/popop_lib/intmap.mli b/colibri2/popop_lib/intmap.mli
similarity index 100%
rename from src_colibri2/popop_lib/intmap.mli
rename to colibri2/popop_lib/intmap.mli
diff --git a/src_colibri2/popop_lib/intmap_hetero.ml b/colibri2/popop_lib/intmap_hetero.ml
similarity index 100%
rename from src_colibri2/popop_lib/intmap_hetero.ml
rename to colibri2/popop_lib/intmap_hetero.ml
diff --git a/src_colibri2/popop_lib/intmap_hetero.mli b/colibri2/popop_lib/intmap_hetero.mli
similarity index 100%
rename from src_colibri2/popop_lib/intmap_hetero.mli
rename to colibri2/popop_lib/intmap_hetero.mli
diff --git a/src_colibri2/popop_lib/leftistheap.ml b/colibri2/popop_lib/leftistheap.ml
similarity index 100%
rename from src_colibri2/popop_lib/leftistheap.ml
rename to colibri2/popop_lib/leftistheap.ml
diff --git a/src_colibri2/popop_lib/leftistheap.mli b/colibri2/popop_lib/leftistheap.mli
similarity index 100%
rename from src_colibri2/popop_lib/leftistheap.mli
rename to colibri2/popop_lib/leftistheap.mli
diff --git a/src_colibri2/popop_lib/lists.ml b/colibri2/popop_lib/lists.ml
similarity index 100%
rename from src_colibri2/popop_lib/lists.ml
rename to colibri2/popop_lib/lists.ml
diff --git a/src_colibri2/popop_lib/lists.mli b/colibri2/popop_lib/lists.mli
similarity index 100%
rename from src_colibri2/popop_lib/lists.mli
rename to colibri2/popop_lib/lists.mli
diff --git a/src_colibri2/popop_lib/map_intf.ml b/colibri2/popop_lib/map_intf.ml
similarity index 100%
rename from src_colibri2/popop_lib/map_intf.ml
rename to colibri2/popop_lib/map_intf.ml
diff --git a/src_colibri2/popop_lib/number.ml b/colibri2/popop_lib/number.ml
similarity index 100%
rename from src_colibri2/popop_lib/number.ml
rename to colibri2/popop_lib/number.ml
diff --git a/src_colibri2/popop_lib/number.mli b/colibri2/popop_lib/number.mli
similarity index 100%
rename from src_colibri2/popop_lib/number.mli
rename to colibri2/popop_lib/number.mli
diff --git a/src_colibri2/popop_lib/opt.ml b/colibri2/popop_lib/opt.ml
similarity index 100%
rename from src_colibri2/popop_lib/opt.ml
rename to colibri2/popop_lib/opt.ml
diff --git a/src_colibri2/popop_lib/opt.mli b/colibri2/popop_lib/opt.mli
similarity index 100%
rename from src_colibri2/popop_lib/opt.mli
rename to colibri2/popop_lib/opt.mli
diff --git a/src_colibri2/popop_lib/popop_stdlib.ml b/colibri2/popop_lib/popop_stdlib.ml
similarity index 100%
rename from src_colibri2/popop_lib/popop_stdlib.ml
rename to colibri2/popop_lib/popop_stdlib.ml
diff --git a/src_colibri2/popop_lib/popop_stdlib.mli b/colibri2/popop_lib/popop_stdlib.mli
similarity index 100%
rename from src_colibri2/popop_lib/popop_stdlib.mli
rename to colibri2/popop_lib/popop_stdlib.mli
diff --git a/src_colibri2/popop_lib/pp.ml b/colibri2/popop_lib/pp.ml
similarity index 100%
rename from src_colibri2/popop_lib/pp.ml
rename to colibri2/popop_lib/pp.ml
diff --git a/src_colibri2/popop_lib/pp.mli b/colibri2/popop_lib/pp.mli
similarity index 100%
rename from src_colibri2/popop_lib/pp.mli
rename to colibri2/popop_lib/pp.mli
diff --git a/src_colibri2/popop_lib/print_tree.ml b/colibri2/popop_lib/print_tree.ml
similarity index 100%
rename from src_colibri2/popop_lib/print_tree.ml
rename to colibri2/popop_lib/print_tree.ml
diff --git a/src_colibri2/popop_lib/print_tree.mli b/colibri2/popop_lib/print_tree.mli
similarity index 100%
rename from src_colibri2/popop_lib/print_tree.mli
rename to colibri2/popop_lib/print_tree.mli
diff --git a/src_colibri2/popop_lib/refo.ml b/colibri2/popop_lib/refo.ml
similarity index 100%
rename from src_colibri2/popop_lib/refo.ml
rename to colibri2/popop_lib/refo.ml
diff --git a/src_colibri2/popop_lib/refo.mli b/colibri2/popop_lib/refo.mli
similarity index 100%
rename from src_colibri2/popop_lib/refo.mli
rename to colibri2/popop_lib/refo.mli
diff --git a/src_colibri2/popop_lib/simple_vector.ml b/colibri2/popop_lib/simple_vector.ml
similarity index 100%
rename from src_colibri2/popop_lib/simple_vector.ml
rename to colibri2/popop_lib/simple_vector.ml
diff --git a/src_colibri2/popop_lib/simple_vector.mli b/colibri2/popop_lib/simple_vector.mli
similarity index 100%
rename from src_colibri2/popop_lib/simple_vector.mli
rename to colibri2/popop_lib/simple_vector.mli
diff --git a/src_colibri2/popop_lib/strings.ml b/colibri2/popop_lib/strings.ml
similarity index 100%
rename from src_colibri2/popop_lib/strings.ml
rename to colibri2/popop_lib/strings.ml
diff --git a/src_colibri2/popop_lib/strings.mli b/colibri2/popop_lib/strings.mli
similarity index 100%
rename from src_colibri2/popop_lib/strings.mli
rename to colibri2/popop_lib/strings.mli
diff --git a/src_colibri2/popop_lib/sysutil.ml b/colibri2/popop_lib/sysutil.ml
similarity index 100%
rename from src_colibri2/popop_lib/sysutil.ml
rename to colibri2/popop_lib/sysutil.ml
diff --git a/src_colibri2/popop_lib/sysutil.mli b/colibri2/popop_lib/sysutil.mli
similarity index 100%
rename from src_colibri2/popop_lib/sysutil.mli
rename to colibri2/popop_lib/sysutil.mli
diff --git a/src_colibri2/popop_lib/unit.ml b/colibri2/popop_lib/unit.ml
similarity index 100%
rename from src_colibri2/popop_lib/unit.ml
rename to colibri2/popop_lib/unit.ml
diff --git a/src_colibri2/popop_lib/unit.mli b/colibri2/popop_lib/unit.mli
similarity index 100%
rename from src_colibri2/popop_lib/unit.mli
rename to colibri2/popop_lib/unit.mli
diff --git a/src_colibri2/popop_lib/util.ml b/colibri2/popop_lib/util.ml
similarity index 100%
rename from src_colibri2/popop_lib/util.ml
rename to colibri2/popop_lib/util.ml
diff --git a/src_colibri2/popop_lib/util.mli b/colibri2/popop_lib/util.mli
similarity index 100%
rename from src_colibri2/popop_lib/util.mli
rename to colibri2/popop_lib/util.mli
diff --git a/src_colibri2/popop_lib/vector_hetero.ml b/colibri2/popop_lib/vector_hetero.ml
similarity index 100%
rename from src_colibri2/popop_lib/vector_hetero.ml
rename to colibri2/popop_lib/vector_hetero.ml
diff --git a/src_colibri2/popop_lib/vector_hetero.mli b/colibri2/popop_lib/vector_hetero.mli
similarity index 100%
rename from src_colibri2/popop_lib/vector_hetero.mli
rename to colibri2/popop_lib/vector_hetero.mli
diff --git a/src_colibri2/popop_lib/weakhtbl.ml b/colibri2/popop_lib/weakhtbl.ml
similarity index 100%
rename from src_colibri2/popop_lib/weakhtbl.ml
rename to colibri2/popop_lib/weakhtbl.ml
diff --git a/src_colibri2/popop_lib/weakhtbl.mli b/colibri2/popop_lib/weakhtbl.mli
similarity index 100%
rename from src_colibri2/popop_lib/weakhtbl.mli
rename to colibri2/popop_lib/weakhtbl.mli
diff --git a/src_colibri2/solver/.ocamlformat b/colibri2/solver/.ocamlformat
similarity index 100%
rename from src_colibri2/solver/.ocamlformat
rename to colibri2/solver/.ocamlformat
diff --git a/src_colibri2/solver/dune b/colibri2/solver/dune
similarity index 100%
rename from src_colibri2/solver/dune
rename to colibri2/solver/dune
diff --git a/src_colibri2/solver/input.ml b/colibri2/solver/input.ml
similarity index 100%
rename from src_colibri2/solver/input.ml
rename to colibri2/solver/input.ml
diff --git a/src_colibri2/solver/scheduler.ml b/colibri2/solver/scheduler.ml
similarity index 100%
rename from src_colibri2/solver/scheduler.ml
rename to colibri2/solver/scheduler.ml
diff --git a/src_colibri2/solver/scheduler.mli b/colibri2/solver/scheduler.mli
similarity index 100%
rename from src_colibri2/solver/scheduler.mli
rename to colibri2/solver/scheduler.mli
diff --git a/src_colibri2/solver/solver.ml b/colibri2/solver/solver.ml
similarity index 100%
rename from src_colibri2/solver/solver.ml
rename to colibri2/solver/solver.ml
diff --git a/src_colibri2/stdlib/.ocamlformat b/colibri2/stdlib/.ocamlformat
similarity index 100%
rename from src_colibri2/stdlib/.ocamlformat
rename to colibri2/stdlib/.ocamlformat
diff --git a/src_colibri2/stdlib/comp_keys.ml b/colibri2/stdlib/comp_keys.ml
similarity index 100%
rename from src_colibri2/stdlib/comp_keys.ml
rename to colibri2/stdlib/comp_keys.ml
diff --git a/src_colibri2/stdlib/comp_keys.mli b/colibri2/stdlib/comp_keys.mli
similarity index 100%
rename from src_colibri2/stdlib/comp_keys.mli
rename to colibri2/stdlib/comp_keys.mli
diff --git a/src_colibri2/stdlib/config.ml b/colibri2/stdlib/config.ml
similarity index 100%
rename from src_colibri2/stdlib/config.ml
rename to colibri2/stdlib/config.ml
diff --git a/src_colibri2/stdlib/context.ml b/colibri2/stdlib/context.ml
similarity index 100%
rename from src_colibri2/stdlib/context.ml
rename to colibri2/stdlib/context.ml
diff --git a/src_colibri2/stdlib/context.mli b/colibri2/stdlib/context.mli
similarity index 100%
rename from src_colibri2/stdlib/context.mli
rename to colibri2/stdlib/context.mli
diff --git a/src_colibri2/stdlib/debug.ml b/colibri2/stdlib/debug.ml
similarity index 100%
rename from src_colibri2/stdlib/debug.ml
rename to colibri2/stdlib/debug.ml
diff --git a/src_colibri2/stdlib/debug.mli b/colibri2/stdlib/debug.mli
similarity index 100%
rename from src_colibri2/stdlib/debug.mli
rename to colibri2/stdlib/debug.mli
diff --git a/src_colibri2/stdlib/dune b/colibri2/stdlib/dune
similarity index 100%
rename from src_colibri2/stdlib/dune
rename to colibri2/stdlib/dune
diff --git a/src_colibri2/stdlib/hashtbl_hetero.ml b/colibri2/stdlib/hashtbl_hetero.ml
similarity index 100%
rename from src_colibri2/stdlib/hashtbl_hetero.ml
rename to colibri2/stdlib/hashtbl_hetero.ml
diff --git a/src_colibri2/stdlib/hashtbl_hetero.mli b/colibri2/stdlib/hashtbl_hetero.mli
similarity index 100%
rename from src_colibri2/stdlib/hashtbl_hetero.mli
rename to colibri2/stdlib/hashtbl_hetero.mli
diff --git a/src_colibri2/stdlib/hashtbl_hetero_sig.ml b/colibri2/stdlib/hashtbl_hetero_sig.ml
similarity index 100%
rename from src_colibri2/stdlib/hashtbl_hetero_sig.ml
rename to colibri2/stdlib/hashtbl_hetero_sig.ml
diff --git a/src_colibri2/stdlib/keys.ml b/colibri2/stdlib/keys.ml
similarity index 100%
rename from src_colibri2/stdlib/keys.ml
rename to colibri2/stdlib/keys.ml
diff --git a/src_colibri2/stdlib/keys.mli b/colibri2/stdlib/keys.mli
similarity index 100%
rename from src_colibri2/stdlib/keys.mli
rename to colibri2/stdlib/keys.mli
diff --git a/src_colibri2/stdlib/keys_sig.ml b/colibri2/stdlib/keys_sig.ml
similarity index 100%
rename from src_colibri2/stdlib/keys_sig.ml
rename to colibri2/stdlib/keys_sig.ml
diff --git a/src_colibri2/stdlib/map_hetero.ml b/colibri2/stdlib/map_hetero.ml
similarity index 100%
rename from src_colibri2/stdlib/map_hetero.ml
rename to colibri2/stdlib/map_hetero.ml
diff --git a/src_colibri2/stdlib/map_hetero.mli b/colibri2/stdlib/map_hetero.mli
similarity index 100%
rename from src_colibri2/stdlib/map_hetero.mli
rename to colibri2/stdlib/map_hetero.mli
diff --git a/src_colibri2/stdlib/map_hetero_sig.ml b/colibri2/stdlib/map_hetero_sig.ml
similarity index 100%
rename from src_colibri2/stdlib/map_hetero_sig.ml
rename to colibri2/stdlib/map_hetero_sig.ml
diff --git a/src_colibri2/stdlib/shuffle.ml b/colibri2/stdlib/shuffle.ml
similarity index 100%
rename from src_colibri2/stdlib/shuffle.ml
rename to colibri2/stdlib/shuffle.ml
diff --git a/src_colibri2/stdlib/shuffle.mli b/colibri2/stdlib/shuffle.mli
similarity index 100%
rename from src_colibri2/stdlib/shuffle.mli
rename to colibri2/stdlib/shuffle.mli
diff --git a/src_colibri2/stdlib/std.ml b/colibri2/stdlib/std.ml
similarity index 100%
rename from src_colibri2/stdlib/std.ml
rename to colibri2/stdlib/std.ml
diff --git a/src_colibri2/stdlib/std.mli b/colibri2/stdlib/std.mli
similarity index 100%
rename from src_colibri2/stdlib/std.mli
rename to colibri2/stdlib/std.mli
diff --git a/src_colibri2/stdlib/std_sig.ml b/colibri2/stdlib/std_sig.ml
similarity index 100%
rename from src_colibri2/stdlib/std_sig.ml
rename to colibri2/stdlib/std_sig.ml
diff --git a/src_colibri2/stdlib/wto.ml b/colibri2/stdlib/wto.ml
similarity index 100%
rename from src_colibri2/stdlib/wto.ml
rename to colibri2/stdlib/wto.ml
diff --git a/src_colibri2/stdlib/wto.mli b/colibri2/stdlib/wto.mli
similarity index 100%
rename from src_colibri2/stdlib/wto.mli
rename to colibri2/stdlib/wto.mli
diff --git a/src_colibri2/tests/.ocamlformat b/colibri2/tests/.ocamlformat
similarity index 100%
rename from src_colibri2/tests/.ocamlformat
rename to colibri2/tests/.ocamlformat
diff --git a/src_colibri2/tests/dune b/colibri2/tests/dune
similarity index 100%
rename from src_colibri2/tests/dune
rename to colibri2/tests/dune
diff --git a/src_colibri2/tests/generate_tests/.ocamlformat b/colibri2/tests/generate_tests/.ocamlformat
similarity index 100%
rename from src_colibri2/tests/generate_tests/.ocamlformat
rename to colibri2/tests/generate_tests/.ocamlformat
diff --git a/src_colibri2/tests/generate_tests/dune b/colibri2/tests/generate_tests/dune
similarity index 100%
rename from src_colibri2/tests/generate_tests/dune
rename to colibri2/tests/generate_tests/dune
diff --git a/src_colibri2/tests/generate_tests/generate_dune_tests.ml b/colibri2/tests/generate_tests/generate_dune_tests.ml
similarity index 100%
rename from src_colibri2/tests/generate_tests/generate_dune_tests.ml
rename to colibri2/tests/generate_tests/generate_dune_tests.ml
diff --git a/src_colibri2/tests/solve/all/sat/div_abs.smt2 b/colibri2/tests/solve/all/sat/div_abs.smt2
similarity index 100%
rename from src_colibri2/tests/solve/all/sat/div_abs.smt2
rename to colibri2/tests/solve/all/sat/div_abs.smt2
diff --git a/src_colibri2/tests/solve/all/sat/div_abs2.smt2 b/colibri2/tests/solve/all/sat/div_abs2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/all/sat/div_abs2.smt2
rename to colibri2/tests/solve/all/sat/div_abs2.smt2
diff --git a/src_colibri2/tests/solve/all/sat/dune b/colibri2/tests/solve/all/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/all/sat/dune
rename to colibri2/tests/solve/all/sat/dune
diff --git a/src_colibri2/tests/solve/all/sat/dune.inc b/colibri2/tests/solve/all/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/all/sat/dune.inc
rename to colibri2/tests/solve/all/sat/dune.inc
diff --git a/src_colibri2/tests/solve/all/sat/test_sqrt_assert_KO_Why3_Colibri2_n_a.psmt2 b/colibri2/tests/solve/all/sat/test_sqrt_assert_KO_Why3_Colibri2_n_a.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/sat/test_sqrt_assert_KO_Why3_Colibri2_n_a.psmt2
rename to colibri2/tests/solve/all/sat/test_sqrt_assert_KO_Why3_Colibri2_n_a.psmt2
diff --git a/src_colibri2/tests/solve/all/sat/union-Union-is_singletonqtvc_2.psmt2 b/colibri2/tests/solve/all/sat/union-Union-is_singletonqtvc_2.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/sat/union-Union-is_singletonqtvc_2.psmt2
rename to colibri2/tests/solve/all/sat/union-Union-is_singletonqtvc_2.psmt2
diff --git a/src_colibri2/tests/solve/all/steplimitreached/dune b/colibri2/tests/solve/all/steplimitreached/dune
similarity index 100%
rename from src_colibri2/tests/solve/all/steplimitreached/dune
rename to colibri2/tests/solve/all/steplimitreached/dune
diff --git a/src_colibri2/tests/solve/all/steplimitreached/dune.inc b/colibri2/tests/solve/all/steplimitreached/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/all/steplimitreached/dune.inc
rename to colibri2/tests/solve/all/steplimitreached/dune.inc
diff --git a/src_colibri2/tests/solve/all/unknown/dune b/colibri2/tests/solve/all/unknown/dune
similarity index 100%
rename from src_colibri2/tests/solve/all/unknown/dune
rename to colibri2/tests/solve/all/unknown/dune
diff --git a/src_colibri2/tests/solve/all/unknown/dune.inc b/colibri2/tests/solve/all/unknown/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/all/unknown/dune.inc
rename to colibri2/tests/solve/all/unknown/dune.inc
diff --git a/src_colibri2/tests/solve/all/unknown/float_interval-GenericFloat-div_finite_rev_1.psmt2 b/colibri2/tests/solve/all/unknown/float_interval-GenericFloat-div_finite_rev_1.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unknown/float_interval-GenericFloat-div_finite_rev_1.psmt2
rename to colibri2/tests/solve/all/unknown/float_interval-GenericFloat-div_finite_rev_1.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/bag-BagImpl-createqtvc.psmt2 b/colibri2/tests/solve/all/unsat/bag-BagImpl-createqtvc.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/bag-BagImpl-createqtvc.psmt2
rename to colibri2/tests/solve/all/unsat/bag-BagImpl-createqtvc.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/div_abs.smt2 b/colibri2/tests/solve/all/unsat/div_abs.smt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/div_abs.smt2
rename to colibri2/tests/solve/all/unsat/div_abs.smt2
diff --git a/src_colibri2/tests/solve/all/unsat/dune b/colibri2/tests/solve/all/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/dune
rename to colibri2/tests/solve/all/unsat/dune
diff --git a/src_colibri2/tests/solve/all/unsat/dune.inc b/colibri2/tests/solve/all/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/dune.inc
rename to colibri2/tests/solve/all/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/all/unsat/fact-FactRecursive-fact_recqtvc.psmt2 b/colibri2/tests/solve/all/unsat/fact-FactRecursive-fact_recqtvc.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/fact-FactRecursive-fact_recqtvc.psmt2
rename to colibri2/tests/solve/all/unsat/fact-FactRecursive-fact_recqtvc.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/float_interval-GenericFloat-add_special_1.psmt2 b/colibri2/tests/solve/all/unsat/float_interval-GenericFloat-add_special_1.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/float_interval-GenericFloat-add_special_1.psmt2
rename to colibri2/tests/solve/all/unsat/float_interval-GenericFloat-add_special_1.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/interval-Convexe-exists_memqtvc_1.psmt2 b/colibri2/tests/solve/all/unsat/interval-Convexe-exists_memqtvc_1.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/interval-Convexe-exists_memqtvc_1.psmt2
rename to colibri2/tests/solve/all/unsat/interval-Convexe-exists_memqtvc_1.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/interval-Convexe-exists_memqtvc_2.psmt2 b/colibri2/tests/solve/all/unsat/interval-Convexe-exists_memqtvc_2.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/interval-Convexe-exists_memqtvc_2.psmt2
rename to colibri2/tests/solve/all/unsat/interval-Convexe-exists_memqtvc_2.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/lost_in_search_union.psmt2 b/colibri2/tests/solve/all/unsat/lost_in_search_union.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/lost_in_search_union.psmt2
rename to colibri2/tests/solve/all/unsat/lost_in_search_union.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/mul_abs.smt2 b/colibri2/tests/solve/all/unsat/mul_abs.smt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/mul_abs.smt2
rename to colibri2/tests/solve/all/unsat/mul_abs.smt2
diff --git a/src_colibri2/tests/solve/all/unsat/ordered_is_ordered.psmt2 b/colibri2/tests/solve/all/unsat/ordered_is_ordered.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/ordered_is_ordered.psmt2
rename to colibri2/tests/solve/all/unsat/ordered_is_ordered.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/range_loop_invariant_CHECK_preserved_Why3_Colibri2_n_a.psmt2 b/colibri2/tests/solve/all/unsat/range_loop_invariant_CHECK_preserved_Why3_Colibri2_n_a.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/range_loop_invariant_CHECK_preserved_Why3_Colibri2_n_a.psmt2
rename to colibri2/tests/solve/all/unsat/range_loop_invariant_CHECK_preserved_Why3_Colibri2_n_a.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/range_loop_invariant_CHECK_preserved_Why3_Colibri2_n_a_simplified.psmt2 b/colibri2/tests/solve/all/unsat/range_loop_invariant_CHECK_preserved_Why3_Colibri2_n_a_simplified.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/range_loop_invariant_CHECK_preserved_Why3_Colibri2_n_a_simplified.psmt2
rename to colibri2/tests/solve/all/unsat/range_loop_invariant_CHECK_preserved_Why3_Colibri2_n_a_simplified.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/union-Union-interqtvc_10.psmt2 b/colibri2/tests/solve/all/unsat/union-Union-interqtvc_10.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/union-Union-interqtvc_10.psmt2
rename to colibri2/tests/solve/all/unsat/union-Union-interqtvc_10.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/union-Union-interqtvc_5.psmt2 b/colibri2/tests/solve/all/unsat/union-Union-interqtvc_5.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/union-Union-interqtvc_5.psmt2
rename to colibri2/tests/solve/all/unsat/union-Union-interqtvc_5.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_1.psmt2 b/colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_1.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_1.psmt2
rename to colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_1.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_2.psmt2 b/colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_2.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_2.psmt2
rename to colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_2.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_5.psmt2 b/colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_5.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_5.psmt2
rename to colibri2/tests/solve/all/unsat/union-Union-is_singletonqtvc_5.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/union-Union-length0_positiveqtvc_1.psmt2 b/colibri2/tests/solve/all/unsat/union-Union-length0_positiveqtvc_1.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/union-Union-length0_positiveqtvc_1.psmt2
rename to colibri2/tests/solve/all/unsat/union-Union-length0_positiveqtvc_1.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/work_with_fourier_not_simplex.psmt2 b/colibri2/tests/solve/all/unsat/work_with_fourier_not_simplex.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/work_with_fourier_not_simplex.psmt2
rename to colibri2/tests/solve/all/unsat/work_with_fourier_not_simplex.psmt2
diff --git a/src_colibri2/tests/solve/all/unsat/work_with_fourier_not_simplex2.psmt2 b/colibri2/tests/solve/all/unsat/work_with_fourier_not_simplex2.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/all/unsat/work_with_fourier_not_simplex2.psmt2
rename to colibri2/tests/solve/all/unsat/work_with_fourier_not_simplex2.psmt2
diff --git a/src_colibri2/tests/solve/colibri/arr.smt2 b/colibri2/tests/solve/colibri/arr.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/arr.smt2
rename to colibri2/tests/solve/colibri/arr.smt2
diff --git a/src_colibri2/tests/solve/colibri/bug25.smt2 b/colibri2/tests/solve/colibri/bug25.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/bug25.smt2
rename to colibri2/tests/solve/colibri/bug25.smt2
diff --git a/src_colibri2/tests/solve/colibri/expInUnit.smt2 b/colibri2/tests/solve/colibri/expInUnit.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/expInUnit.smt2
rename to colibri2/tests/solve/colibri/expInUnit.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/Float_div_bad-main.smt2 b/colibri2/tests/solve/colibri/sat/Float_div_bad-main.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/Float_div_bad-main.smt2
rename to colibri2/tests/solve/colibri/sat/Float_div_bad-main.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/O220-024.smt2 b/colibri2/tests/solve/colibri/sat/O220-024.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/O220-024.smt2
rename to colibri2/tests/solve/colibri/sat/O220-024.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/average_3.smt2 b/colibri2/tests/solve/colibri/sat/average_3.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/average_3.smt2
rename to colibri2/tests/solve/colibri/sat/average_3.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/bug22.smt2 b/colibri2/tests/solve/colibri/sat/bug22.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/bug22.smt2
rename to colibri2/tests/solve/colibri/sat/bug22.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/bug36.smt2 b/colibri2/tests/solve/colibri/sat/bug36.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/bug36.smt2
rename to colibri2/tests/solve/colibri/sat/bug36.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/bug_26.smt2 b/colibri2/tests/solve/colibri/sat/bug_26.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/bug_26.smt2
rename to colibri2/tests/solve/colibri/sat/bug_26.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/bug_26_bv.smt2 b/colibri2/tests/solve/colibri/sat/bug_26_bv.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/bug_26_bv.smt2
rename to colibri2/tests/solve/colibri/sat/bug_26_bv.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/bug_43.smt2 b/colibri2/tests/solve/colibri/sat/bug_43.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/bug_43.smt2
rename to colibri2/tests/solve/colibri/sat/bug_43.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/bug_factorization_urem_udiv.smt2 b/colibri2/tests/solve/colibri/sat/bug_factorization_urem_udiv.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/bug_factorization_urem_udiv.smt2
rename to colibri2/tests/solve/colibri/sat/bug_factorization_urem_udiv.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/cancel_2.smt2 b/colibri2/tests/solve/colibri/sat/cancel_2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/cancel_2.smt2
rename to colibri2/tests/solve/colibri/sat/cancel_2.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/cases_2.smt2 b/colibri2/tests/solve/colibri/sat/cases_2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/cases_2.smt2
rename to colibri2/tests/solve/colibri/sat/cases_2.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/div_zero.smt2 b/colibri2/tests/solve/colibri/sat/div_zero.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/div_zero.smt2
rename to colibri2/tests/solve/colibri/sat/div_zero.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/dune b/colibri2/tests/solve/colibri/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/dune
rename to colibri2/tests/solve/colibri/sat/dune
diff --git a/src_colibri2/tests/solve/colibri/sat/dune.inc b/colibri2/tests/solve/colibri/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/dune.inc
rename to colibri2/tests/solve/colibri/sat/dune.inc
diff --git a/src_colibri2/tests/solve/colibri/sat/expLaw.smt2 b/colibri2/tests/solve/colibri/sat/expLaw.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/expLaw.smt2
rename to colibri2/tests/solve/colibri/sat/expLaw.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/exp_3_precision.smt2 b/colibri2/tests/solve/colibri/sat/exp_3_precision.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/exp_3_precision.smt2
rename to colibri2/tests/solve/colibri/sat/exp_3_precision.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/guarded_div_1.smt2 b/colibri2/tests/solve/colibri/sat/guarded_div_1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/guarded_div_1.smt2
rename to colibri2/tests/solve/colibri/sat/guarded_div_1.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/guarded_div_2.smt2 b/colibri2/tests/solve/colibri/sat/guarded_div_2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/guarded_div_2.smt2
rename to colibri2/tests/solve/colibri/sat/guarded_div_2.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/incorrect_reordering.smt2 b/colibri2/tests/solve/colibri/sat/incorrect_reordering.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/incorrect_reordering.smt2
rename to colibri2/tests/solve/colibri/sat/incorrect_reordering.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/issue40_sat.smt2 b/colibri2/tests/solve/colibri/sat/issue40_sat.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/issue40_sat.smt2
rename to colibri2/tests/solve/colibri/sat/issue40_sat.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/issue46.smt2 b/colibri2/tests/solve/colibri/sat/issue46.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/issue46.smt2
rename to colibri2/tests/solve/colibri/sat/issue46.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/issue_40.smt2 b/colibri2/tests/solve/colibri/sat/issue_40.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/issue_40.smt2
rename to colibri2/tests/solve/colibri/sat/issue_40.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/issue_42.smt2 b/colibri2/tests/solve/colibri/sat/issue_42.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/issue_42.smt2
rename to colibri2/tests/solve/colibri/sat/issue_42.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/issue_42_bis.smt2 b/colibri2/tests/solve/colibri/sat/issue_42_bis.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/issue_42_bis.smt2
rename to colibri2/tests/solve/colibri/sat/issue_42_bis.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/issue_45.smt2 b/colibri2/tests/solve/colibri/sat/issue_45.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/issue_45.smt2
rename to colibri2/tests/solve/colibri/sat/issue_45.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/issue_46.smt2 b/colibri2/tests/solve/colibri/sat/issue_46.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/issue_46.smt2
rename to colibri2/tests/solve/colibri/sat/issue_46.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/mod_repr.smt2 b/colibri2/tests/solve/colibri/sat/mod_repr.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/mod_repr.smt2
rename to colibri2/tests/solve/colibri/sat/mod_repr.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/mul_03_3_1.smt2 b/colibri2/tests/solve/colibri/sat/mul_03_3_1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/mul_03_3_1.smt2
rename to colibri2/tests/solve/colibri/sat/mul_03_3_1.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/mult.smt2 b/colibri2/tests/solve/colibri/sat/mult.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/mult.smt2
rename to colibri2/tests/solve/colibri/sat/mult.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/nan_double-main.smt2 b/colibri2/tests/solve/colibri/sat/nan_double-main.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/nan_double-main.smt2
rename to colibri2/tests/solve/colibri/sat/nan_double-main.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/nan_float-main.smt2 b/colibri2/tests/solve/colibri/sat/nan_float-main.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/nan_float-main.smt2
rename to colibri2/tests/solve/colibri/sat/nan_float-main.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/newton_3_6_false-unreach-call-main.smt2 b/colibri2/tests/solve/colibri/sat/newton_3_6_false-unreach-call-main.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/newton_3_6_false-unreach-call-main.smt2
rename to colibri2/tests/solve/colibri/sat/newton_3_6_false-unreach-call-main.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/propExpLn1.smt2 b/colibri2/tests/solve/colibri/sat/propExpLn1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/propExpLn1.smt2
rename to colibri2/tests/solve/colibri/sat/propExpLn1.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/propLnExp3.smt2 b/colibri2/tests/solve/colibri/sat/propLnExp3.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/propLnExp3.smt2
rename to colibri2/tests/solve/colibri/sat/propLnExp3.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/protected_divide.smt2 b/colibri2/tests/solve/colibri/sat/protected_divide.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/protected_divide.smt2
rename to colibri2/tests/solve/colibri/sat/protected_divide.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.00.smt2 b/colibri2/tests/solve/colibri/sat/query.00.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.00.smt2
rename to colibri2/tests/solve/colibri/sat/query.00.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0040.smt2 b/colibri2/tests/solve/colibri/sat/query.0040.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0040.smt2
rename to colibri2/tests/solve/colibri/sat/query.0040.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0071.smt2 b/colibri2/tests/solve/colibri/sat/query.0071.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0071.smt2
rename to colibri2/tests/solve/colibri/sat/query.0071.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.01.smt2 b/colibri2/tests/solve/colibri/sat/query.01.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.01.smt2
rename to colibri2/tests/solve/colibri/sat/query.01.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.02.smt2 b/colibri2/tests/solve/colibri/sat/query.02.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.02.smt2
rename to colibri2/tests/solve/colibri/sat/query.02.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0208.smt2 b/colibri2/tests/solve/colibri/sat/query.0208.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0208.smt2
rename to colibri2/tests/solve/colibri/sat/query.0208.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0214.smt2 b/colibri2/tests/solve/colibri/sat/query.0214.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0214.smt2
rename to colibri2/tests/solve/colibri/sat/query.0214.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0234.smt2 b/colibri2/tests/solve/colibri/sat/query.0234.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0234.smt2
rename to colibri2/tests/solve/colibri/sat/query.0234.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0245.smt2 b/colibri2/tests/solve/colibri/sat/query.0245.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0245.smt2
rename to colibri2/tests/solve/colibri/sat/query.0245.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0246.smt2 b/colibri2/tests/solve/colibri/sat/query.0246.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0246.smt2
rename to colibri2/tests/solve/colibri/sat/query.0246.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.04.smt2 b/colibri2/tests/solve/colibri/sat/query.04.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.04.smt2
rename to colibri2/tests/solve/colibri/sat/query.04.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0408.smt2 b/colibri2/tests/solve/colibri/sat/query.0408.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0408.smt2
rename to colibri2/tests/solve/colibri/sat/query.0408.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0449.smt2 b/colibri2/tests/solve/colibri/sat/query.0449.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0449.smt2
rename to colibri2/tests/solve/colibri/sat/query.0449.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0451.smt2 b/colibri2/tests/solve/colibri/sat/query.0451.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0451.smt2
rename to colibri2/tests/solve/colibri/sat/query.0451.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0480.smt2 b/colibri2/tests/solve/colibri/sat/query.0480.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0480.smt2
rename to colibri2/tests/solve/colibri/sat/query.0480.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0490.smt2 b/colibri2/tests/solve/colibri/sat/query.0490.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0490.smt2
rename to colibri2/tests/solve/colibri/sat/query.0490.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0499.smt2 b/colibri2/tests/solve/colibri/sat/query.0499.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0499.smt2
rename to colibri2/tests/solve/colibri/sat/query.0499.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0507.smt2 b/colibri2/tests/solve/colibri/sat/query.0507.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0507.smt2
rename to colibri2/tests/solve/colibri/sat/query.0507.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0525.smt2 b/colibri2/tests/solve/colibri/sat/query.0525.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0525.smt2
rename to colibri2/tests/solve/colibri/sat/query.0525.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0534.smt2 b/colibri2/tests/solve/colibri/sat/query.0534.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0534.smt2
rename to colibri2/tests/solve/colibri/sat/query.0534.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0591.smt2 b/colibri2/tests/solve/colibri/sat/query.0591.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0591.smt2
rename to colibri2/tests/solve/colibri/sat/query.0591.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0611.smt2 b/colibri2/tests/solve/colibri/sat/query.0611.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0611.smt2
rename to colibri2/tests/solve/colibri/sat/query.0611.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0625.smt2 b/colibri2/tests/solve/colibri/sat/query.0625.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0625.smt2
rename to colibri2/tests/solve/colibri/sat/query.0625.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0629.smt2 b/colibri2/tests/solve/colibri/sat/query.0629.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0629.smt2
rename to colibri2/tests/solve/colibri/sat/query.0629.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0630.smt2 b/colibri2/tests/solve/colibri/sat/query.0630.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0630.smt2
rename to colibri2/tests/solve/colibri/sat/query.0630.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0640.smt2 b/colibri2/tests/solve/colibri/sat/query.0640.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0640.smt2
rename to colibri2/tests/solve/colibri/sat/query.0640.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0641.smt2 b/colibri2/tests/solve/colibri/sat/query.0641.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0641.smt2
rename to colibri2/tests/solve/colibri/sat/query.0641.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0643.smt2 b/colibri2/tests/solve/colibri/sat/query.0643.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0643.smt2
rename to colibri2/tests/solve/colibri/sat/query.0643.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0670.smt2 b/colibri2/tests/solve/colibri/sat/query.0670.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0670.smt2
rename to colibri2/tests/solve/colibri/sat/query.0670.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0675.smt2 b/colibri2/tests/solve/colibri/sat/query.0675.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0675.smt2
rename to colibri2/tests/solve/colibri/sat/query.0675.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0682.smt2 b/colibri2/tests/solve/colibri/sat/query.0682.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0682.smt2
rename to colibri2/tests/solve/colibri/sat/query.0682.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0689.smt2 b/colibri2/tests/solve/colibri/sat/query.0689.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0689.smt2
rename to colibri2/tests/solve/colibri/sat/query.0689.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0692.smt2 b/colibri2/tests/solve/colibri/sat/query.0692.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0692.smt2
rename to colibri2/tests/solve/colibri/sat/query.0692.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0698.smt2 b/colibri2/tests/solve/colibri/sat/query.0698.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0698.smt2
rename to colibri2/tests/solve/colibri/sat/query.0698.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.07.smt2 b/colibri2/tests/solve/colibri/sat/query.07.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.07.smt2
rename to colibri2/tests/solve/colibri/sat/query.07.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0743.smt2 b/colibri2/tests/solve/colibri/sat/query.0743.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0743.smt2
rename to colibri2/tests/solve/colibri/sat/query.0743.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0778.smt2 b/colibri2/tests/solve/colibri/sat/query.0778.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0778.smt2
rename to colibri2/tests/solve/colibri/sat/query.0778.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.08.smt2 b/colibri2/tests/solve/colibri/sat/query.08.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.08.smt2
rename to colibri2/tests/solve/colibri/sat/query.08.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0808.smt2 b/colibri2/tests/solve/colibri/sat/query.0808.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0808.smt2
rename to colibri2/tests/solve/colibri/sat/query.0808.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0811.smt2 b/colibri2/tests/solve/colibri/sat/query.0811.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0811.smt2
rename to colibri2/tests/solve/colibri/sat/query.0811.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0815.smt2 b/colibri2/tests/solve/colibri/sat/query.0815.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0815.smt2
rename to colibri2/tests/solve/colibri/sat/query.0815.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0842.smt2 b/colibri2/tests/solve/colibri/sat/query.0842.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0842.smt2
rename to colibri2/tests/solve/colibri/sat/query.0842.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0875.smt2 b/colibri2/tests/solve/colibri/sat/query.0875.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0875.smt2
rename to colibri2/tests/solve/colibri/sat/query.0875.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0881.smt2 b/colibri2/tests/solve/colibri/sat/query.0881.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0881.smt2
rename to colibri2/tests/solve/colibri/sat/query.0881.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.09.smt2 b/colibri2/tests/solve/colibri/sat/query.09.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.09.smt2
rename to colibri2/tests/solve/colibri/sat/query.09.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0907.smt2 b/colibri2/tests/solve/colibri/sat/query.0907.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0907.smt2
rename to colibri2/tests/solve/colibri/sat/query.0907.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0928.smt2 b/colibri2/tests/solve/colibri/sat/query.0928.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0928.smt2
rename to colibri2/tests/solve/colibri/sat/query.0928.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0936.smt2 b/colibri2/tests/solve/colibri/sat/query.0936.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0936.smt2
rename to colibri2/tests/solve/colibri/sat/query.0936.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0949.smt2 b/colibri2/tests/solve/colibri/sat/query.0949.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0949.smt2
rename to colibri2/tests/solve/colibri/sat/query.0949.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0955.smt2 b/colibri2/tests/solve/colibri/sat/query.0955.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0955.smt2
rename to colibri2/tests/solve/colibri/sat/query.0955.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0961.smt2 b/colibri2/tests/solve/colibri/sat/query.0961.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0961.smt2
rename to colibri2/tests/solve/colibri/sat/query.0961.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0985.smt2 b/colibri2/tests/solve/colibri/sat/query.0985.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0985.smt2
rename to colibri2/tests/solve/colibri/sat/query.0985.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.0994.smt2 b/colibri2/tests/solve/colibri/sat/query.0994.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.0994.smt2
rename to colibri2/tests/solve/colibri/sat/query.0994.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1.bis.smt2 b/colibri2/tests/solve/colibri/sat/query.1.bis.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1.bis.smt2
rename to colibri2/tests/solve/colibri/sat/query.1.bis.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1.smt2 b/colibri2/tests/solve/colibri/sat/query.1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1.smt2
rename to colibri2/tests/solve/colibri/sat/query.1.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.10.smt2 b/colibri2/tests/solve/colibri/sat/query.10.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.10.smt2
rename to colibri2/tests/solve/colibri/sat/query.10.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1024.smt2 b/colibri2/tests/solve/colibri/sat/query.1024.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1024.smt2
rename to colibri2/tests/solve/colibri/sat/query.1024.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1034.smt2 b/colibri2/tests/solve/colibri/sat/query.1034.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1034.smt2
rename to colibri2/tests/solve/colibri/sat/query.1034.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1035.smt2 b/colibri2/tests/solve/colibri/sat/query.1035.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1035.smt2
rename to colibri2/tests/solve/colibri/sat/query.1035.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1057.smt2 b/colibri2/tests/solve/colibri/sat/query.1057.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1057.smt2
rename to colibri2/tests/solve/colibri/sat/query.1057.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1091.smt2 b/colibri2/tests/solve/colibri/sat/query.1091.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1091.smt2
rename to colibri2/tests/solve/colibri/sat/query.1091.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1094.smt2 b/colibri2/tests/solve/colibri/sat/query.1094.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1094.smt2
rename to colibri2/tests/solve/colibri/sat/query.1094.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1110.smt2 b/colibri2/tests/solve/colibri/sat/query.1110.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1110.smt2
rename to colibri2/tests/solve/colibri/sat/query.1110.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1116.smt2 b/colibri2/tests/solve/colibri/sat/query.1116.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1116.smt2
rename to colibri2/tests/solve/colibri/sat/query.1116.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1123.smt2 b/colibri2/tests/solve/colibri/sat/query.1123.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1123.smt2
rename to colibri2/tests/solve/colibri/sat/query.1123.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1124.smt2 b/colibri2/tests/solve/colibri/sat/query.1124.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1124.smt2
rename to colibri2/tests/solve/colibri/sat/query.1124.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1133.smt2 b/colibri2/tests/solve/colibri/sat/query.1133.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1133.smt2
rename to colibri2/tests/solve/colibri/sat/query.1133.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1137.smt2 b/colibri2/tests/solve/colibri/sat/query.1137.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1137.smt2
rename to colibri2/tests/solve/colibri/sat/query.1137.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1139.smt2 b/colibri2/tests/solve/colibri/sat/query.1139.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1139.smt2
rename to colibri2/tests/solve/colibri/sat/query.1139.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1161.smt2 b/colibri2/tests/solve/colibri/sat/query.1161.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1161.smt2
rename to colibri2/tests/solve/colibri/sat/query.1161.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1165.smt2 b/colibri2/tests/solve/colibri/sat/query.1165.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1165.smt2
rename to colibri2/tests/solve/colibri/sat/query.1165.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1166.smt2 b/colibri2/tests/solve/colibri/sat/query.1166.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1166.smt2
rename to colibri2/tests/solve/colibri/sat/query.1166.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1178.smt2 b/colibri2/tests/solve/colibri/sat/query.1178.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1178.smt2
rename to colibri2/tests/solve/colibri/sat/query.1178.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1179.smt2 b/colibri2/tests/solve/colibri/sat/query.1179.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1179.smt2
rename to colibri2/tests/solve/colibri/sat/query.1179.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1194.smt2 b/colibri2/tests/solve/colibri/sat/query.1194.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1194.smt2
rename to colibri2/tests/solve/colibri/sat/query.1194.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1210.smt2 b/colibri2/tests/solve/colibri/sat/query.1210.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1210.smt2
rename to colibri2/tests/solve/colibri/sat/query.1210.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1214.smt2 b/colibri2/tests/solve/colibri/sat/query.1214.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1214.smt2
rename to colibri2/tests/solve/colibri/sat/query.1214.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1227.smt2 b/colibri2/tests/solve/colibri/sat/query.1227.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1227.smt2
rename to colibri2/tests/solve/colibri/sat/query.1227.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1237.smt2 b/colibri2/tests/solve/colibri/sat/query.1237.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1237.smt2
rename to colibri2/tests/solve/colibri/sat/query.1237.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1244.smt2 b/colibri2/tests/solve/colibri/sat/query.1244.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1244.smt2
rename to colibri2/tests/solve/colibri/sat/query.1244.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1261.smt2 b/colibri2/tests/solve/colibri/sat/query.1261.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1261.smt2
rename to colibri2/tests/solve/colibri/sat/query.1261.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1275.smt2 b/colibri2/tests/solve/colibri/sat/query.1275.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1275.smt2
rename to colibri2/tests/solve/colibri/sat/query.1275.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1300.smt2 b/colibri2/tests/solve/colibri/sat/query.1300.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1300.smt2
rename to colibri2/tests/solve/colibri/sat/query.1300.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1313.smt2 b/colibri2/tests/solve/colibri/sat/query.1313.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1313.smt2
rename to colibri2/tests/solve/colibri/sat/query.1313.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1321.smt2 b/colibri2/tests/solve/colibri/sat/query.1321.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1321.smt2
rename to colibri2/tests/solve/colibri/sat/query.1321.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1323.smt2 b/colibri2/tests/solve/colibri/sat/query.1323.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1323.smt2
rename to colibri2/tests/solve/colibri/sat/query.1323.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1331.smt2 b/colibri2/tests/solve/colibri/sat/query.1331.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1331.smt2
rename to colibri2/tests/solve/colibri/sat/query.1331.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1335.smt2 b/colibri2/tests/solve/colibri/sat/query.1335.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1335.smt2
rename to colibri2/tests/solve/colibri/sat/query.1335.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1393.smt2 b/colibri2/tests/solve/colibri/sat/query.1393.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1393.smt2
rename to colibri2/tests/solve/colibri/sat/query.1393.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1399.smt2 b/colibri2/tests/solve/colibri/sat/query.1399.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1399.smt2
rename to colibri2/tests/solve/colibri/sat/query.1399.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1411.smt2 b/colibri2/tests/solve/colibri/sat/query.1411.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1411.smt2
rename to colibri2/tests/solve/colibri/sat/query.1411.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1418.smt2 b/colibri2/tests/solve/colibri/sat/query.1418.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1418.smt2
rename to colibri2/tests/solve/colibri/sat/query.1418.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1422.smt2 b/colibri2/tests/solve/colibri/sat/query.1422.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1422.smt2
rename to colibri2/tests/solve/colibri/sat/query.1422.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1426.smt2 b/colibri2/tests/solve/colibri/sat/query.1426.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1426.smt2
rename to colibri2/tests/solve/colibri/sat/query.1426.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1443.smt2 b/colibri2/tests/solve/colibri/sat/query.1443.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1443.smt2
rename to colibri2/tests/solve/colibri/sat/query.1443.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1449.smt2 b/colibri2/tests/solve/colibri/sat/query.1449.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1449.smt2
rename to colibri2/tests/solve/colibri/sat/query.1449.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1463.smt2 b/colibri2/tests/solve/colibri/sat/query.1463.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1463.smt2
rename to colibri2/tests/solve/colibri/sat/query.1463.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1472.smt2 b/colibri2/tests/solve/colibri/sat/query.1472.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1472.smt2
rename to colibri2/tests/solve/colibri/sat/query.1472.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1482.smt2 b/colibri2/tests/solve/colibri/sat/query.1482.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1482.smt2
rename to colibri2/tests/solve/colibri/sat/query.1482.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1487.smt2 b/colibri2/tests/solve/colibri/sat/query.1487.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1487.smt2
rename to colibri2/tests/solve/colibri/sat/query.1487.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1496.smt2 b/colibri2/tests/solve/colibri/sat/query.1496.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1496.smt2
rename to colibri2/tests/solve/colibri/sat/query.1496.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.15.smt2 b/colibri2/tests/solve/colibri/sat/query.15.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.15.smt2
rename to colibri2/tests/solve/colibri/sat/query.15.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1504.smt2 b/colibri2/tests/solve/colibri/sat/query.1504.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1504.smt2
rename to colibri2/tests/solve/colibri/sat/query.1504.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1508.smt2 b/colibri2/tests/solve/colibri/sat/query.1508.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1508.smt2
rename to colibri2/tests/solve/colibri/sat/query.1508.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1511.smt2 b/colibri2/tests/solve/colibri/sat/query.1511.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1511.smt2
rename to colibri2/tests/solve/colibri/sat/query.1511.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1520.smt2 b/colibri2/tests/solve/colibri/sat/query.1520.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1520.smt2
rename to colibri2/tests/solve/colibri/sat/query.1520.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1523.smt2 b/colibri2/tests/solve/colibri/sat/query.1523.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1523.smt2
rename to colibri2/tests/solve/colibri/sat/query.1523.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1537.smt2 b/colibri2/tests/solve/colibri/sat/query.1537.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1537.smt2
rename to colibri2/tests/solve/colibri/sat/query.1537.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1553.smt2 b/colibri2/tests/solve/colibri/sat/query.1553.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1553.smt2
rename to colibri2/tests/solve/colibri/sat/query.1553.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1560.smt2 b/colibri2/tests/solve/colibri/sat/query.1560.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1560.smt2
rename to colibri2/tests/solve/colibri/sat/query.1560.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1570.smt2 b/colibri2/tests/solve/colibri/sat/query.1570.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1570.smt2
rename to colibri2/tests/solve/colibri/sat/query.1570.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1571.smt2 b/colibri2/tests/solve/colibri/sat/query.1571.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1571.smt2
rename to colibri2/tests/solve/colibri/sat/query.1571.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1588.smt2 b/colibri2/tests/solve/colibri/sat/query.1588.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1588.smt2
rename to colibri2/tests/solve/colibri/sat/query.1588.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1599.smt2 b/colibri2/tests/solve/colibri/sat/query.1599.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1599.smt2
rename to colibri2/tests/solve/colibri/sat/query.1599.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1619.smt2 b/colibri2/tests/solve/colibri/sat/query.1619.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1619.smt2
rename to colibri2/tests/solve/colibri/sat/query.1619.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1633.smt2 b/colibri2/tests/solve/colibri/sat/query.1633.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1633.smt2
rename to colibri2/tests/solve/colibri/sat/query.1633.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1640.smt2 b/colibri2/tests/solve/colibri/sat/query.1640.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1640.smt2
rename to colibri2/tests/solve/colibri/sat/query.1640.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1656.smt2 b/colibri2/tests/solve/colibri/sat/query.1656.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1656.smt2
rename to colibri2/tests/solve/colibri/sat/query.1656.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1667.smt2 b/colibri2/tests/solve/colibri/sat/query.1667.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1667.smt2
rename to colibri2/tests/solve/colibri/sat/query.1667.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1668.smt2 b/colibri2/tests/solve/colibri/sat/query.1668.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1668.smt2
rename to colibri2/tests/solve/colibri/sat/query.1668.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1669.smt2 b/colibri2/tests/solve/colibri/sat/query.1669.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1669.smt2
rename to colibri2/tests/solve/colibri/sat/query.1669.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1671.smt2 b/colibri2/tests/solve/colibri/sat/query.1671.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1671.smt2
rename to colibri2/tests/solve/colibri/sat/query.1671.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1693.smt2 b/colibri2/tests/solve/colibri/sat/query.1693.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1693.smt2
rename to colibri2/tests/solve/colibri/sat/query.1693.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1729.smt2 b/colibri2/tests/solve/colibri/sat/query.1729.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1729.smt2
rename to colibri2/tests/solve/colibri/sat/query.1729.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1741.smt2 b/colibri2/tests/solve/colibri/sat/query.1741.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1741.smt2
rename to colibri2/tests/solve/colibri/sat/query.1741.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1749.smt2 b/colibri2/tests/solve/colibri/sat/query.1749.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1749.smt2
rename to colibri2/tests/solve/colibri/sat/query.1749.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1758.smt2 b/colibri2/tests/solve/colibri/sat/query.1758.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1758.smt2
rename to colibri2/tests/solve/colibri/sat/query.1758.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1771.smt2 b/colibri2/tests/solve/colibri/sat/query.1771.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1771.smt2
rename to colibri2/tests/solve/colibri/sat/query.1771.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1773.smt2 b/colibri2/tests/solve/colibri/sat/query.1773.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1773.smt2
rename to colibri2/tests/solve/colibri/sat/query.1773.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1781.smt2 b/colibri2/tests/solve/colibri/sat/query.1781.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1781.smt2
rename to colibri2/tests/solve/colibri/sat/query.1781.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1784.smt2 b/colibri2/tests/solve/colibri/sat/query.1784.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1784.smt2
rename to colibri2/tests/solve/colibri/sat/query.1784.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1792.smt2 b/colibri2/tests/solve/colibri/sat/query.1792.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1792.smt2
rename to colibri2/tests/solve/colibri/sat/query.1792.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1815.smt2 b/colibri2/tests/solve/colibri/sat/query.1815.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1815.smt2
rename to colibri2/tests/solve/colibri/sat/query.1815.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1819.smt2 b/colibri2/tests/solve/colibri/sat/query.1819.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1819.smt2
rename to colibri2/tests/solve/colibri/sat/query.1819.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1820.smt2 b/colibri2/tests/solve/colibri/sat/query.1820.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1820.smt2
rename to colibri2/tests/solve/colibri/sat/query.1820.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1831.smt2 b/colibri2/tests/solve/colibri/sat/query.1831.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1831.smt2
rename to colibri2/tests/solve/colibri/sat/query.1831.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1834.smt2 b/colibri2/tests/solve/colibri/sat/query.1834.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1834.smt2
rename to colibri2/tests/solve/colibri/sat/query.1834.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1838.smt2 b/colibri2/tests/solve/colibri/sat/query.1838.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1838.smt2
rename to colibri2/tests/solve/colibri/sat/query.1838.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1858.smt2 b/colibri2/tests/solve/colibri/sat/query.1858.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1858.smt2
rename to colibri2/tests/solve/colibri/sat/query.1858.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1859.smt2 b/colibri2/tests/solve/colibri/sat/query.1859.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1859.smt2
rename to colibri2/tests/solve/colibri/sat/query.1859.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1873.smt2 b/colibri2/tests/solve/colibri/sat/query.1873.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1873.smt2
rename to colibri2/tests/solve/colibri/sat/query.1873.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1876.smt2 b/colibri2/tests/solve/colibri/sat/query.1876.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1876.smt2
rename to colibri2/tests/solve/colibri/sat/query.1876.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1878.smt2 b/colibri2/tests/solve/colibri/sat/query.1878.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1878.smt2
rename to colibri2/tests/solve/colibri/sat/query.1878.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1883.smt2 b/colibri2/tests/solve/colibri/sat/query.1883.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1883.smt2
rename to colibri2/tests/solve/colibri/sat/query.1883.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1906.smt2 b/colibri2/tests/solve/colibri/sat/query.1906.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1906.smt2
rename to colibri2/tests/solve/colibri/sat/query.1906.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1909.smt2 b/colibri2/tests/solve/colibri/sat/query.1909.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1909.smt2
rename to colibri2/tests/solve/colibri/sat/query.1909.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1910.smt2 b/colibri2/tests/solve/colibri/sat/query.1910.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1910.smt2
rename to colibri2/tests/solve/colibri/sat/query.1910.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1916.smt2 b/colibri2/tests/solve/colibri/sat/query.1916.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1916.smt2
rename to colibri2/tests/solve/colibri/sat/query.1916.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1919.smt2 b/colibri2/tests/solve/colibri/sat/query.1919.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1919.smt2
rename to colibri2/tests/solve/colibri/sat/query.1919.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1926.smt2 b/colibri2/tests/solve/colibri/sat/query.1926.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1926.smt2
rename to colibri2/tests/solve/colibri/sat/query.1926.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1933.smt2 b/colibri2/tests/solve/colibri/sat/query.1933.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1933.smt2
rename to colibri2/tests/solve/colibri/sat/query.1933.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1937.smt2 b/colibri2/tests/solve/colibri/sat/query.1937.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1937.smt2
rename to colibri2/tests/solve/colibri/sat/query.1937.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1963.smt2 b/colibri2/tests/solve/colibri/sat/query.1963.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1963.smt2
rename to colibri2/tests/solve/colibri/sat/query.1963.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1972.smt2 b/colibri2/tests/solve/colibri/sat/query.1972.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1972.smt2
rename to colibri2/tests/solve/colibri/sat/query.1972.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1975.smt2 b/colibri2/tests/solve/colibri/sat/query.1975.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1975.smt2
rename to colibri2/tests/solve/colibri/sat/query.1975.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1993.smt2 b/colibri2/tests/solve/colibri/sat/query.1993.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1993.smt2
rename to colibri2/tests/solve/colibri/sat/query.1993.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.1995.smt2 b/colibri2/tests/solve/colibri/sat/query.1995.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.1995.smt2
rename to colibri2/tests/solve/colibri/sat/query.1995.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.20.smt2 b/colibri2/tests/solve/colibri/sat/query.20.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.20.smt2
rename to colibri2/tests/solve/colibri/sat/query.20.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2005.smt2 b/colibri2/tests/solve/colibri/sat/query.2005.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2005.smt2
rename to colibri2/tests/solve/colibri/sat/query.2005.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2036.smt2 b/colibri2/tests/solve/colibri/sat/query.2036.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2036.smt2
rename to colibri2/tests/solve/colibri/sat/query.2036.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2037.smt2 b/colibri2/tests/solve/colibri/sat/query.2037.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2037.smt2
rename to colibri2/tests/solve/colibri/sat/query.2037.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2097.smt2 b/colibri2/tests/solve/colibri/sat/query.2097.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2097.smt2
rename to colibri2/tests/solve/colibri/sat/query.2097.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2099.smt2 b/colibri2/tests/solve/colibri/sat/query.2099.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2099.smt2
rename to colibri2/tests/solve/colibri/sat/query.2099.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2110.smt2 b/colibri2/tests/solve/colibri/sat/query.2110.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2110.smt2
rename to colibri2/tests/solve/colibri/sat/query.2110.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2116.smt2 b/colibri2/tests/solve/colibri/sat/query.2116.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2116.smt2
rename to colibri2/tests/solve/colibri/sat/query.2116.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2117.smt2 b/colibri2/tests/solve/colibri/sat/query.2117.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2117.smt2
rename to colibri2/tests/solve/colibri/sat/query.2117.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2119.smt2 b/colibri2/tests/solve/colibri/sat/query.2119.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2119.smt2
rename to colibri2/tests/solve/colibri/sat/query.2119.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2133.smt2 b/colibri2/tests/solve/colibri/sat/query.2133.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2133.smt2
rename to colibri2/tests/solve/colibri/sat/query.2133.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2150.smt2 b/colibri2/tests/solve/colibri/sat/query.2150.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2150.smt2
rename to colibri2/tests/solve/colibri/sat/query.2150.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2155.smt2 b/colibri2/tests/solve/colibri/sat/query.2155.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2155.smt2
rename to colibri2/tests/solve/colibri/sat/query.2155.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2157.smt2 b/colibri2/tests/solve/colibri/sat/query.2157.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2157.smt2
rename to colibri2/tests/solve/colibri/sat/query.2157.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.2198.smt2 b/colibri2/tests/solve/colibri/sat/query.2198.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.2198.smt2
rename to colibri2/tests/solve/colibri/sat/query.2198.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.25.smt2 b/colibri2/tests/solve/colibri/sat/query.25.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.25.smt2
rename to colibri2/tests/solve/colibri/sat/query.25.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.30.smt2 b/colibri2/tests/solve/colibri/sat/query.30.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.30.smt2
rename to colibri2/tests/solve/colibri/sat/query.30.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/query.35.smt2 b/colibri2/tests/solve/colibri/sat/query.35.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/query.35.smt2
rename to colibri2/tests/solve/colibri/sat/query.35.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/range_mult_fix_44.smt2 b/colibri2/tests/solve/colibri/sat/range_mult_fix_44.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/range_mult_fix_44.smt2
rename to colibri2/tests/solve/colibri/sat/range_mult_fix_44.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/real_repr.smt2 b/colibri2/tests/solve/colibri/sat/real_repr.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/real_repr.smt2
rename to colibri2/tests/solve/colibri/sat/real_repr.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/repr2.smt2 b/colibri2/tests/solve/colibri/sat/repr2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/repr2.smt2
rename to colibri2/tests/solve/colibri/sat/repr2.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/repr_pow.smt2 b/colibri2/tests/solve/colibri/sat/repr_pow.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/repr_pow.smt2
rename to colibri2/tests/solve/colibri/sat/repr_pow.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/riposte_floats_are_not_rational.smt2 b/colibri2/tests/solve/colibri/sat/riposte_floats_are_not_rational.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/riposte_floats_are_not_rational.smt2
rename to colibri2/tests/solve/colibri/sat/riposte_floats_are_not_rational.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/scale_1.smt2 b/colibri2/tests/solve/colibri/sat/scale_1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/scale_1.smt2
rename to colibri2/tests/solve/colibri/sat/scale_1.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-10284.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-10284.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-10284.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-10284.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-10286.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-10286.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-10286.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-10286.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-11504.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-11504.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-11504.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-11504.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-11967.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-11967.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-11967.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-11967.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-1201.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-1201.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-1201.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-1201.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-12401.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-12401.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-12401.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-12401.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-12581.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-12581.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-12581.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-12581.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-13316.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-13316.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-13316.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-13316.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-13690.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-13690.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-13690.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-13690.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-13762.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-13762.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-13762.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-13762.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-13880.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-13880.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-13880.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-13880.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-14248.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-14248.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-14248.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-14248.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-14254.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-14254.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-14254.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-14254.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-145.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-145.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-145.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-145.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-14564.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-14564.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-14564.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-14564.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-14628.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-14628.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-14628.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-14628.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-15135.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-15135.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-15135.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-15135.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-15730.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-15730.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-15730.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-15730.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-16064.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-16064.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-16064.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-16064.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-16305.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-16305.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-16305.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-16305.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-16646.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-16646.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-16646.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-16646.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-16876.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-16876.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-16876.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-16876.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-17024.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-17024.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-17024.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-17024.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-17361.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-17361.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-17361.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-17361.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-17538.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-17538.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-17538.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-17538.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-1766.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-1766.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-1766.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-1766.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-18917.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-18917.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-18917.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-18917.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-18939.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-18939.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-18939.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-18939.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-19265.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-19265.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-19265.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-19265.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-19297.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-19297.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-19297.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-19297.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-19725.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-19725.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-19725.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-19725.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-2173.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-2173.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-2173.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-2173.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-3270.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-3270.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-3270.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-3270.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-3535.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-3535.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-3535.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-3535.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-4100.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-4100.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-4100.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-4100.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-4331.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-4331.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-4331.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-4331.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-5119.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-5119.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-5119.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-5119.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-5274.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-5274.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-5274.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-5274.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-5905.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-5905.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-5905.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-5905.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-6014.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-6014.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-6014.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-6014.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-6055.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-6055.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-6055.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-6055.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-6410.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-6410.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-6410.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-6410.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-6585.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-6585.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-6585.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-6585.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-673.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-673.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-673.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-673.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-674.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-674.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-674.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-674.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-7134.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-7134.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-7134.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-7134.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-7164.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-7164.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-7164.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-7164.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-7272.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-7272.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-7272.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-7272.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-8776.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-8776.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-8776.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-8776.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-8940.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-8940.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-8940.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-8940.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-9497.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-9497.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-9497.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-9497.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-9896.smt2 b/colibri2/tests/solve/colibri/sat/sqrt-has-solution-9896.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/sqrt-has-solution-9896.smt2
rename to colibri2/tests/solve/colibri/sat/sqrt-has-solution-9896.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/test-Top-Floor_ceil_invalid.smt2 b/colibri2/tests/solve/colibri/sat/test-Top-Floor_ceil_invalid.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/test-Top-Floor_ceil_invalid.smt2
rename to colibri2/tests/solve/colibri/sat/test-Top-Floor_ceil_invalid.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/test-Top-G2_invalid.smt2 b/colibri2/tests/solve/colibri/sat/test-Top-G2_invalid.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/test-Top-G2_invalid.smt2
rename to colibri2/tests/solve/colibri/sat/test-Top-G2_invalid.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/test-Top-Int_Pow2_invalid.smt2 b/colibri2/tests/solve/colibri/sat/test-Top-Int_Pow2_invalid.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/test-Top-Int_Pow2_invalid.smt2
rename to colibri2/tests/solve/colibri/sat/test-Top-Int_Pow2_invalid.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/test-Top-Int_Pow_invalid.smt2 b/colibri2/tests/solve/colibri/sat/test-Top-Int_Pow_invalid.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/test-Top-Int_Pow_invalid.smt2
rename to colibri2/tests/solve/colibri/sat/test-Top-Int_Pow_invalid.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/underflow_1.smt2 b/colibri2/tests/solve/colibri/sat/underflow_1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/underflow_1.smt2
rename to colibri2/tests/solve/colibri/sat/underflow_1.smt2
diff --git a/src_colibri2/tests/solve/colibri/sat/zeros_count_1.smt2 b/colibri2/tests/solve/colibri/sat/zeros_count_1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/colibri/sat/zeros_count_1.smt2
rename to colibri2/tests/solve/colibri/sat/zeros_count_1.smt2
diff --git a/src_colibri2/tests/solve/colibri/unsat/dune b/colibri2/tests/solve/colibri/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/colibri/unsat/dune
rename to colibri2/tests/solve/colibri/unsat/dune
diff --git a/src_colibri2/tests/solve/colibri/unsat/dune.inc b/colibri2/tests/solve/colibri/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/colibri/unsat/dune.inc
rename to colibri2/tests/solve/colibri/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/dimacs/sat/anomaly_agetooold.cnf b/colibri2/tests/solve/dimacs/sat/anomaly_agetooold.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/anomaly_agetooold.cnf
rename to colibri2/tests/solve/dimacs/sat/anomaly_agetooold.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/anomaly_agetooold2.cnf b/colibri2/tests/solve/dimacs/sat/anomaly_agetooold2.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/anomaly_agetooold2.cnf
rename to colibri2/tests/solve/dimacs/sat/anomaly_agetooold2.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/assertion_fail.cnf b/colibri2/tests/solve/dimacs/sat/assertion_fail.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/assertion_fail.cnf
rename to colibri2/tests/solve/dimacs/sat/assertion_fail.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/dune b/colibri2/tests/solve/dimacs/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/dune
rename to colibri2/tests/solve/dimacs/sat/dune
diff --git a/src_colibri2/tests/solve/dimacs/sat/dune.inc b/colibri2/tests/solve/dimacs/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/dune.inc
rename to colibri2/tests/solve/dimacs/sat/dune.inc
diff --git a/src_colibri2/tests/solve/dimacs/sat/fuzzing1.cnf b/colibri2/tests/solve/dimacs/sat/fuzzing1.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/fuzzing1.cnf
rename to colibri2/tests/solve/dimacs/sat/fuzzing1.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/fuzzing2.cnf b/colibri2/tests/solve/dimacs/sat/fuzzing2.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/fuzzing2.cnf
rename to colibri2/tests/solve/dimacs/sat/fuzzing2.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/par8-1-c.cnf b/colibri2/tests/solve/dimacs/sat/par8-1-c.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/par8-1-c.cnf
rename to colibri2/tests/solve/dimacs/sat/par8-1-c.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/pigeon-2.cnf b/colibri2/tests/solve/dimacs/sat/pigeon-2.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/pigeon-2.cnf
rename to colibri2/tests/solve/dimacs/sat/pigeon-2.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/pigeon-3.cnf b/colibri2/tests/solve/dimacs/sat/pigeon-3.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/pigeon-3.cnf
rename to colibri2/tests/solve/dimacs/sat/pigeon-3.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/pigeon-4.cnf b/colibri2/tests/solve/dimacs/sat/pigeon-4.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/pigeon-4.cnf
rename to colibri2/tests/solve/dimacs/sat/pigeon-4.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/quinn.cnf b/colibri2/tests/solve/dimacs/sat/quinn.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/quinn.cnf
rename to colibri2/tests/solve/dimacs/sat/quinn.cnf
diff --git a/src_colibri2/tests/solve/dimacs/sat/simple_v3_c2.cnf b/colibri2/tests/solve/dimacs/sat/simple_v3_c2.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/sat/simple_v3_c2.cnf
rename to colibri2/tests/solve/dimacs/sat/simple_v3_c2.cnf
diff --git a/src_colibri2/tests/solve/dimacs/unsat/anomaly_agetooold.cnf b/colibri2/tests/solve/dimacs/unsat/anomaly_agetooold.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/unsat/anomaly_agetooold.cnf
rename to colibri2/tests/solve/dimacs/unsat/anomaly_agetooold.cnf
diff --git a/src_colibri2/tests/solve/dimacs/unsat/dune b/colibri2/tests/solve/dimacs/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/unsat/dune
rename to colibri2/tests/solve/dimacs/unsat/dune
diff --git a/src_colibri2/tests/solve/dimacs/unsat/dune.inc b/colibri2/tests/solve/dimacs/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/unsat/dune.inc
rename to colibri2/tests/solve/dimacs/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/dimacs/unsat/modus_ponens.cnf b/colibri2/tests/solve/dimacs/unsat/modus_ponens.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/unsat/modus_ponens.cnf
rename to colibri2/tests/solve/dimacs/unsat/modus_ponens.cnf
diff --git a/src_colibri2/tests/solve/dimacs/unsat/pigeon-1.cnf b/colibri2/tests/solve/dimacs/unsat/pigeon-1.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/unsat/pigeon-1.cnf
rename to colibri2/tests/solve/dimacs/unsat/pigeon-1.cnf
diff --git a/src_colibri2/tests/solve/dimacs/unsat/pigeon-2.cnf b/colibri2/tests/solve/dimacs/unsat/pigeon-2.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/unsat/pigeon-2.cnf
rename to colibri2/tests/solve/dimacs/unsat/pigeon-2.cnf
diff --git a/src_colibri2/tests/solve/dimacs/unsat/pigeon-3.cnf b/colibri2/tests/solve/dimacs/unsat/pigeon-3.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/unsat/pigeon-3.cnf
rename to colibri2/tests/solve/dimacs/unsat/pigeon-3.cnf
diff --git a/src_colibri2/tests/solve/dimacs/unsat/pigeon-4.cnf b/colibri2/tests/solve/dimacs/unsat/pigeon-4.cnf
similarity index 100%
rename from src_colibri2/tests/solve/dimacs/unsat/pigeon-4.cnf
rename to colibri2/tests/solve/dimacs/unsat/pigeon-4.cnf
diff --git a/src_colibri2/tests/solve/models/abs_real.smt2 b/colibri2/tests/solve/models/abs_real.smt2
similarity index 100%
rename from src_colibri2/tests/solve/models/abs_real.smt2
rename to colibri2/tests/solve/models/abs_real.smt2
diff --git a/src_colibri2/tests/solve/models/abs_real.smt2.oracle b/colibri2/tests/solve/models/abs_real.smt2.oracle
similarity index 100%
rename from src_colibri2/tests/solve/models/abs_real.smt2.oracle
rename to colibri2/tests/solve/models/abs_real.smt2.oracle
diff --git a/src_colibri2/tests/solve/models/dune b/colibri2/tests/solve/models/dune
similarity index 100%
rename from src_colibri2/tests/solve/models/dune
rename to colibri2/tests/solve/models/dune
diff --git a/src_colibri2/tests/solve/models/dune.inc b/colibri2/tests/solve/models/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/models/dune.inc
rename to colibri2/tests/solve/models/dune.inc
diff --git a/src_colibri2/tests/solve/models/function.smt2 b/colibri2/tests/solve/models/function.smt2
similarity index 100%
rename from src_colibri2/tests/solve/models/function.smt2
rename to colibri2/tests/solve/models/function.smt2
diff --git a/src_colibri2/tests/solve/models/function.smt2.oracle b/colibri2/tests/solve/models/function.smt2.oracle
similarity index 100%
rename from src_colibri2/tests/solve/models/function.smt2.oracle
rename to colibri2/tests/solve/models/function.smt2.oracle
diff --git a/src_colibri2/tests/solve/models/get_value.smt2 b/colibri2/tests/solve/models/get_value.smt2
similarity index 100%
rename from src_colibri2/tests/solve/models/get_value.smt2
rename to colibri2/tests/solve/models/get_value.smt2
diff --git a/src_colibri2/tests/solve/models/get_value.smt2.oracle b/colibri2/tests/solve/models/get_value.smt2.oracle
similarity index 100%
rename from src_colibri2/tests/solve/models/get_value.smt2.oracle
rename to colibri2/tests/solve/models/get_value.smt2.oracle
diff --git a/src_colibri2/tests/solve/models/sqrt.smt2 b/colibri2/tests/solve/models/sqrt.smt2
similarity index 100%
rename from src_colibri2/tests/solve/models/sqrt.smt2
rename to colibri2/tests/solve/models/sqrt.smt2
diff --git a/src_colibri2/tests/solve/models/sqrt.smt2.oracle b/colibri2/tests/solve/models/sqrt.smt2.oracle
similarity index 100%
rename from src_colibri2/tests/solve/models/sqrt.smt2.oracle
rename to colibri2/tests/solve/models/sqrt.smt2.oracle
diff --git a/src_colibri2/tests/solve/smt_adt/sat/dune b/colibri2/tests/solve/smt_adt/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/sat/dune
rename to colibri2/tests/solve/smt_adt/sat/dune
diff --git a/src_colibri2/tests/solve/smt_adt/sat/dune.inc b/colibri2/tests/solve/smt_adt/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/sat/dune.inc
rename to colibri2/tests/solve/smt_adt/sat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_adt/sat/enum.smt2 b/colibri2/tests/solve/smt_adt/sat/enum.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/sat/enum.smt2
rename to colibri2/tests/solve/smt_adt/sat/enum.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/sat/list0.smt2 b/colibri2/tests/solve/smt_adt/sat/list0.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/sat/list0.smt2
rename to colibri2/tests/solve/smt_adt/sat/list0.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/sat/list1.smt2 b/colibri2/tests/solve/smt_adt/sat/list1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/sat/list1.smt2
rename to colibri2/tests/solve/smt_adt/sat/list1.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/sat/pair.smt2 b/colibri2/tests/solve/smt_adt/sat/pair.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/sat/pair.smt2
rename to colibri2/tests/solve/smt_adt/sat/pair.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/sat/tree1.smt2 b/colibri2/tests/solve/smt_adt/sat/tree1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/sat/tree1.smt2
rename to colibri2/tests/solve/smt_adt/sat/tree1.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/sat/tree2.smt2 b/colibri2/tests/solve/smt_adt/sat/tree2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/sat/tree2.smt2
rename to colibri2/tests/solve/smt_adt/sat/tree2.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/sat/tree3.smt2 b/colibri2/tests/solve/smt_adt/sat/tree3.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/sat/tree3.smt2
rename to colibri2/tests/solve/smt_adt/sat/tree3.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/dune b/colibri2/tests/solve/smt_adt/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/dune
rename to colibri2/tests/solve/smt_adt/unsat/dune
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/dune.inc b/colibri2/tests/solve/smt_adt/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/dune.inc
rename to colibri2/tests/solve/smt_adt/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/enum.smt2 b/colibri2/tests/solve/smt_adt/unsat/enum.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/enum.smt2
rename to colibri2/tests/solve/smt_adt/unsat/enum.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/enum2.smt2 b/colibri2/tests/solve/smt_adt/unsat/enum2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/enum2.smt2
rename to colibri2/tests/solve/smt_adt/unsat/enum2.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/list0.smt2 b/colibri2/tests/solve/smt_adt/unsat/list0.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/list0.smt2
rename to colibri2/tests/solve/smt_adt/unsat/list0.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/list1.smt2 b/colibri2/tests/solve/smt_adt/unsat/list1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/list1.smt2
rename to colibri2/tests/solve/smt_adt/unsat/list1.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/list2.smt2 b/colibri2/tests/solve/smt_adt/unsat/list2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/list2.smt2
rename to colibri2/tests/solve/smt_adt/unsat/list2.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/list3.smt2 b/colibri2/tests/solve/smt_adt/unsat/list3.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/list3.smt2
rename to colibri2/tests/solve/smt_adt/unsat/list3.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/list4.smt2 b/colibri2/tests/solve/smt_adt/unsat/list4.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/list4.smt2
rename to colibri2/tests/solve/smt_adt/unsat/list4.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/pair.smt2 b/colibri2/tests/solve/smt_adt/unsat/pair.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/pair.smt2
rename to colibri2/tests/solve/smt_adt/unsat/pair.smt2
diff --git a/src_colibri2/tests/solve/smt_adt/unsat/parlist0.psmt2 b/colibri2/tests/solve/smt_adt/unsat/parlist0.psmt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_adt/unsat/parlist0.psmt2
rename to colibri2/tests/solve/smt_adt/unsat/parlist0.psmt2
diff --git a/src_colibri2/tests/solve/smt_bv/sat/bigHex.smt2 b/colibri2/tests/solve/smt_bv/sat/bigHex.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_bv/sat/bigHex.smt2
rename to colibri2/tests/solve/smt_bv/sat/bigHex.smt2
diff --git a/src_colibri2/tests/solve/smt_bv/sat/dune b/colibri2/tests/solve/smt_bv/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_bv/sat/dune
rename to colibri2/tests/solve/smt_bv/sat/dune
diff --git a/src_colibri2/tests/solve/smt_bv/sat/dune.inc b/colibri2/tests/solve/smt_bv/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_bv/sat/dune.inc
rename to colibri2/tests/solve/smt_bv/sat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_bv/sat/unit_test.smt2 b/colibri2/tests/solve/smt_bv/sat/unit_test.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_bv/sat/unit_test.smt2
rename to colibri2/tests/solve/smt_bv/sat/unit_test.smt2
diff --git a/src_colibri2/tests/solve/smt_bv/unsat/dune b/colibri2/tests/solve/smt_bv/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_bv/unsat/dune
rename to colibri2/tests/solve/smt_bv/unsat/dune
diff --git a/src_colibri2/tests/solve/smt_bv/unsat/dune.inc b/colibri2/tests/solve/smt_bv/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_bv/unsat/dune.inc
rename to colibri2/tests/solve/smt_bv/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_fp/dune b/colibri2/tests/solve/smt_fp/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/dune
rename to colibri2/tests/solve/smt_fp/dune
diff --git a/src_colibri2/tests/solve/smt_fp/dune.inc b/colibri2/tests/solve/smt_fp/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/dune.inc
rename to colibri2/tests/solve/smt_fp/dune.inc
diff --git a/src_colibri2/tests/solve/smt_fp/rm_universal.smt2 b/colibri2/tests/solve/smt_fp/rm_universal.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/rm_universal.smt2
rename to colibri2/tests/solve/smt_fp/rm_universal.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/_head b/colibri2/tests/solve/smt_fp/sat/_head
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/_head
rename to colibri2/tests/solve/smt_fp/sat/_head
diff --git a/src_colibri2/tests/solve/smt_fp/sat/_tail b/colibri2/tests/solve/smt_fp/sat/_tail
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/_tail
rename to colibri2/tests/solve/smt_fp/sat/_tail
diff --git a/src_colibri2/tests/solve/smt_fp/sat/dune b/colibri2/tests/solve/smt_fp/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/dune
rename to colibri2/tests/solve/smt_fp/sat/dune
diff --git a/src_colibri2/tests/solve/smt_fp/sat/dune.inc b/colibri2/tests/solve/smt_fp/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/dune.inc
rename to colibri2/tests/solve/smt_fp/sat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_fp/sat/exists_eq_not_fp_eq.smt2 b/colibri2/tests/solve/smt_fp/sat/exists_eq_not_fp_eq.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/exists_eq_not_fp_eq.smt2
rename to colibri2/tests/solve/smt_fp/sat/exists_eq_not_fp_eq.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/inf_pos_neg_neq_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/inf_pos_neg_neq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/inf_pos_neg_neq_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/inf_pos_neg_neq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/infm_eq_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/infm_eq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/infm_eq_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/infm_eq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/infp_eq_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/infp_eq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/infp_eq_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/infp_eq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/nan_neq_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/nan_neq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/nan_neq_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/nan_neq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/recognize_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/recognize_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/recognize_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/recognize_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/recognize_rounding_mode.smt2 b/colibri2/tests/solve/smt_fp/sat/recognize_rounding_mode.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/recognize_rounding_mode.smt2
rename to colibri2/tests/solve/smt_fp/sat/recognize_rounding_mode.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/rm_instanciation.smt2 b/colibri2/tests/solve/smt_fp/sat/rm_instanciation.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/rm_instanciation.smt2
rename to colibri2/tests/solve/smt_fp/sat/rm_instanciation.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/simple_add_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/simple_add_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/simple_add_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/simple_add_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/simple_eq_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/simple_eq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/simple_eq_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/simple_eq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/simple_mul_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/simple_mul_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/simple_mul_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/simple_mul_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/to_fp_eq_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/to_fp_eq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/to_fp_eq_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/to_fp_eq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/zero_pos_neg_neq_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/zero_pos_neg_neq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/zero_pos_neg_neq_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/zero_pos_neg_neq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/zerom_eq_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/zerom_eq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/zerom_eq_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/zerom_eq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/sat/zerop_eq_float32.smt2 b/colibri2/tests/solve/smt_fp/sat/zerop_eq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/sat/zerop_eq_float32.smt2
rename to colibri2/tests/solve/smt_fp/sat/zerop_eq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/unsat/dune b/colibri2/tests/solve/smt_fp/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/unsat/dune
rename to colibri2/tests/solve/smt_fp/unsat/dune
diff --git a/src_colibri2/tests/solve/smt_fp/unsat/dune.inc b/colibri2/tests/solve/smt_fp/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/unsat/dune.inc
rename to colibri2/tests/solve/smt_fp/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_fp/unsat/eq_fp_eq.smt2 b/colibri2/tests/solve/smt_fp/unsat/eq_fp_eq.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/unsat/eq_fp_eq.smt2
rename to colibri2/tests/solve/smt_fp/unsat/eq_fp_eq.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/unsat/inf_pos_neg_neq.smt2 b/colibri2/tests/solve/smt_fp/unsat/inf_pos_neg_neq.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/unsat/inf_pos_neg_neq.smt2
rename to colibri2/tests/solve/smt_fp/unsat/inf_pos_neg_neq.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/unsat/nan_neq_float32.smt2 b/colibri2/tests/solve/smt_fp/unsat/nan_neq_float32.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/unsat/nan_neq_float32.smt2
rename to colibri2/tests/solve/smt_fp/unsat/nan_neq_float32.smt2
diff --git a/src_colibri2/tests/solve/smt_fp/unsat/propagate_le_ge.smt2 b/colibri2/tests/solve/smt_fp/unsat/propagate_le_ge.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_fp/unsat/propagate_le_ge.smt2
rename to colibri2/tests/solve/smt_fp/unsat/propagate_le_ge.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_CombiRepr_normalize.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_CombiRepr_normalize.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_CombiRepr_normalize.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_CombiRepr_normalize.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_conflict_add_disequality.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_conflict_add_disequality.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_conflict_add_disequality.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_conflict_add_disequality.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_conpoly.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_conpoly.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_conpoly.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_conpoly.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_decide_must_test_is_dis_equal.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_decide_must_test_is_dis_equal.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_decide_must_test_is_dis_equal.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_decide_must_test_is_dis_equal.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_init_always_merge_itself.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_init_always_merge_itself.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_init_always_merge_itself.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_init_always_merge_itself.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_init_and_propa_must_be_ordered.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_init_and_propa_must_be_ordered.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_init_and_propa_must_be_ordered.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_init_and_propa_must_be_ordered.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_merge_case1.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_merge_case1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_merge_case1.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_merge_case1.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_merge_case_4.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_merge_case_4.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_merge_case_4.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_merge_case_4.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_merge_case_4_bis.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_merge_case_4_bis.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_merge_case_4_bis.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_merge_case_4_bis.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_merge_itself_coef_of_repr_is_one.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_merge_itself_coef_of_repr_is_one.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_merge_itself_coef_of_repr_is_one.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_merge_itself_coef_of_repr_is_one.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_merge_itself_last_case.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_merge_itself_last_case.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_merge_itself_last_case.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_merge_itself_last_case.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_merge_itself_pivot_not_in_p12.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_merge_itself_pivot_not_in_p12.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_merge_itself_pivot_not_in_p12.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_merge_itself_pivot_not_in_p12.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_merge_must_use_find.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_merge_must_use_find.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_merge_must_use_find.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_merge_must_use_find.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_mult_explication.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_mult_explication.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_mult_explication.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_mult_explication.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_mult_not_linear_in_conflict.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_mult_not_linear_in_conflict.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_mult_not_linear_in_conflict.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_mult_not_linear_in_conflict.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_normalize_use_find_def.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_normalize_use_find_def.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_normalize_use_find_def.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_normalize_use_find_def.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_own_repr.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_own_repr.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_own_repr.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_own_repr.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_propacl.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_propacl.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_propacl.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_propacl.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_subst_and_conflict_add.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_subst_and_conflict_add.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_subst_and_conflict_add.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_subst_and_conflict_add.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/arith_zero_dom.smt2 b/colibri2/tests/solve/smt_lra/sat/arith_zero_dom.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/arith_zero_dom.smt2
rename to colibri2/tests/solve/smt_lra/sat/arith_zero_dom.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/attach_only_when_dom_present.smt2 b/colibri2/tests/solve/smt_lra/sat/attach_only_when_dom_present.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/attach_only_when_dom_present.smt2
rename to colibri2/tests/solve/smt_lra/sat/attach_only_when_dom_present.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/dune b/colibri2/tests/solve/smt_lra/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/dune
rename to colibri2/tests/solve/smt_lra/sat/dune
diff --git a/src_colibri2/tests/solve/smt_lra/sat/dune.inc b/colibri2/tests/solve/smt_lra/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/dune.inc
rename to colibri2/tests/solve/smt_lra/sat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_lra/sat/init_not_repr.smt2 b/colibri2/tests/solve/smt_lra/sat/init_not_repr.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/init_not_repr.smt2
rename to colibri2/tests/solve/smt_lra/sat/init_not_repr.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/le.smt2 b/colibri2/tests/solve/smt_lra/sat/le.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/le.smt2
rename to colibri2/tests/solve/smt_lra/sat/le.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/le2.smt2 b/colibri2/tests/solve/smt_lra/sat/le2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/le2.smt2
rename to colibri2/tests/solve/smt_lra/sat/le2.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/mul.smt2 b/colibri2/tests/solve/smt_lra/sat/mul.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/mul.smt2
rename to colibri2/tests/solve/smt_lra/sat/mul.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/sem_invariant_in_learnt_dec.smt2 b/colibri2/tests/solve/smt_lra/sat/sem_invariant_in_learnt_dec.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/sem_invariant_in_learnt_dec.smt2
rename to colibri2/tests/solve/smt_lra/sat/sem_invariant_in_learnt_dec.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/solver_add_pexp_cl.smt2 b/colibri2/tests/solve/smt_lra/sat/solver_add_pexp_cl.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/solver_add_pexp_cl.smt2
rename to colibri2/tests/solve/smt_lra/sat/solver_add_pexp_cl.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/solver_arith_homogeneous_dist_sign.smt2 b/colibri2/tests/solve/smt_lra/sat/solver_arith_homogeneous_dist_sign.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/solver_arith_homogeneous_dist_sign.smt2
rename to colibri2/tests/solve/smt_lra/sat/solver_arith_homogeneous_dist_sign.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/solver_merge_itself_repr_inside.smt2 b/colibri2/tests/solve/smt_lra/sat/solver_merge_itself_repr_inside.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/solver_merge_itself_repr_inside.smt2
rename to colibri2/tests/solve/smt_lra/sat/solver_merge_itself_repr_inside.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/solver_set_pending_merge_expsameexp.smt2 b/colibri2/tests/solve/smt_lra/sat/solver_set_pending_merge_expsameexp.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/solver_set_pending_merge_expsameexp.smt2
rename to colibri2/tests/solve/smt_lra/sat/solver_set_pending_merge_expsameexp.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/solver_subst_eventdom_find.smt2 b/colibri2/tests/solve/smt_lra/sat/solver_subst_eventdom_find.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/solver_subst_eventdom_find.smt2
rename to colibri2/tests/solve/smt_lra/sat/solver_subst_eventdom_find.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/to_real.smt2 b/colibri2/tests/solve/smt_lra/sat/to_real.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/to_real.smt2
rename to colibri2/tests/solve/smt_lra/sat/to_real.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/to_real2.smt2 b/colibri2/tests/solve/smt_lra/sat/to_real2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/to_real2.smt2
rename to colibri2/tests/solve/smt_lra/sat/to_real2.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/sat/zero_should_not_be_simplified.smt2 b/colibri2/tests/solve/smt_lra/sat/zero_should_not_be_simplified.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/sat/zero_should_not_be_simplified.smt2
rename to colibri2/tests/solve/smt_lra/sat/zero_should_not_be_simplified.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/arith_ExpMult_by_zero.smt2 b/colibri2/tests/solve/smt_lra/unsat/arith_ExpMult_by_zero.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/arith_ExpMult_by_zero.smt2
rename to colibri2/tests/solve/smt_lra/unsat/arith_ExpMult_by_zero.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/arith_merge_case2.smt2 b/colibri2/tests/solve/smt_lra/unsat/arith_merge_case2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/arith_merge_case2.smt2
rename to colibri2/tests/solve/smt_lra/unsat/arith_merge_case2.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/dune b/colibri2/tests/solve/smt_lra/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/dune
rename to colibri2/tests/solve/smt_lra/unsat/dune
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/dune.inc b/colibri2/tests/solve/smt_lra/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/dune.inc
rename to colibri2/tests/solve/smt_lra/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/le.smt2 b/colibri2/tests/solve/smt_lra/unsat/le.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/le.smt2
rename to colibri2/tests/solve/smt_lra/unsat/le.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/le2.smt2 b/colibri2/tests/solve/smt_lra/unsat/le2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/le2.smt2
rename to colibri2/tests/solve/smt_lra/unsat/le2.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/mul.smt2 b/colibri2/tests/solve/smt_lra/unsat/mul.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/mul.smt2
rename to colibri2/tests/solve/smt_lra/unsat/mul.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/repr_and_poly.smt2 b/colibri2/tests/solve/smt_lra/unsat/repr_and_poly.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/repr_and_poly.smt2
rename to colibri2/tests/solve/smt_lra/unsat/repr_and_poly.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/repr_fourier.smt2 b/colibri2/tests/solve/smt_lra/unsat/repr_fourier.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/repr_fourier.smt2
rename to colibri2/tests/solve/smt_lra/unsat/repr_fourier.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/solver_merge_itself_repr_empty.smt2 b/colibri2/tests/solve/smt_lra/unsat/solver_merge_itself_repr_empty.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/solver_merge_itself_repr_empty.smt2
rename to colibri2/tests/solve/smt_lra/unsat/solver_merge_itself_repr_empty.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/solver_set_sem_merge_sign.smt2 b/colibri2/tests/solve/smt_lra/unsat/solver_set_sem_merge_sign.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/solver_set_sem_merge_sign.smt2
rename to colibri2/tests/solve/smt_lra/unsat/solver_set_sem_merge_sign.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/to_real.smt2 b/colibri2/tests/solve/smt_lra/unsat/to_real.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/to_real.smt2
rename to colibri2/tests/solve/smt_lra/unsat/to_real.smt2
diff --git a/src_colibri2/tests/solve/smt_lra/unsat/to_real2.smt2 b/colibri2/tests/solve/smt_lra/unsat/to_real2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_lra/unsat/to_real2.smt2
rename to colibri2/tests/solve/smt_lra/unsat/to_real2.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/sat/ceil.smt2 b/colibri2/tests/solve/smt_nra/sat/ceil.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/ceil.smt2
rename to colibri2/tests/solve/smt_nra/sat/ceil.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/sat/div_pos.smt2 b/colibri2/tests/solve/smt_nra/sat/div_pos.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/div_pos.smt2
rename to colibri2/tests/solve/smt_nra/sat/div_pos.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/sat/div_pos_lt.smt2 b/colibri2/tests/solve/smt_nra/sat/div_pos_lt.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/div_pos_lt.smt2
rename to colibri2/tests/solve/smt_nra/sat/div_pos_lt.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/sat/dune b/colibri2/tests/solve/smt_nra/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/dune
rename to colibri2/tests/solve/smt_nra/sat/dune
diff --git a/src_colibri2/tests/solve/smt_nra/sat/dune.inc b/colibri2/tests/solve/smt_nra/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/dune.inc
rename to colibri2/tests/solve/smt_nra/sat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_nra/sat/mul_commut.smt2 b/colibri2/tests/solve/smt_nra/sat/mul_commut.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/mul_commut.smt2
rename to colibri2/tests/solve/smt_nra/sat/mul_commut.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/sat/mul_commut2.smt2 b/colibri2/tests/solve/smt_nra/sat/mul_commut2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/mul_commut2.smt2
rename to colibri2/tests/solve/smt_nra/sat/mul_commut2.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/sat/mul_pos.smt2 b/colibri2/tests/solve/smt_nra/sat/mul_pos.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/mul_pos.smt2
rename to colibri2/tests/solve/smt_nra/sat/mul_pos.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/sat/mul_pos_lt.smt2 b/colibri2/tests/solve/smt_nra/sat/mul_pos_lt.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/mul_pos_lt.smt2
rename to colibri2/tests/solve/smt_nra/sat/mul_pos_lt.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/sat/sqrt_tower.smt2 b/colibri2/tests/solve/smt_nra/sat/sqrt_tower.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/sat/sqrt_tower.smt2
rename to colibri2/tests/solve/smt_nra/sat/sqrt_tower.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/ceil.smt2 b/colibri2/tests/solve/smt_nra/unsat/ceil.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/ceil.smt2
rename to colibri2/tests/solve/smt_nra/unsat/ceil.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/div_pos.smt2 b/colibri2/tests/solve/smt_nra/unsat/div_pos.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/div_pos.smt2
rename to colibri2/tests/solve/smt_nra/unsat/div_pos.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/div_pos_lt.smt2 b/colibri2/tests/solve/smt_nra/unsat/div_pos_lt.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/div_pos_lt.smt2
rename to colibri2/tests/solve/smt_nra/unsat/div_pos_lt.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/div_pos_lt_to_real.smt2 b/colibri2/tests/solve/smt_nra/unsat/div_pos_lt_to_real.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/div_pos_lt_to_real.smt2
rename to colibri2/tests/solve/smt_nra/unsat/div_pos_lt_to_real.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/dune b/colibri2/tests/solve/smt_nra/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/dune
rename to colibri2/tests/solve/smt_nra/unsat/dune
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/dune.inc b/colibri2/tests/solve/smt_nra/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/dune.inc
rename to colibri2/tests/solve/smt_nra/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/floor.smt2 b/colibri2/tests/solve/smt_nra/unsat/floor.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/floor.smt2
rename to colibri2/tests/solve/smt_nra/unsat/floor.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/mul_commut.smt2 b/colibri2/tests/solve/smt_nra/unsat/mul_commut.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/mul_commut.smt2
rename to colibri2/tests/solve/smt_nra/unsat/mul_commut.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/mul_commut2.smt2 b/colibri2/tests/solve/smt_nra/unsat/mul_commut2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/mul_commut2.smt2
rename to colibri2/tests/solve/smt_nra/unsat/mul_commut2.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/mul_pos.smt2 b/colibri2/tests/solve/smt_nra/unsat/mul_pos.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/mul_pos.smt2
rename to colibri2/tests/solve/smt_nra/unsat/mul_pos.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/mul_pos_lt.smt2 b/colibri2/tests/solve/smt_nra/unsat/mul_pos_lt.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/mul_pos_lt.smt2
rename to colibri2/tests/solve/smt_nra/unsat/mul_pos_lt.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/mul_pos_zero_le.smt2 b/colibri2/tests/solve/smt_nra/unsat/mul_pos_zero_le.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/mul_pos_zero_le.smt2
rename to colibri2/tests/solve/smt_nra/unsat/mul_pos_zero_le.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/mult_hard.smt2 b/colibri2/tests/solve/smt_nra/unsat/mult_hard.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/mult_hard.smt2
rename to colibri2/tests/solve/smt_nra/unsat/mult_hard.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/mult_sqrt_hard.smt2 b/colibri2/tests/solve/smt_nra/unsat/mult_sqrt_hard.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/mult_sqrt_hard.smt2
rename to colibri2/tests/solve/smt_nra/unsat/mult_sqrt_hard.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/sqrt.smt2 b/colibri2/tests/solve/smt_nra/unsat/sqrt.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/sqrt.smt2
rename to colibri2/tests/solve/smt_nra/unsat/sqrt.smt2
diff --git a/src_colibri2/tests/solve/smt_nra/unsat/sqrt_compare.smt2 b/colibri2/tests/solve/smt_nra/unsat/sqrt_compare.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_nra/unsat/sqrt_compare.smt2
rename to colibri2/tests/solve/smt_nra/unsat/sqrt_compare.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/dune b/colibri2/tests/solve/smt_quant/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/dune
rename to colibri2/tests/solve/smt_quant/dune
diff --git a/src_colibri2/tests/solve/smt_quant/dune.inc b/colibri2/tests/solve/smt_quant/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/dune.inc
rename to colibri2/tests/solve/smt_quant/dune.inc
diff --git a/src_colibri2/tests/solve/smt_quant/forall0.smt2 b/colibri2/tests/solve/smt_quant/forall0.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/forall0.smt2
rename to colibri2/tests/solve/smt_quant/forall0.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/forall3.smt2 b/colibri2/tests/solve/smt_quant/forall3.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/forall3.smt2
rename to colibri2/tests/solve/smt_quant/forall3.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/forall4.smt2 b/colibri2/tests/solve/smt_quant/forall4.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/forall4.smt2
rename to colibri2/tests/solve/smt_quant/forall4.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/multitrigger.smt2 b/colibri2/tests/solve/smt_quant/multitrigger.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/multitrigger.smt2
rename to colibri2/tests/solve/smt_quant/multitrigger.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/sat/dune b/colibri2/tests/solve/smt_quant/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/sat/dune
rename to colibri2/tests/solve/smt_quant/sat/dune
diff --git a/src_colibri2/tests/solve/smt_quant/sat/dune.inc b/colibri2/tests/solve/smt_quant/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/sat/dune.inc
rename to colibri2/tests/solve/smt_quant/sat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_quant/sat/exists.smt2 b/colibri2/tests/solve/smt_quant/sat/exists.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/sat/exists.smt2
rename to colibri2/tests/solve/smt_quant/sat/exists.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/dune b/colibri2/tests/solve/smt_quant/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/dune
rename to colibri2/tests/solve/smt_quant/unsat/dune
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/dune.inc b/colibri2/tests/solve/smt_quant/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/dune.inc
rename to colibri2/tests/solve/smt_quant/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/exists.smt2 b/colibri2/tests/solve/smt_quant/unsat/exists.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/exists.smt2
rename to colibri2/tests/solve/smt_quant/unsat/exists.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/exists2.smt2 b/colibri2/tests/solve/smt_quant/unsat/exists2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/exists2.smt2
rename to colibri2/tests/solve/smt_quant/unsat/exists2.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/forall0.smt2 b/colibri2/tests/solve/smt_quant/unsat/forall0.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/forall0.smt2
rename to colibri2/tests/solve/smt_quant/unsat/forall0.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/forall1.smt2 b/colibri2/tests/solve/smt_quant/unsat/forall1.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/forall1.smt2
rename to colibri2/tests/solve/smt_quant/unsat/forall1.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/forall2.smt2 b/colibri2/tests/solve/smt_quant/unsat/forall2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/forall2.smt2
rename to colibri2/tests/solve/smt_quant/unsat/forall2.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/forall3.smt2 b/colibri2/tests/solve/smt_quant/unsat/forall3.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/forall3.smt2
rename to colibri2/tests/solve/smt_quant/unsat/forall3.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/forall4.smt2 b/colibri2/tests/solve/smt_quant/unsat/forall4.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/forall4.smt2
rename to colibri2/tests/solve/smt_quant/unsat/forall4.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/forall5.smt2 b/colibri2/tests/solve/smt_quant/unsat/forall5.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/forall5.smt2
rename to colibri2/tests/solve/smt_quant/unsat/forall5.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/forall6.smt2 b/colibri2/tests/solve/smt_quant/unsat/forall6.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/forall6.smt2
rename to colibri2/tests/solve/smt_quant/unsat/forall6.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/forall7.smt2 b/colibri2/tests/solve/smt_quant/unsat/forall7.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/forall7.smt2
rename to colibri2/tests/solve/smt_quant/unsat/forall7.smt2
diff --git a/src_colibri2/tests/solve/smt_quant/unsat/forall8.smt2 b/colibri2/tests/solve/smt_quant/unsat/forall8.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_quant/unsat/forall8.smt2
rename to colibri2/tests/solve/smt_quant/unsat/forall8.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/and_propa_bcp.dmt2 b/colibri2/tests/solve/smt_uf/sat/and_propa_bcp.dmt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/and_propa_bcp.dmt2
rename to colibri2/tests/solve/smt_uf/sat/and_propa_bcp.dmt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/bad_conflict.smt2 b/colibri2/tests/solve/smt_uf/sat/bad_conflict.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/bad_conflict.smt2
rename to colibri2/tests/solve/smt_uf/sat/bad_conflict.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/bcp_dont_like_duplicate.smt2 b/colibri2/tests/solve/smt_uf/sat/bcp_dont_like_duplicate.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/bcp_dont_like_duplicate.smt2
rename to colibri2/tests/solve/smt_uf/sat/bcp_dont_like_duplicate.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/bool_not_propa.smt2 b/colibri2/tests/solve/smt_uf/sat/bool_not_propa.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/bool_not_propa.smt2
rename to colibri2/tests/solve/smt_uf/sat/bool_not_propa.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/boolexpup.smt2 b/colibri2/tests/solve/smt_uf/sat/boolexpup.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/boolexpup.smt2
rename to colibri2/tests/solve/smt_uf/sat/boolexpup.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/clause_normalization.smt2 b/colibri2/tests/solve/smt_uf/sat/clause_normalization.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/clause_normalization.smt2
rename to colibri2/tests/solve/smt_uf/sat/clause_normalization.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/clmerge.smt2 b/colibri2/tests/solve/smt_uf/sat/clmerge.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/clmerge.smt2
rename to colibri2/tests/solve/smt_uf/sat/clmerge.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/conflict_complete_needed_cl.smt2 b/colibri2/tests/solve/smt_uf/sat/conflict_complete_needed_cl.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/conflict_complete_needed_cl.smt2
rename to colibri2/tests/solve/smt_uf/sat/conflict_complete_needed_cl.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/directdom_not.smt2 b/colibri2/tests/solve/smt_uf/sat/directdom_not.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/directdom_not.smt2
rename to colibri2/tests/solve/smt_uf/sat/directdom_not.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/dis_dom_before_first_age.smt2 b/colibri2/tests/solve/smt_uf/sat/dis_dom_before_first_age.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/dis_dom_before_first_age.smt2
rename to colibri2/tests/solve/smt_uf/sat/dis_dom_before_first_age.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/dom_merge_equality.smt2 b/colibri2/tests/solve/smt_uf/sat/dom_merge_equality.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/dom_merge_equality.smt2
rename to colibri2/tests/solve/smt_uf/sat/dom_merge_equality.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/dune b/colibri2/tests/solve/smt_uf/sat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/dune
rename to colibri2/tests/solve/smt_uf/sat/dune
diff --git a/src_colibri2/tests/solve/smt_uf/sat/dune.inc b/colibri2/tests/solve/smt_uf/sat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/dune.inc
rename to colibri2/tests/solve/smt_uf/sat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_uf/sat/equality.smt2 b/colibri2/tests/solve/smt_uf/sat/equality.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/equality.smt2
rename to colibri2/tests/solve/smt_uf/sat/equality.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/equality_condis.smt2 b/colibri2/tests/solve/smt_uf/sat/equality_condis.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/equality_condis.smt2
rename to colibri2/tests/solve/smt_uf/sat/equality_condis.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/equality_get_sem.smt2 b/colibri2/tests/solve/smt_uf/sat/equality_get_sem.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/equality_get_sem.smt2
rename to colibri2/tests/solve/smt_uf/sat/equality_get_sem.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/exp_sem_equality.smt2 b/colibri2/tests/solve/smt_uf/sat/exp_sem_equality.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/exp_sem_equality.smt2
rename to colibri2/tests/solve/smt_uf/sat/exp_sem_equality.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/explimit_cl_equality.smt2 b/colibri2/tests/solve/smt_uf/sat/explimit_cl_equality.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/explimit_cl_equality.smt2
rename to colibri2/tests/solve/smt_uf/sat/explimit_cl_equality.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/implication.smt2 b/colibri2/tests/solve/smt_uf/sat/implication.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/implication.smt2
rename to colibri2/tests/solve/smt_uf/sat/implication.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/intmap_set_disjoint.smt2 b/colibri2/tests/solve/smt_uf/sat/intmap_set_disjoint.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/intmap_set_disjoint.smt2
rename to colibri2/tests/solve/smt_uf/sat/intmap_set_disjoint.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/is_equal_not_propagated.smt2 b/colibri2/tests/solve/smt_uf/sat/is_equal_not_propagated.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/is_equal_not_propagated.smt2
rename to colibri2/tests/solve/smt_uf/sat/is_equal_not_propagated.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/ite_sem_bool.smt2 b/colibri2/tests/solve/smt_uf/sat/ite_sem_bool.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/ite_sem_bool.smt2
rename to colibri2/tests/solve/smt_uf/sat/ite_sem_bool.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/polyeq_genequality.smt2 b/colibri2/tests/solve/smt_uf/sat/polyeq_genequality.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/polyeq_genequality.smt2
rename to colibri2/tests/solve/smt_uf/sat/polyeq_genequality.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/sat/substupfalse_equality.smt2 b/colibri2/tests/solve/smt_uf/sat/substupfalse_equality.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/sat/substupfalse_equality.smt2
rename to colibri2/tests/solve/smt_uf/sat/substupfalse_equality.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/NEQ004_size4__decide_eq_us.smt2 b/colibri2/tests/solve/smt_uf/unsat/NEQ004_size4__decide_eq_us.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/NEQ004_size4__decide_eq_us.smt2
rename to colibri2/tests/solve/smt_uf/unsat/NEQ004_size4__decide_eq_us.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/deltaed0.smt2 b/colibri2/tests/solve/smt_uf/unsat/deltaed0.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/deltaed0.smt2
rename to colibri2/tests/solve/smt_uf/unsat/deltaed0.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/diff_to_value_for_bool.smt2 b/colibri2/tests/solve/smt_uf/unsat/diff_to_value_for_bool.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/diff_to_value_for_bool.smt2
rename to colibri2/tests/solve/smt_uf/unsat/diff_to_value_for_bool.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/diff_value_substupfalse.smt2 b/colibri2/tests/solve/smt_uf/unsat/diff_value_substupfalse.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/diff_value_substupfalse.smt2
rename to colibri2/tests/solve/smt_uf/unsat/diff_value_substupfalse.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/distinct.smt2 b/colibri2/tests/solve/smt_uf/unsat/distinct.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/distinct.smt2
rename to colibri2/tests/solve/smt_uf/unsat/distinct.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/dune b/colibri2/tests/solve/smt_uf/unsat/dune
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/dune
rename to colibri2/tests/solve/smt_uf/unsat/dune
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/dune.inc b/colibri2/tests/solve/smt_uf/unsat/dune.inc
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/dune.inc
rename to colibri2/tests/solve/smt_uf/unsat/dune.inc
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/eq_diamond2.smt2 b/colibri2/tests/solve/smt_uf/unsat/eq_diamond2.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/eq_diamond2.smt2
rename to colibri2/tests/solve/smt_uf/unsat/eq_diamond2.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/equality_norm_set.smt2 b/colibri2/tests/solve/smt_uf/unsat/equality_norm_set.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/equality_norm_set.smt2
rename to colibri2/tests/solve/smt_uf/unsat/equality_norm_set.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/fundef.smt2 b/colibri2/tests/solve/smt_uf/unsat/fundef.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/fundef.smt2
rename to colibri2/tests/solve/smt_uf/unsat/fundef.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/get_repr_at__instead_of__equal_CRepr.smt2 b/colibri2/tests/solve/smt_uf/unsat/get_repr_at__instead_of__equal_CRepr.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/get_repr_at__instead_of__equal_CRepr.smt2
rename to colibri2/tests/solve/smt_uf/unsat/get_repr_at__instead_of__equal_CRepr.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/many_distinct.smt2 b/colibri2/tests/solve/smt_uf/unsat/many_distinct.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/many_distinct.smt2
rename to colibri2/tests/solve/smt_uf/unsat/many_distinct.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/polyeq_genequality.smt2 b/colibri2/tests/solve/smt_uf/unsat/polyeq_genequality.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/polyeq_genequality.smt2
rename to colibri2/tests/solve/smt_uf/unsat/polyeq_genequality.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/polyeq_genequality_deltaed.smt2 b/colibri2/tests/solve/smt_uf/unsat/polyeq_genequality_deltaed.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/polyeq_genequality_deltaed.smt2
rename to colibri2/tests/solve/smt_uf/unsat/polyeq_genequality_deltaed.smt2
diff --git a/src_colibri2/tests/solve/smt_uf/unsat/xor.smt2 b/colibri2/tests/solve/smt_uf/unsat/xor.smt2
similarity index 100%
rename from src_colibri2/tests/solve/smt_uf/unsat/xor.smt2
rename to colibri2/tests/solve/smt_uf/unsat/xor.smt2
diff --git a/src_colibri2/tests/test.ml b/colibri2/tests/test.ml
similarity index 100%
rename from src_colibri2/tests/test.ml
rename to colibri2/tests/test.ml
diff --git a/src_colibri2/tests/test_learning/einstein-Goals-G1.psmt2 b/colibri2/tests/test_learning/einstein-Goals-G1.psmt2
similarity index 100%
rename from src_colibri2/tests/test_learning/einstein-Goals-G1.psmt2
rename to colibri2/tests/test_learning/einstein-Goals-G1.psmt2
diff --git a/src_colibri2/tests/test_learning/einstein-Goals-G2.psmt2 b/colibri2/tests/test_learning/einstein-Goals-G2.psmt2
similarity index 100%
rename from src_colibri2/tests/test_learning/einstein-Goals-G2.psmt2
rename to colibri2/tests/test_learning/einstein-Goals-G2.psmt2
diff --git a/src_colibri2/tests/test_learning/einstein-Goals-Wrong.psmt2 b/colibri2/tests/test_learning/einstein-Goals-Wrong.psmt2
similarity index 100%
rename from src_colibri2/tests/test_learning/einstein-Goals-Wrong.psmt2
rename to colibri2/tests/test_learning/einstein-Goals-Wrong.psmt2
diff --git a/src_colibri2/tests/test_learning/einstein.why b/colibri2/tests/test_learning/einstein.why
similarity index 100%
rename from src_colibri2/tests/test_learning/einstein.why
rename to colibri2/tests/test_learning/einstein.why
diff --git a/src_colibri2/tests/test_learning/einstein_simp-Goals-G1.psmt2 b/colibri2/tests/test_learning/einstein_simp-Goals-G1.psmt2
similarity index 100%
rename from src_colibri2/tests/test_learning/einstein_simp-Goals-G1.psmt2
rename to colibri2/tests/test_learning/einstein_simp-Goals-G1.psmt2
diff --git a/src_colibri2/tests/test_learning/einstein_simp-Goals-G2.psmt2 b/colibri2/tests/test_learning/einstein_simp-Goals-G2.psmt2
similarity index 100%
rename from src_colibri2/tests/test_learning/einstein_simp-Goals-G2.psmt2
rename to colibri2/tests/test_learning/einstein_simp-Goals-G2.psmt2
diff --git a/src_colibri2/tests/test_learning/einstein_simp.why b/colibri2/tests/test_learning/einstein_simp.why
similarity index 100%
rename from src_colibri2/tests/test_learning/einstein_simp.why
rename to colibri2/tests/test_learning/einstein_simp.why
diff --git a/src_colibri2/tests/tests.ml b/colibri2/tests/tests.ml
similarity index 100%
rename from src_colibri2/tests/tests.ml
rename to colibri2/tests/tests.ml
diff --git a/src_colibri2/tests/tests_LRA.ml b/colibri2/tests/tests_LRA.ml
similarity index 100%
rename from src_colibri2/tests/tests_LRA.ml
rename to colibri2/tests/tests_LRA.ml
diff --git a/src_colibri2/tests/tests_bool.ml b/colibri2/tests/tests_bool.ml
similarity index 100%
rename from src_colibri2/tests/tests_bool.ml
rename to colibri2/tests/tests_bool.ml
diff --git a/src_colibri2/tests/tests_fp.ml b/colibri2/tests/tests_fp.ml
similarity index 100%
rename from src_colibri2/tests/tests_fp.ml
rename to colibri2/tests/tests_fp.ml
diff --git a/src_colibri2/tests/tests_lib.ml b/colibri2/tests/tests_lib.ml
similarity index 100%
rename from src_colibri2/tests/tests_lib.ml
rename to colibri2/tests/tests_lib.ml
diff --git a/src_colibri2/tests/tests_uf.ml b/colibri2/tests/tests_uf.ml
similarity index 100%
rename from src_colibri2/tests/tests_uf.ml
rename to colibri2/tests/tests_uf.ml
diff --git a/src_colibri2/theories/ADT/.ocamlformat b/colibri2/theories/ADT/.ocamlformat
similarity index 100%
rename from src_colibri2/theories/ADT/.ocamlformat
rename to colibri2/theories/ADT/.ocamlformat
diff --git a/src_colibri2/theories/ADT/adt.ml b/colibri2/theories/ADT/adt.ml
similarity index 100%
rename from src_colibri2/theories/ADT/adt.ml
rename to colibri2/theories/ADT/adt.ml
diff --git a/src_colibri2/theories/ADT/adt.mli b/colibri2/theories/ADT/adt.mli
similarity index 100%
rename from src_colibri2/theories/ADT/adt.mli
rename to colibri2/theories/ADT/adt.mli
diff --git a/src_colibri2/theories/ADT/adt_dom.ml b/colibri2/theories/ADT/adt_dom.ml
similarity index 100%
rename from src_colibri2/theories/ADT/adt_dom.ml
rename to colibri2/theories/ADT/adt_dom.ml
diff --git a/src_colibri2/theories/ADT/adt_dom.mli b/colibri2/theories/ADT/adt_dom.mli
similarity index 100%
rename from src_colibri2/theories/ADT/adt_dom.mli
rename to colibri2/theories/ADT/adt_dom.mli
diff --git a/src_colibri2/theories/ADT/adt_value.ml b/colibri2/theories/ADT/adt_value.ml
similarity index 100%
rename from src_colibri2/theories/ADT/adt_value.ml
rename to colibri2/theories/ADT/adt_value.ml
diff --git a/src_colibri2/theories/ADT/adt_value.mli b/colibri2/theories/ADT/adt_value.mli
similarity index 100%
rename from src_colibri2/theories/ADT/adt_value.mli
rename to colibri2/theories/ADT/adt_value.mli
diff --git a/src_colibri2/theories/ADT/congruence.ml b/colibri2/theories/ADT/congruence.ml
similarity index 100%
rename from src_colibri2/theories/ADT/congruence.ml
rename to colibri2/theories/ADT/congruence.ml
diff --git a/src_colibri2/theories/ADT/congruence.mli b/colibri2/theories/ADT/congruence.mli
similarity index 100%
rename from src_colibri2/theories/ADT/congruence.mli
rename to colibri2/theories/ADT/congruence.mli
diff --git a/src_colibri2/theories/ADT/dune b/colibri2/theories/ADT/dune
similarity index 100%
rename from src_colibri2/theories/ADT/dune
rename to colibri2/theories/ADT/dune
diff --git a/src_colibri2/theories/FP/.ocamlformat b/colibri2/theories/FP/.ocamlformat
similarity index 100%
rename from src_colibri2/theories/FP/.ocamlformat
rename to colibri2/theories/FP/.ocamlformat
diff --git a/src_colibri2/theories/FP/dom_interval.ml b/colibri2/theories/FP/dom_interval.ml
similarity index 100%
rename from src_colibri2/theories/FP/dom_interval.ml
rename to colibri2/theories/FP/dom_interval.ml
diff --git a/src_colibri2/theories/FP/dune b/colibri2/theories/FP/dune
similarity index 100%
rename from src_colibri2/theories/FP/dune
rename to colibri2/theories/FP/dune
diff --git a/src_colibri2/theories/FP/fp.ml b/colibri2/theories/FP/fp.ml
similarity index 100%
rename from src_colibri2/theories/FP/fp.ml
rename to colibri2/theories/FP/fp.ml
diff --git a/src_colibri2/theories/FP/fp.mli b/colibri2/theories/FP/fp.mli
similarity index 100%
rename from src_colibri2/theories/FP/fp.mli
rename to colibri2/theories/FP/fp.mli
diff --git a/src_colibri2/theories/FP/fp_value.ml b/colibri2/theories/FP/fp_value.ml
similarity index 100%
rename from src_colibri2/theories/FP/fp_value.ml
rename to colibri2/theories/FP/fp_value.ml
diff --git a/src_colibri2/theories/FP/fp_value.mli b/colibri2/theories/FP/fp_value.mli
similarity index 100%
rename from src_colibri2/theories/FP/fp_value.mli
rename to colibri2/theories/FP/fp_value.mli
diff --git a/src_colibri2/theories/FP/rounding_mode.ml b/colibri2/theories/FP/rounding_mode.ml
similarity index 100%
rename from src_colibri2/theories/FP/rounding_mode.ml
rename to colibri2/theories/FP/rounding_mode.ml
diff --git a/src_colibri2/theories/FP/rounding_mode.mli b/colibri2/theories/FP/rounding_mode.mli
similarity index 100%
rename from src_colibri2/theories/FP/rounding_mode.mli
rename to colibri2/theories/FP/rounding_mode.mli
diff --git a/src_colibri2/theories/LRA/.ocamlformat b/colibri2/theories/LRA/.ocamlformat
similarity index 100%
rename from src_colibri2/theories/LRA/.ocamlformat
rename to colibri2/theories/LRA/.ocamlformat
diff --git a/src_colibri2/theories/LRA/LRA.ml b/colibri2/theories/LRA/LRA.ml
similarity index 100%
rename from src_colibri2/theories/LRA/LRA.ml
rename to colibri2/theories/LRA/LRA.ml
diff --git a/src_colibri2/theories/LRA/LRA.mli b/colibri2/theories/LRA/LRA.mli
similarity index 100%
rename from src_colibri2/theories/LRA/LRA.mli
rename to colibri2/theories/LRA/LRA.mli
diff --git a/src_colibri2/theories/LRA/LRA_build.ml b/colibri2/theories/LRA/LRA_build.ml
similarity index 100%
rename from src_colibri2/theories/LRA/LRA_build.ml
rename to colibri2/theories/LRA/LRA_build.ml
diff --git a/src_colibri2/theories/LRA/delta.ml b/colibri2/theories/LRA/delta.ml
similarity index 100%
rename from src_colibri2/theories/LRA/delta.ml
rename to colibri2/theories/LRA/delta.ml
diff --git a/src_colibri2/theories/LRA/delta.mli b/colibri2/theories/LRA/delta.mli
similarity index 100%
rename from src_colibri2/theories/LRA/delta.mli
rename to colibri2/theories/LRA/delta.mli
diff --git a/src_colibri2/theories/LRA/dom_interval.ml b/colibri2/theories/LRA/dom_interval.ml
similarity index 100%
rename from src_colibri2/theories/LRA/dom_interval.ml
rename to colibri2/theories/LRA/dom_interval.ml
diff --git a/src_colibri2/theories/LRA/dom_interval.mli b/colibri2/theories/LRA/dom_interval.mli
similarity index 100%
rename from src_colibri2/theories/LRA/dom_interval.mli
rename to colibri2/theories/LRA/dom_interval.mli
diff --git a/src_colibri2/theories/LRA/dom_polynome.ml b/colibri2/theories/LRA/dom_polynome.ml
similarity index 100%
rename from src_colibri2/theories/LRA/dom_polynome.ml
rename to colibri2/theories/LRA/dom_polynome.ml
diff --git a/src_colibri2/theories/LRA/dom_polynome.mli b/colibri2/theories/LRA/dom_polynome.mli
similarity index 100%
rename from src_colibri2/theories/LRA/dom_polynome.mli
rename to colibri2/theories/LRA/dom_polynome.mli
diff --git a/src_colibri2/theories/LRA/dom_product.ml b/colibri2/theories/LRA/dom_product.ml
similarity index 100%
rename from src_colibri2/theories/LRA/dom_product.ml
rename to colibri2/theories/LRA/dom_product.ml
diff --git a/src_colibri2/theories/LRA/dom_product.mli b/colibri2/theories/LRA/dom_product.mli
similarity index 100%
rename from src_colibri2/theories/LRA/dom_product.mli
rename to colibri2/theories/LRA/dom_product.mli
diff --git a/src_colibri2/theories/LRA/dune b/colibri2/theories/LRA/dune
similarity index 100%
rename from src_colibri2/theories/LRA/dune
rename to colibri2/theories/LRA/dune
diff --git a/src_colibri2/theories/LRA/fourier.ml b/colibri2/theories/LRA/fourier.ml
similarity index 100%
rename from src_colibri2/theories/LRA/fourier.ml
rename to colibri2/theories/LRA/fourier.ml
diff --git a/src_colibri2/theories/LRA/fourier.mli b/colibri2/theories/LRA/fourier.mli
similarity index 100%
rename from src_colibri2/theories/LRA/fourier.mli
rename to colibri2/theories/LRA/fourier.mli
diff --git a/src_colibri2/theories/LRA/mul.ml b/colibri2/theories/LRA/mul.ml
similarity index 100%
rename from src_colibri2/theories/LRA/mul.ml
rename to colibri2/theories/LRA/mul.ml
diff --git a/src_colibri2/theories/LRA/mul.mli b/colibri2/theories/LRA/mul.mli
similarity index 100%
rename from src_colibri2/theories/LRA/mul.mli
rename to colibri2/theories/LRA/mul.mli
diff --git a/src_colibri2/theories/LRA/pivot.ml b/colibri2/theories/LRA/pivot.ml
similarity index 100%
rename from src_colibri2/theories/LRA/pivot.ml
rename to colibri2/theories/LRA/pivot.ml
diff --git a/src_colibri2/theories/LRA/pivot.mli b/colibri2/theories/LRA/pivot.mli
similarity index 100%
rename from src_colibri2/theories/LRA/pivot.mli
rename to colibri2/theories/LRA/pivot.mli
diff --git a/src_colibri2/theories/LRA/polynome.ml b/colibri2/theories/LRA/polynome.ml
similarity index 100%
rename from src_colibri2/theories/LRA/polynome.ml
rename to colibri2/theories/LRA/polynome.ml
diff --git a/src_colibri2/theories/LRA/polynome.mli b/colibri2/theories/LRA/polynome.mli
similarity index 100%
rename from src_colibri2/theories/LRA/polynome.mli
rename to colibri2/theories/LRA/polynome.mli
diff --git a/src_colibri2/theories/LRA/product.ml b/colibri2/theories/LRA/product.ml
similarity index 100%
rename from src_colibri2/theories/LRA/product.ml
rename to colibri2/theories/LRA/product.ml
diff --git a/src_colibri2/theories/LRA/product.mli b/colibri2/theories/LRA/product.mli
similarity index 100%
rename from src_colibri2/theories/LRA/product.mli
rename to colibri2/theories/LRA/product.mli
diff --git a/src_colibri2/theories/LRA/realValue.ml b/colibri2/theories/LRA/realValue.ml
similarity index 100%
rename from src_colibri2/theories/LRA/realValue.ml
rename to colibri2/theories/LRA/realValue.ml
diff --git a/src_colibri2/theories/LRA/realValue.mli b/colibri2/theories/LRA/realValue.mli
similarity index 100%
rename from src_colibri2/theories/LRA/realValue.mli
rename to colibri2/theories/LRA/realValue.mli
diff --git a/src_colibri2/theories/LRA/sign_product.ml b/colibri2/theories/LRA/sign_product.ml
similarity index 100%
rename from src_colibri2/theories/LRA/sign_product.ml
rename to colibri2/theories/LRA/sign_product.ml
diff --git a/src_colibri2/theories/LRA/sign_product.mli b/colibri2/theories/LRA/sign_product.mli
similarity index 100%
rename from src_colibri2/theories/LRA/sign_product.mli
rename to colibri2/theories/LRA/sign_product.mli
diff --git a/src_colibri2/theories/LRA/simplex.ml b/colibri2/theories/LRA/simplex.ml
similarity index 100%
rename from src_colibri2/theories/LRA/simplex.ml
rename to colibri2/theories/LRA/simplex.ml
diff --git a/src_colibri2/theories/LRA/simplex.mli b/colibri2/theories/LRA/simplex.mli
similarity index 100%
rename from src_colibri2/theories/LRA/simplex.mli
rename to colibri2/theories/LRA/simplex.mli
diff --git a/src_colibri2/theories/LRA/stages/bound.ml b/colibri2/theories/LRA/stages/bound.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/bound.ml
rename to colibri2/theories/LRA/stages/bound.ml
diff --git a/src_colibri2/theories/LRA/stages/bound.mli b/colibri2/theories/LRA/stages/bound.mli
similarity index 100%
rename from src_colibri2/theories/LRA/stages/bound.mli
rename to colibri2/theories/LRA/stages/bound.mli
diff --git a/src_colibri2/theories/LRA/stages/compare_stage/compare_stage.ml b/colibri2/theories/LRA/stages/compare_stage/compare_stage.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/compare_stage/compare_stage.ml
rename to colibri2/theories/LRA/stages/compare_stage/compare_stage.ml
diff --git a/src_colibri2/theories/LRA/stages/compare_stage/dune b/colibri2/theories/LRA/stages/compare_stage/dune
similarity index 100%
rename from src_colibri2/theories/LRA/stages/compare_stage/dune
rename to colibri2/theories/LRA/stages/compare_stage/dune
diff --git a/src_colibri2/theories/LRA/stages/dune b/colibri2/theories/LRA/stages/dune
similarity index 100%
rename from src_colibri2/theories/LRA/stages/dune
rename to colibri2/theories/LRA/stages/dune
diff --git a/src_colibri2/theories/LRA/stages/interval_domain.mli b/colibri2/theories/LRA/stages/interval_domain.mli
similarity index 100%
rename from src_colibri2/theories/LRA/stages/interval_domain.mli
rename to colibri2/theories/LRA/stages/interval_domain.mli
diff --git a/src_colibri2/theories/LRA/stages/interval_sig.ml b/colibri2/theories/LRA/stages/interval_sig.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/interval_sig.ml
rename to colibri2/theories/LRA/stages/interval_sig.ml
diff --git a/src_colibri2/theories/LRA/stages/stage0/dune b/colibri2/theories/LRA/stages/stage0/dune
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage0/dune
rename to colibri2/theories/LRA/stages/stage0/dune
diff --git a/src_colibri2/theories/LRA/stages/stage0/impl/dune b/colibri2/theories/LRA/stages/stage0/impl/dune
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage0/impl/dune
rename to colibri2/theories/LRA/stages/stage0/impl/dune
diff --git a/src_colibri2/theories/LRA/stages/stage0/impl/interval_domain.ml b/colibri2/theories/LRA/stages/stage0/impl/interval_domain.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage0/impl/interval_domain.ml
rename to colibri2/theories/LRA/stages/stage0/impl/interval_domain.ml
diff --git a/src_colibri2/theories/LRA/stages/stage0/integer_sign_domain.ml b/colibri2/theories/LRA/stages/stage0/integer_sign_domain.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage0/integer_sign_domain.ml
rename to colibri2/theories/LRA/stages/stage0/integer_sign_domain.ml
diff --git a/src_colibri2/theories/LRA/stages/stage0/integer_sign_domain.mli b/colibri2/theories/LRA/stages/stage0/integer_sign_domain.mli
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage0/integer_sign_domain.mli
rename to colibri2/theories/LRA/stages/stage0/integer_sign_domain.mli
diff --git a/src_colibri2/theories/LRA/stages/stage0/sign_domain.ml b/colibri2/theories/LRA/stages/stage0/sign_domain.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage0/sign_domain.ml
rename to colibri2/theories/LRA/stages/stage0/sign_domain.ml
diff --git a/src_colibri2/theories/LRA/stages/stage0/sign_domain.mli b/colibri2/theories/LRA/stages/stage0/sign_domain.mli
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage0/sign_domain.mli
rename to colibri2/theories/LRA/stages/stage0/sign_domain.mli
diff --git a/src_colibri2/theories/LRA/stages/stage1/dune b/colibri2/theories/LRA/stages/stage1/dune
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage1/dune
rename to colibri2/theories/LRA/stages/stage1/dune
diff --git a/src_colibri2/theories/LRA/stages/stage1/impl/dune b/colibri2/theories/LRA/stages/stage1/impl/dune
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage1/impl/dune
rename to colibri2/theories/LRA/stages/stage1/impl/dune
diff --git a/src_colibri2/theories/LRA/stages/stage1/impl/interval_domain.ml b/colibri2/theories/LRA/stages/stage1/impl/interval_domain.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage1/impl/interval_domain.ml
rename to colibri2/theories/LRA/stages/stage1/impl/interval_domain.ml
diff --git a/src_colibri2/theories/LRA/stages/stage1/interval.ml b/colibri2/theories/LRA/stages/stage1/interval.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage1/interval.ml
rename to colibri2/theories/LRA/stages/stage1/interval.ml
diff --git a/src_colibri2/theories/LRA/stages/stage1/interval.mli b/colibri2/theories/LRA/stages/stage1/interval.mli
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage1/interval.mli
rename to colibri2/theories/LRA/stages/stage1/interval.mli
diff --git a/src_colibri2/theories/LRA/stages/stage2/dune b/colibri2/theories/LRA/stages/stage2/dune
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage2/dune
rename to colibri2/theories/LRA/stages/stage2/dune
diff --git a/src_colibri2/theories/LRA/stages/stage2/impl/dune b/colibri2/theories/LRA/stages/stage2/impl/dune
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage2/impl/dune
rename to colibri2/theories/LRA/stages/stage2/impl/dune
diff --git a/src_colibri2/theories/LRA/stages/stage2/impl/interval_domain.ml b/colibri2/theories/LRA/stages/stage2/impl/interval_domain.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage2/impl/interval_domain.ml
rename to colibri2/theories/LRA/stages/stage2/impl/interval_domain.ml
diff --git a/src_colibri2/theories/LRA/stages/stage2/union.ml b/colibri2/theories/LRA/stages/stage2/union.ml
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage2/union.ml
rename to colibri2/theories/LRA/stages/stage2/union.ml
diff --git a/src_colibri2/theories/LRA/stages/stage2/union.mli b/colibri2/theories/LRA/stages/stage2/union.mli
similarity index 100%
rename from src_colibri2/theories/LRA/stages/stage2/union.mli
rename to colibri2/theories/LRA/stages/stage2/union.mli
diff --git a/src_colibri2/theories/bool/.ocamlformat b/colibri2/theories/bool/.ocamlformat
similarity index 100%
rename from src_colibri2/theories/bool/.ocamlformat
rename to colibri2/theories/bool/.ocamlformat
diff --git a/src_colibri2/theories/bool/.ocamlformat-ignore b/colibri2/theories/bool/.ocamlformat-ignore
similarity index 100%
rename from src_colibri2/theories/bool/.ocamlformat-ignore
rename to colibri2/theories/bool/.ocamlformat-ignore
diff --git a/src_colibri2/theories/bool/boolean.ml b/colibri2/theories/bool/boolean.ml
similarity index 100%
rename from src_colibri2/theories/bool/boolean.ml
rename to colibri2/theories/bool/boolean.ml
diff --git a/src_colibri2/theories/bool/boolean.mli b/colibri2/theories/bool/boolean.mli
similarity index 100%
rename from src_colibri2/theories/bool/boolean.mli
rename to colibri2/theories/bool/boolean.mli
diff --git a/src_colibri2/theories/bool/dune b/colibri2/theories/bool/dune
similarity index 100%
rename from src_colibri2/theories/bool/dune
rename to colibri2/theories/bool/dune
diff --git a/src_colibri2/theories/bool/equality.ml b/colibri2/theories/bool/equality.ml
similarity index 100%
rename from src_colibri2/theories/bool/equality.ml
rename to colibri2/theories/bool/equality.ml
diff --git a/src_colibri2/theories/bool/equality.mli b/colibri2/theories/bool/equality.mli
similarity index 100%
rename from src_colibri2/theories/bool/equality.mli
rename to colibri2/theories/bool/equality.mli
diff --git a/src_colibri2/theories/quantifier/.ocamlformat b/colibri2/theories/quantifier/.ocamlformat
similarity index 100%
rename from src_colibri2/theories/quantifier/.ocamlformat
rename to colibri2/theories/quantifier/.ocamlformat
diff --git a/src_colibri2/theories/quantifier/F.ml b/colibri2/theories/quantifier/F.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/F.ml
rename to colibri2/theories/quantifier/F.ml
diff --git a/src_colibri2/theories/quantifier/FA.ml b/colibri2/theories/quantifier/FA.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/FA.ml
rename to colibri2/theories/quantifier/FA.ml
diff --git a/src_colibri2/theories/quantifier/F_Pos.ml b/colibri2/theories/quantifier/F_Pos.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/F_Pos.ml
rename to colibri2/theories/quantifier/F_Pos.ml
diff --git a/src_colibri2/theories/quantifier/F_Pos.mli b/colibri2/theories/quantifier/F_Pos.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/F_Pos.mli
rename to colibri2/theories/quantifier/F_Pos.mli
diff --git a/src_colibri2/theories/quantifier/InvertedPath.ml b/colibri2/theories/quantifier/InvertedPath.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/InvertedPath.ml
rename to colibri2/theories/quantifier/InvertedPath.ml
diff --git a/src_colibri2/theories/quantifier/InvertedPath.mli b/colibri2/theories/quantifier/InvertedPath.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/InvertedPath.mli
rename to colibri2/theories/quantifier/InvertedPath.mli
diff --git a/src_colibri2/theories/quantifier/PC.ml b/colibri2/theories/quantifier/PC.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/PC.ml
rename to colibri2/theories/quantifier/PC.ml
diff --git a/src_colibri2/theories/quantifier/PC.mli b/colibri2/theories/quantifier/PC.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/PC.mli
rename to colibri2/theories/quantifier/PC.mli
diff --git a/src_colibri2/theories/quantifier/PN.ml b/colibri2/theories/quantifier/PN.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/PN.ml
rename to colibri2/theories/quantifier/PN.ml
diff --git a/src_colibri2/theories/quantifier/PN.mli b/colibri2/theories/quantifier/PN.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/PN.mli
rename to colibri2/theories/quantifier/PN.mli
diff --git a/src_colibri2/theories/quantifier/PP.ml b/colibri2/theories/quantifier/PP.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/PP.ml
rename to colibri2/theories/quantifier/PP.ml
diff --git a/src_colibri2/theories/quantifier/PP.mli b/colibri2/theories/quantifier/PP.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/PP.mli
rename to colibri2/theories/quantifier/PP.mli
diff --git a/src_colibri2/theories/quantifier/PT.ml b/colibri2/theories/quantifier/PT.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/PT.ml
rename to colibri2/theories/quantifier/PT.ml
diff --git a/src_colibri2/theories/quantifier/PT.mli b/colibri2/theories/quantifier/PT.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/PT.mli
rename to colibri2/theories/quantifier/PT.mli
diff --git a/src_colibri2/theories/quantifier/SubstTrie.ml b/colibri2/theories/quantifier/SubstTrie.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/SubstTrie.ml
rename to colibri2/theories/quantifier/SubstTrie.ml
diff --git a/src_colibri2/theories/quantifier/SubstTrie.mli b/colibri2/theories/quantifier/SubstTrie.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/SubstTrie.mli
rename to colibri2/theories/quantifier/SubstTrie.mli
diff --git a/src_colibri2/theories/quantifier/callback.ml b/colibri2/theories/quantifier/callback.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/callback.ml
rename to colibri2/theories/quantifier/callback.ml
diff --git a/src_colibri2/theories/quantifier/callback.mli b/colibri2/theories/quantifier/callback.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/callback.mli
rename to colibri2/theories/quantifier/callback.mli
diff --git a/src_colibri2/theories/quantifier/common.ml b/colibri2/theories/quantifier/common.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/common.ml
rename to colibri2/theories/quantifier/common.ml
diff --git a/src_colibri2/theories/quantifier/congruence_closure.ml b/colibri2/theories/quantifier/congruence_closure.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/congruence_closure.ml
rename to colibri2/theories/quantifier/congruence_closure.ml
diff --git a/src_colibri2/theories/quantifier/congruence_closure.mli b/colibri2/theories/quantifier/congruence_closure.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/congruence_closure.mli
rename to colibri2/theories/quantifier/congruence_closure.mli
diff --git a/src_colibri2/theories/quantifier/definitions.ml b/colibri2/theories/quantifier/definitions.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/definitions.ml
rename to colibri2/theories/quantifier/definitions.ml
diff --git a/src_colibri2/theories/quantifier/definitions.mli b/colibri2/theories/quantifier/definitions.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/definitions.mli
rename to colibri2/theories/quantifier/definitions.mli
diff --git a/src_colibri2/theories/quantifier/dune b/colibri2/theories/quantifier/dune
similarity index 100%
rename from src_colibri2/theories/quantifier/dune
rename to colibri2/theories/quantifier/dune
diff --git a/src_colibri2/theories/quantifier/info.ml b/colibri2/theories/quantifier/info.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/info.ml
rename to colibri2/theories/quantifier/info.ml
diff --git a/src_colibri2/theories/quantifier/info.mli b/colibri2/theories/quantifier/info.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/info.mli
rename to colibri2/theories/quantifier/info.mli
diff --git a/src_colibri2/theories/quantifier/pattern.ml b/colibri2/theories/quantifier/pattern.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/pattern.ml
rename to colibri2/theories/quantifier/pattern.ml
diff --git a/src_colibri2/theories/quantifier/pattern.mli b/colibri2/theories/quantifier/pattern.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/pattern.mli
rename to colibri2/theories/quantifier/pattern.mli
diff --git a/src_colibri2/theories/quantifier/quantifier.ml b/colibri2/theories/quantifier/quantifier.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/quantifier.ml
rename to colibri2/theories/quantifier/quantifier.ml
diff --git a/src_colibri2/theories/quantifier/quantifier.mli b/colibri2/theories/quantifier/quantifier.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/quantifier.mli
rename to colibri2/theories/quantifier/quantifier.mli
diff --git a/src_colibri2/theories/quantifier/subst.ml b/colibri2/theories/quantifier/subst.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/subst.ml
rename to colibri2/theories/quantifier/subst.ml
diff --git a/src_colibri2/theories/quantifier/subst.mli b/colibri2/theories/quantifier/subst.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/subst.mli
rename to colibri2/theories/quantifier/subst.mli
diff --git a/src_colibri2/theories/quantifier/trigger.ml b/colibri2/theories/quantifier/trigger.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/trigger.ml
rename to colibri2/theories/quantifier/trigger.ml
diff --git a/src_colibri2/theories/quantifier/trigger.mli b/colibri2/theories/quantifier/trigger.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/trigger.mli
rename to colibri2/theories/quantifier/trigger.mli
diff --git a/src_colibri2/theories/quantifier/uninterp.ml b/colibri2/theories/quantifier/uninterp.ml
similarity index 100%
rename from src_colibri2/theories/quantifier/uninterp.ml
rename to colibri2/theories/quantifier/uninterp.ml
diff --git a/src_colibri2/theories/quantifier/uninterp.mli b/colibri2/theories/quantifier/uninterp.mli
similarity index 100%
rename from src_colibri2/theories/quantifier/uninterp.mli
rename to colibri2/theories/quantifier/uninterp.mli
diff --git a/src/bin/dolmen_to_colibrics.ml b/colibrics/bin/dolmen_to_colibrics.ml
similarity index 100%
rename from src/bin/dolmen_to_colibrics.ml
rename to colibrics/bin/dolmen_to_colibrics.ml
diff --git a/src/bin/dolmen_to_colibrics.mli b/colibrics/bin/dolmen_to_colibrics.mli
similarity index 100%
rename from src/bin/dolmen_to_colibrics.mli
rename to colibrics/bin/dolmen_to_colibrics.mli
diff --git a/src/bin/dune b/colibrics/bin/dune
similarity index 100%
rename from src/bin/dune
rename to colibrics/bin/dune
diff --git a/src/bin/errors.ml b/colibrics/bin/errors.ml
similarity index 100%
rename from src/bin/errors.ml
rename to colibrics/bin/errors.ml
diff --git a/src/bin/loop.ml b/colibrics/bin/loop.ml
similarity index 100%
rename from src/bin/loop.ml
rename to colibrics/bin/loop.ml
diff --git a/src/bin/main.ml b/colibrics/bin/main.ml
similarity index 100%
rename from src/bin/main.ml
rename to colibrics/bin/main.ml
diff --git a/src/bin/options.ml b/colibrics/bin/options.ml
similarity index 100%
rename from src/bin/options.ml
rename to colibrics/bin/options.ml
diff --git a/src/lib/all.mlw b/colibrics/lib/all.mlw
similarity index 100%
rename from src/lib/all.mlw
rename to colibrics/lib/all.mlw
diff --git a/src/lib/colibrics.ml b/colibrics/lib/colibrics.ml
similarity index 100%
rename from src/lib/colibrics.ml
rename to colibrics/lib/colibrics.ml
diff --git a/src/lib/colibrics.mli b/colibrics/lib/colibrics.mli
similarity index 100%
rename from src/lib/colibrics.mli
rename to colibrics/lib/colibrics.mli
diff --git a/src/lib/constraints/add.mlw b/colibrics/lib/constraints/add.mlw
similarity index 100%
rename from src/lib/constraints/add.mlw
rename to colibrics/lib/constraints/add.mlw
diff --git a/src/lib/constraints/boolPresent.mlw b/colibrics/lib/constraints/boolPresent.mlw
similarity index 100%
rename from src/lib/constraints/boolPresent.mlw
rename to colibrics/lib/constraints/boolPresent.mlw
diff --git a/src/lib/constraints/constraints.json b/colibrics/lib/constraints/constraints.json
similarity index 100%
rename from src/lib/constraints/constraints.json
rename to colibrics/lib/constraints/constraints.json
diff --git a/src/lib/constraints/cst.mlw b/colibrics/lib/constraints/cst.mlw
similarity index 100%
rename from src/lib/constraints/cst.mlw
rename to colibrics/lib/constraints/cst.mlw
diff --git a/src/lib/constraints/cst/why3session.xml b/colibrics/lib/constraints/cst/why3session.xml
similarity index 100%
rename from src/lib/constraints/cst/why3session.xml
rename to colibrics/lib/constraints/cst/why3session.xml
diff --git a/src/lib/constraints/dune b/colibrics/lib/constraints/dune
similarity index 100%
rename from src/lib/constraints/dune
rename to colibrics/lib/constraints/dune
diff --git a/src/lib/constraints/dune.generated b/colibrics/lib/constraints/dune.generated
similarity index 100%
rename from src/lib/constraints/dune.generated
rename to colibrics/lib/constraints/dune.generated
diff --git a/src/lib/constraints/dune.template.generated b/colibrics/lib/constraints/dune.template.generated
similarity index 100%
rename from src/lib/constraints/dune.template.generated
rename to colibrics/lib/constraints/dune.template.generated
diff --git a/src/lib/constraints/equiv.mlw b/colibrics/lib/constraints/equiv.mlw
similarity index 100%
rename from src/lib/constraints/equiv.mlw
rename to colibrics/lib/constraints/equiv.mlw
diff --git a/src/lib/constraints/generator/dune b/colibrics/lib/constraints/generator/dune
similarity index 100%
rename from src/lib/constraints/generator/dune
rename to colibrics/lib/constraints/generator/dune
diff --git a/src/lib/constraints/generator/generate_simple.ml b/colibrics/lib/constraints/generator/generate_simple.ml
similarity index 100%
rename from src/lib/constraints/generator/generate_simple.ml
rename to colibrics/lib/constraints/generator/generate_simple.ml
diff --git a/src/lib/constraints/isTrue.mlw b/colibrics/lib/constraints/isTrue.mlw
similarity index 100%
rename from src/lib/constraints/isTrue.mlw
rename to colibrics/lib/constraints/isTrue.mlw
diff --git a/src/lib/constraints/le.mlw b/colibrics/lib/constraints/le.mlw
similarity index 100%
rename from src/lib/constraints/le.mlw
rename to colibrics/lib/constraints/le.mlw
diff --git a/src/lib/constraints/not_.mlw b/colibrics/lib/constraints/not_.mlw
similarity index 100%
rename from src/lib/constraints/not_.mlw
rename to colibrics/lib/constraints/not_.mlw
diff --git a/src/lib/constraints/or.mlw b/colibrics/lib/constraints/or.mlw
similarity index 100%
rename from src/lib/constraints/or.mlw
rename to colibrics/lib/constraints/or.mlw
diff --git a/src/lib/constraints/simple.template.mlw b/colibrics/lib/constraints/simple.template.mlw
similarity index 100%
rename from src/lib/constraints/simple.template.mlw
rename to colibrics/lib/constraints/simple.template.mlw
diff --git a/src/lib/cp.drv b/colibrics/lib/cp.drv
similarity index 100%
rename from src/lib/cp.drv
rename to colibrics/lib/cp.drv
diff --git a/src/lib/cp.mlw b/colibrics/lib/cp.mlw
similarity index 100%
rename from src/lib/cp.mlw
rename to colibrics/lib/cp.mlw
diff --git a/src/lib/cp/why3session.xml b/colibrics/lib/cp/why3session.xml
similarity index 100%
rename from src/lib/cp/why3session.xml
rename to colibrics/lib/cp/why3session.xml
diff --git a/src/lib/cp/why3shapes.gz b/colibrics/lib/cp/why3shapes.gz
similarity index 100%
rename from src/lib/cp/why3shapes.gz
rename to colibrics/lib/cp/why3shapes.gz
diff --git a/src/lib/cp_c.drv b/colibrics/lib/cp_c.drv
similarity index 100%
rename from src/lib/cp_c.drv
rename to colibrics/lib/cp_c.drv
diff --git a/src/lib/dune b/colibrics/lib/dune
similarity index 100%
rename from src/lib/dune
rename to colibrics/lib/dune
diff --git a/src/lib/utils/bool.mlw b/colibrics/lib/utils/bool.mlw
similarity index 100%
rename from src/lib/utils/bool.mlw
rename to colibrics/lib/utils/bool.mlw
diff --git a/src/lib/utils/extstd.mlw b/colibrics/lib/utils/extstd.mlw
similarity index 100%
rename from src/lib/utils/extstd.mlw
rename to colibrics/lib/utils/extstd.mlw
diff --git a/src/lib/utils/tagtbl.mlw b/colibrics/lib/utils/tagtbl.mlw
similarity index 100%
rename from src/lib/utils/tagtbl.mlw
rename to colibrics/lib/utils/tagtbl.mlw
diff --git a/tests/Makefile b/colibrics/tests/Makefile
similarity index 100%
rename from tests/Makefile
rename to colibrics/tests/Makefile
diff --git a/tests/bool.t b/colibrics/tests/bool.t
similarity index 100%
rename from tests/bool.t
rename to colibrics/tests/bool.t
diff --git a/tests/dimacs/aim/aim-100-1_6-no-1.cnf b/colibrics/tests/dimacs/aim/aim-100-1_6-no-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-1_6-no-1.cnf
rename to colibrics/tests/dimacs/aim/aim-100-1_6-no-1.cnf
diff --git a/tests/dimacs/aim/aim-100-1_6-no-2.cnf b/colibrics/tests/dimacs/aim/aim-100-1_6-no-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-1_6-no-2.cnf
rename to colibrics/tests/dimacs/aim/aim-100-1_6-no-2.cnf
diff --git a/tests/dimacs/aim/aim-100-1_6-no-3.cnf b/colibrics/tests/dimacs/aim/aim-100-1_6-no-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-1_6-no-3.cnf
rename to colibrics/tests/dimacs/aim/aim-100-1_6-no-3.cnf
diff --git a/tests/dimacs/aim/aim-100-1_6-no-4.cnf b/colibrics/tests/dimacs/aim/aim-100-1_6-no-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-1_6-no-4.cnf
rename to colibrics/tests/dimacs/aim/aim-100-1_6-no-4.cnf
diff --git a/tests/dimacs/aim/aim-100-1_6-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-100-1_6-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-1_6-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-100-1_6-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-100-1_6-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-100-1_6-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-1_6-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-100-1_6-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-100-1_6-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-100-1_6-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-1_6-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-100-1_6-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-100-1_6-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-100-1_6-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-1_6-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-100-1_6-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-100-2_0-no-1.cnf b/colibrics/tests/dimacs/aim/aim-100-2_0-no-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-2_0-no-1.cnf
rename to colibrics/tests/dimacs/aim/aim-100-2_0-no-1.cnf
diff --git a/tests/dimacs/aim/aim-100-2_0-no-2.cnf b/colibrics/tests/dimacs/aim/aim-100-2_0-no-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-2_0-no-2.cnf
rename to colibrics/tests/dimacs/aim/aim-100-2_0-no-2.cnf
diff --git a/tests/dimacs/aim/aim-100-2_0-no-3.cnf b/colibrics/tests/dimacs/aim/aim-100-2_0-no-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-2_0-no-3.cnf
rename to colibrics/tests/dimacs/aim/aim-100-2_0-no-3.cnf
diff --git a/tests/dimacs/aim/aim-100-2_0-no-4.cnf b/colibrics/tests/dimacs/aim/aim-100-2_0-no-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-2_0-no-4.cnf
rename to colibrics/tests/dimacs/aim/aim-100-2_0-no-4.cnf
diff --git a/tests/dimacs/aim/aim-100-2_0-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-100-2_0-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-2_0-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-100-2_0-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-100-2_0-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-100-2_0-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-2_0-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-100-2_0-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-100-2_0-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-100-2_0-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-2_0-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-100-2_0-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-100-2_0-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-100-2_0-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-2_0-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-100-2_0-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-100-3_4-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-100-3_4-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-3_4-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-100-3_4-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-100-3_4-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-100-3_4-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-3_4-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-100-3_4-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-100-3_4-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-100-3_4-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-3_4-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-100-3_4-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-100-3_4-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-100-3_4-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-3_4-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-100-3_4-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-100-6_0-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-100-6_0-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-6_0-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-100-6_0-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-100-6_0-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-100-6_0-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-6_0-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-100-6_0-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-100-6_0-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-100-6_0-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-6_0-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-100-6_0-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-100-6_0-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-100-6_0-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-100-6_0-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-100-6_0-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-200-1_6-no-1.cnf b/colibrics/tests/dimacs/aim/aim-200-1_6-no-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-1_6-no-1.cnf
rename to colibrics/tests/dimacs/aim/aim-200-1_6-no-1.cnf
diff --git a/tests/dimacs/aim/aim-200-1_6-no-2.cnf b/colibrics/tests/dimacs/aim/aim-200-1_6-no-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-1_6-no-2.cnf
rename to colibrics/tests/dimacs/aim/aim-200-1_6-no-2.cnf
diff --git a/tests/dimacs/aim/aim-200-1_6-no-3.cnf b/colibrics/tests/dimacs/aim/aim-200-1_6-no-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-1_6-no-3.cnf
rename to colibrics/tests/dimacs/aim/aim-200-1_6-no-3.cnf
diff --git a/tests/dimacs/aim/aim-200-1_6-no-4.cnf b/colibrics/tests/dimacs/aim/aim-200-1_6-no-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-1_6-no-4.cnf
rename to colibrics/tests/dimacs/aim/aim-200-1_6-no-4.cnf
diff --git a/tests/dimacs/aim/aim-200-1_6-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-200-1_6-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-1_6-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-200-1_6-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-200-1_6-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-200-1_6-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-1_6-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-200-1_6-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-200-1_6-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-200-1_6-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-1_6-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-200-1_6-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-200-1_6-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-200-1_6-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-1_6-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-200-1_6-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-200-2_0-no-1.cnf b/colibrics/tests/dimacs/aim/aim-200-2_0-no-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-2_0-no-1.cnf
rename to colibrics/tests/dimacs/aim/aim-200-2_0-no-1.cnf
diff --git a/tests/dimacs/aim/aim-200-2_0-no-2.cnf b/colibrics/tests/dimacs/aim/aim-200-2_0-no-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-2_0-no-2.cnf
rename to colibrics/tests/dimacs/aim/aim-200-2_0-no-2.cnf
diff --git a/tests/dimacs/aim/aim-200-2_0-no-3.cnf b/colibrics/tests/dimacs/aim/aim-200-2_0-no-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-2_0-no-3.cnf
rename to colibrics/tests/dimacs/aim/aim-200-2_0-no-3.cnf
diff --git a/tests/dimacs/aim/aim-200-2_0-no-4.cnf b/colibrics/tests/dimacs/aim/aim-200-2_0-no-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-2_0-no-4.cnf
rename to colibrics/tests/dimacs/aim/aim-200-2_0-no-4.cnf
diff --git a/tests/dimacs/aim/aim-200-2_0-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-200-2_0-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-2_0-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-200-2_0-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-200-2_0-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-200-2_0-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-2_0-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-200-2_0-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-200-2_0-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-200-2_0-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-2_0-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-200-2_0-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-200-2_0-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-200-2_0-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-2_0-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-200-2_0-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-200-3_4-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-200-3_4-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-3_4-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-200-3_4-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-200-3_4-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-200-3_4-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-3_4-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-200-3_4-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-200-3_4-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-200-3_4-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-3_4-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-200-3_4-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-200-3_4-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-200-3_4-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-3_4-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-200-3_4-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-200-6_0-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-200-6_0-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-6_0-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-200-6_0-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-200-6_0-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-200-6_0-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-6_0-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-200-6_0-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-200-6_0-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-200-6_0-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-6_0-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-200-6_0-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-200-6_0-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-200-6_0-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-200-6_0-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-200-6_0-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-50-1_6-no-1.cnf b/colibrics/tests/dimacs/aim/aim-50-1_6-no-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-1_6-no-1.cnf
rename to colibrics/tests/dimacs/aim/aim-50-1_6-no-1.cnf
diff --git a/tests/dimacs/aim/aim-50-1_6-no-2.cnf b/colibrics/tests/dimacs/aim/aim-50-1_6-no-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-1_6-no-2.cnf
rename to colibrics/tests/dimacs/aim/aim-50-1_6-no-2.cnf
diff --git a/tests/dimacs/aim/aim-50-1_6-no-3.cnf b/colibrics/tests/dimacs/aim/aim-50-1_6-no-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-1_6-no-3.cnf
rename to colibrics/tests/dimacs/aim/aim-50-1_6-no-3.cnf
diff --git a/tests/dimacs/aim/aim-50-1_6-no-4.cnf b/colibrics/tests/dimacs/aim/aim-50-1_6-no-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-1_6-no-4.cnf
rename to colibrics/tests/dimacs/aim/aim-50-1_6-no-4.cnf
diff --git a/tests/dimacs/aim/aim-50-1_6-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-50-1_6-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-1_6-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-50-1_6-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-50-1_6-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-50-1_6-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-1_6-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-50-1_6-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-50-1_6-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-50-1_6-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-1_6-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-50-1_6-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-50-1_6-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-50-1_6-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-1_6-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-50-1_6-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-50-2_0-no-1.cnf b/colibrics/tests/dimacs/aim/aim-50-2_0-no-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-2_0-no-1.cnf
rename to colibrics/tests/dimacs/aim/aim-50-2_0-no-1.cnf
diff --git a/tests/dimacs/aim/aim-50-2_0-no-2.cnf b/colibrics/tests/dimacs/aim/aim-50-2_0-no-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-2_0-no-2.cnf
rename to colibrics/tests/dimacs/aim/aim-50-2_0-no-2.cnf
diff --git a/tests/dimacs/aim/aim-50-2_0-no-3.cnf b/colibrics/tests/dimacs/aim/aim-50-2_0-no-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-2_0-no-3.cnf
rename to colibrics/tests/dimacs/aim/aim-50-2_0-no-3.cnf
diff --git a/tests/dimacs/aim/aim-50-2_0-no-4.cnf b/colibrics/tests/dimacs/aim/aim-50-2_0-no-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-2_0-no-4.cnf
rename to colibrics/tests/dimacs/aim/aim-50-2_0-no-4.cnf
diff --git a/tests/dimacs/aim/aim-50-2_0-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-50-2_0-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-2_0-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-50-2_0-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-50-2_0-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-50-2_0-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-2_0-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-50-2_0-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-50-2_0-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-50-2_0-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-2_0-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-50-2_0-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-50-2_0-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-50-2_0-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-2_0-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-50-2_0-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-50-3_4-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-50-3_4-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-3_4-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-50-3_4-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-50-3_4-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-50-3_4-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-3_4-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-50-3_4-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-50-3_4-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-50-3_4-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-3_4-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-50-3_4-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-50-3_4-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-50-3_4-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-3_4-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-50-3_4-yes1-4.cnf
diff --git a/tests/dimacs/aim/aim-50-6_0-yes1-1.cnf b/colibrics/tests/dimacs/aim/aim-50-6_0-yes1-1.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-6_0-yes1-1.cnf
rename to colibrics/tests/dimacs/aim/aim-50-6_0-yes1-1.cnf
diff --git a/tests/dimacs/aim/aim-50-6_0-yes1-2.cnf b/colibrics/tests/dimacs/aim/aim-50-6_0-yes1-2.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-6_0-yes1-2.cnf
rename to colibrics/tests/dimacs/aim/aim-50-6_0-yes1-2.cnf
diff --git a/tests/dimacs/aim/aim-50-6_0-yes1-3.cnf b/colibrics/tests/dimacs/aim/aim-50-6_0-yes1-3.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-6_0-yes1-3.cnf
rename to colibrics/tests/dimacs/aim/aim-50-6_0-yes1-3.cnf
diff --git a/tests/dimacs/aim/aim-50-6_0-yes1-4.cnf b/colibrics/tests/dimacs/aim/aim-50-6_0-yes1-4.cnf
similarity index 100%
rename from tests/dimacs/aim/aim-50-6_0-yes1-4.cnf
rename to colibrics/tests/dimacs/aim/aim-50-6_0-yes1-4.cnf
diff --git a/tests/dune b/colibrics/tests/dune
similarity index 100%
rename from tests/dune
rename to colibrics/tests/dune
diff --git a/tests/parsing/Axioms/SYN000+0.ax b/colibrics/tests/parsing/Axioms/SYN000+0.ax
similarity index 100%
rename from tests/parsing/Axioms/SYN000+0.ax
rename to colibrics/tests/parsing/Axioms/SYN000+0.ax
diff --git a/tests/parsing/Axioms/SYN000-0.ax b/colibrics/tests/parsing/Axioms/SYN000-0.ax
similarity index 100%
rename from tests/parsing/Axioms/SYN000-0.ax
rename to colibrics/tests/parsing/Axioms/SYN000-0.ax
diff --git a/tests/parsing/Axioms/SYN000^0.ax b/colibrics/tests/parsing/Axioms/SYN000^0.ax
similarity index 100%
rename from tests/parsing/Axioms/SYN000^0.ax
rename to colibrics/tests/parsing/Axioms/SYN000^0.ax
diff --git a/tests/parsing/Axioms/SYN000_0.ax b/colibrics/tests/parsing/Axioms/SYN000_0.ax
similarity index 100%
rename from tests/parsing/Axioms/SYN000_0.ax
rename to colibrics/tests/parsing/Axioms/SYN000_0.ax
diff --git a/tests/parsing/Axioms/SYN001-0.ax b/colibrics/tests/parsing/Axioms/SYN001-0.ax
similarity index 100%
rename from tests/parsing/Axioms/SYN001-0.ax
rename to colibrics/tests/parsing/Axioms/SYN001-0.ax
diff --git a/tests/parsing/Axioms/SYN002+0.ax b/colibrics/tests/parsing/Axioms/SYN002+0.ax
similarity index 100%
rename from tests/parsing/Axioms/SYN002+0.ax
rename to colibrics/tests/parsing/Axioms/SYN002+0.ax
diff --git a/tests/parsing/Makefile b/colibrics/tests/parsing/Makefile
similarity index 100%
rename from tests/parsing/Makefile
rename to colibrics/tests/parsing/Makefile
diff --git a/tests/parsing/SYN000+1.p b/colibrics/tests/parsing/SYN000+1.p
similarity index 100%
rename from tests/parsing/SYN000+1.p
rename to colibrics/tests/parsing/SYN000+1.p
diff --git a/tests/parsing/SYN000+2.p b/colibrics/tests/parsing/SYN000+2.p
similarity index 100%
rename from tests/parsing/SYN000+2.p
rename to colibrics/tests/parsing/SYN000+2.p
diff --git a/tests/parsing/SYN000-1.p b/colibrics/tests/parsing/SYN000-1.p
similarity index 100%
rename from tests/parsing/SYN000-1.p
rename to colibrics/tests/parsing/SYN000-1.p
diff --git a/tests/parsing/SYN000-2.p b/colibrics/tests/parsing/SYN000-2.p
similarity index 100%
rename from tests/parsing/SYN000-2.p
rename to colibrics/tests/parsing/SYN000-2.p
diff --git a/tests/parsing/SYN000=2.p b/colibrics/tests/parsing/SYN000=2.p
similarity index 100%
rename from tests/parsing/SYN000=2.p
rename to colibrics/tests/parsing/SYN000=2.p
diff --git a/tests/parsing/SYN000^1.p b/colibrics/tests/parsing/SYN000^1.p
similarity index 100%
rename from tests/parsing/SYN000^1.p
rename to colibrics/tests/parsing/SYN000^1.p
diff --git a/tests/parsing/SYN000^2.p b/colibrics/tests/parsing/SYN000^2.p
similarity index 100%
rename from tests/parsing/SYN000^2.p
rename to colibrics/tests/parsing/SYN000^2.p
diff --git a/tests/parsing/SYN000_1.p b/colibrics/tests/parsing/SYN000_1.p
similarity index 100%
rename from tests/parsing/SYN000_1.p
rename to colibrics/tests/parsing/SYN000_1.p
diff --git a/tests/parsing/SYN000_2.p b/colibrics/tests/parsing/SYN000_2.p
similarity index 100%
rename from tests/parsing/SYN000_2.p
rename to colibrics/tests/parsing/SYN000_2.p
diff --git a/tests/queens.mlw b/colibrics/tests/queens.mlw
similarity index 100%
rename from tests/queens.mlw
rename to colibrics/tests/queens.mlw
diff --git a/src_common/colibri2.drv b/common/colibri2.drv
similarity index 100%
rename from src_common/colibri2.drv
rename to common/colibri2.drv
diff --git a/src_common/colibrilib.ml b/common/colibrilib.ml
similarity index 100%
rename from src_common/colibrilib.ml
rename to common/colibrilib.ml
diff --git a/src_common/common.drv b/common/common.drv
similarity index 100%
rename from src_common/common.drv
rename to common/common.drv
diff --git a/src_common/dune b/common/dune
similarity index 94%
rename from src_common/dune
rename to common/dune
index bf15786906ce443972807dddef155726de0deb37..694b0fb6d37e9c2637cd74933818ec532514d92d 100644
--- a/src_common/dune
+++ b/common/dune
@@ -80,7 +80,7 @@
 (rule
  (alias runproof)
  (deps
-  ../src_colibri2/bin/colibri2_stage0.exe
+  ../colibri2/bin/colibri2_stage0.exe
   (source_tree q)
   q.mlw
   why3.conf
@@ -91,7 +91,7 @@
 (rule
  (alias runproof)
  (deps
-  ../src_colibri2/bin/colibri2_stage0.exe
+  ../colibri2/bin/colibri2_stage0.exe
   (source_tree union)
   q.mlw
   interval.mlw
@@ -103,12 +103,12 @@
 
 (rule
  (target why3.conf)
- (deps ../src_colibri2/bin/colibri2_stage0.exe)
+ (deps ../colibri2/bin/colibri2_stage0.exe)
  (action
   (progn
    (run touch why3.conf)
    (system
-    "why3 config add-prover -C why3.conf Colibri2 $(realpath ../src_colibri2/bin/colibri2_stage0.exe)")))
+    "why3 config add-prover -C why3.conf Colibri2 $(realpath ../colibri2/bin/colibri2_stage0.exe)")))
  (mode
   (promote (until-clean))))
 
diff --git a/src_common/float_interval.mlw b/common/float_interval.mlw
similarity index 100%
rename from src_common/float_interval.mlw
rename to common/float_interval.mlw
diff --git a/src_common/float_interval/why3session.xml b/common/float_interval/why3session.xml
similarity index 100%
rename from src_common/float_interval/why3session.xml
rename to common/float_interval/why3session.xml
diff --git a/src_common/interval.mlw b/common/interval.mlw
similarity index 100%
rename from src_common/interval.mlw
rename to common/interval.mlw
diff --git a/src_common/interval/why3session.xml b/common/interval/why3session.xml
similarity index 100%
rename from src_common/interval/why3session.xml
rename to common/interval/why3session.xml
diff --git a/src_common/interval__Bound.ml b/common/interval__Bound.ml
similarity index 100%
rename from src_common/interval__Bound.ml
rename to common/interval__Bound.ml
diff --git a/src_common/interval__Convexe.ml b/common/interval__Convexe.ml
similarity index 100%
rename from src_common/interval__Convexe.ml
rename to common/interval__Convexe.ml
diff --git a/src_common/interval_with_divider.mlw b/common/interval_with_divider.mlw
similarity index 100%
rename from src_common/interval_with_divider.mlw
rename to common/interval_with_divider.mlw
diff --git a/src_common/interval_with_divider/why3session.xml b/common/interval_with_divider/why3session.xml
similarity index 100%
rename from src_common/interval_with_divider/why3session.xml
rename to common/interval_with_divider/why3session.xml
diff --git a/src_common/modulo.mlw b/common/modulo.mlw
similarity index 100%
rename from src_common/modulo.mlw
rename to common/modulo.mlw
diff --git a/src_common/modulo/why3session.xml b/common/modulo/why3session.xml
similarity index 100%
rename from src_common/modulo/why3session.xml
rename to common/modulo/why3session.xml
diff --git a/src_common/modulo__Divisible.ml b/common/modulo__Divisible.ml
similarity index 100%
rename from src_common/modulo__Divisible.ml
rename to common/modulo__Divisible.ml
diff --git a/src_common/ord.ml b/common/ord.ml
similarity index 100%
rename from src_common/ord.ml
rename to common/ord.ml
diff --git a/src_common/q.mlw b/common/q.mlw
similarity index 100%
rename from src_common/q.mlw
rename to common/q.mlw
diff --git a/src_common/q/why3session.xml b/common/q/why3session.xml
similarity index 100%
rename from src_common/q/why3session.xml
rename to common/q/why3session.xml
diff --git a/src_common/q__Q.ml b/common/q__Q.ml
similarity index 100%
rename from src_common/q__Q.ml
rename to common/q__Q.ml
diff --git a/src_common/q_extra.ml b/common/q_extra.ml
similarity index 100%
rename from src_common/q_extra.ml
rename to common/q_extra.ml
diff --git a/src_common/union.mlw b/common/union.mlw
similarity index 100%
rename from src_common/union.mlw
rename to common/union.mlw
diff --git a/src_common/union/why3session.xml b/common/union/why3session.xml
similarity index 100%
rename from src_common/union/why3session.xml
rename to common/union/why3session.xml
diff --git a/src_common/union__Union.ml b/common/union__Union.ml
similarity index 100%
rename from src_common/union__Union.ml
rename to common/union__Union.ml