diff --git a/src/core/colibri2_core.ml b/src_colibri2/core/colibri2_core.ml
similarity index 100%
rename from src/core/colibri2_core.ml
rename to src_colibri2/core/colibri2_core.ml
diff --git a/src/core/demon.ml b/src_colibri2/core/demon.ml
similarity index 100%
rename from src/core/demon.ml
rename to src_colibri2/core/demon.ml
diff --git a/src/core/demon.mli b/src_colibri2/core/demon.mli
similarity index 100%
rename from src/core/demon.mli
rename to src_colibri2/core/demon.mli
diff --git a/src/core/dune b/src_colibri2/core/dune
similarity index 100%
rename from src/core/dune
rename to src_colibri2/core/dune
diff --git a/src/core/egraph.ml b/src_colibri2/core/egraph.ml
similarity index 100%
rename from src/core/egraph.ml
rename to src_colibri2/core/egraph.ml
diff --git a/src/core/egraph.mli b/src_colibri2/core/egraph.mli
similarity index 100%
rename from src/core/egraph.mli
rename to src_colibri2/core/egraph.mli
diff --git a/src/core/env.ml b/src_colibri2/core/env.ml
similarity index 100%
rename from src/core/env.ml
rename to src_colibri2/core/env.ml
diff --git a/src/core/env.mli b/src_colibri2/core/env.mli
similarity index 100%
rename from src/core/env.mli
rename to src_colibri2/core/env.mli
diff --git a/src/core/events.ml b/src_colibri2/core/events.ml
similarity index 100%
rename from src/core/events.ml
rename to src_colibri2/core/events.ml
diff --git a/src/core/events.mli b/src_colibri2/core/events.mli
similarity index 100%
rename from src/core/events.mli
rename to src_colibri2/core/events.mli
diff --git a/src/core/interp.ml b/src_colibri2/core/interp.ml
similarity index 100%
rename from src/core/interp.ml
rename to src_colibri2/core/interp.ml
diff --git a/src/core/interp.mli b/src_colibri2/core/interp.mli
similarity index 100%
rename from src/core/interp.mli
rename to src_colibri2/core/interp.mli
diff --git a/src/core/structures/domKind.ml b/src_colibri2/core/structures/domKind.ml
similarity index 100%
rename from src/core/structures/domKind.ml
rename to src_colibri2/core/structures/domKind.ml
diff --git a/src/core/structures/domKind.mli b/src_colibri2/core/structures/domKind.mli
similarity index 100%
rename from src/core/structures/domKind.mli
rename to src_colibri2/core/structures/domKind.mli
diff --git a/src/core/structures/dune b/src_colibri2/core/structures/dune
similarity index 100%
rename from src/core/structures/dune
rename to src_colibri2/core/structures/dune
diff --git a/src/core/structures/expr.ml b/src_colibri2/core/structures/expr.ml
similarity index 100%
rename from src/core/structures/expr.ml
rename to src_colibri2/core/structures/expr.ml
diff --git a/src/core/structures/nodes.ml b/src_colibri2/core/structures/nodes.ml
similarity index 100%
rename from src/core/structures/nodes.ml
rename to src_colibri2/core/structures/nodes.ml
diff --git a/src/core/structures/nodes.mli b/src_colibri2/core/structures/nodes.mli
similarity index 100%
rename from src/core/structures/nodes.mli
rename to src_colibri2/core/structures/nodes.mli
diff --git a/src/core/structures/term.ml b/src_colibri2/core/structures/term.ml
similarity index 100%
rename from src/core/structures/term.ml
rename to src_colibri2/core/structures/term.ml
diff --git a/src/core/structures/ty.ml b/src_colibri2/core/structures/ty.ml
similarity index 100%
rename from src/core/structures/ty.ml
rename to src_colibri2/core/structures/ty.ml
diff --git a/src/core/structures/ty.mli b/src_colibri2/core/structures/ty.mli
similarity index 100%
rename from src/core/structures/ty.mli
rename to src_colibri2/core/structures/ty.mli
diff --git a/src/core/synTerm.ml b/src_colibri2/core/synTerm.ml
similarity index 100%
rename from src/core/synTerm.ml
rename to src_colibri2/core/synTerm.ml
diff --git a/src/core/synTerm.mli b/src_colibri2/core/synTerm.mli
similarity index 100%
rename from src/core/synTerm.mli
rename to src_colibri2/core/synTerm.mli
diff --git a/src/core/theory.ml b/src_colibri2/core/theory.ml
similarity index 100%
rename from src/core/theory.ml
rename to src_colibri2/core/theory.ml
diff --git a/src/dune b/src_colibri2/dune
similarity index 100%
rename from src/dune
rename to src_colibri2/dune
diff --git a/src/popop_lib/IArray.ml b/src_colibri2/popop_lib/IArray.ml
similarity index 100%
rename from src/popop_lib/IArray.ml
rename to src_colibri2/popop_lib/IArray.ml
diff --git a/src/popop_lib/IArray.mli b/src_colibri2/popop_lib/IArray.mli
similarity index 100%
rename from src/popop_lib/IArray.mli
rename to src_colibri2/popop_lib/IArray.mli
diff --git a/src/popop_lib/bag.ml b/src_colibri2/popop_lib/bag.ml
similarity index 100%
rename from src/popop_lib/bag.ml
rename to src_colibri2/popop_lib/bag.ml
diff --git a/src/popop_lib/bag.mli b/src_colibri2/popop_lib/bag.mli
similarity index 100%
rename from src/popop_lib/bag.mli
rename to src_colibri2/popop_lib/bag.mli
diff --git a/src/popop_lib/cmdline.ml b/src_colibri2/popop_lib/cmdline.ml
similarity index 100%
rename from src/popop_lib/cmdline.ml
rename to src_colibri2/popop_lib/cmdline.ml
diff --git a/src/popop_lib/cmdline.mli b/src_colibri2/popop_lib/cmdline.mli
similarity index 100%
rename from src/popop_lib/cmdline.mli
rename to src_colibri2/popop_lib/cmdline.mli
diff --git a/src/popop_lib/debug.ml b/src_colibri2/popop_lib/debug.ml
similarity index 100%
rename from src/popop_lib/debug.ml
rename to src_colibri2/popop_lib/debug.ml
diff --git a/src/popop_lib/debug.mli b/src_colibri2/popop_lib/debug.mli
similarity index 100%
rename from src/popop_lib/debug.mli
rename to src_colibri2/popop_lib/debug.mli
diff --git a/src/popop_lib/dune b/src_colibri2/popop_lib/dune
similarity index 100%
rename from src/popop_lib/dune
rename to src_colibri2/popop_lib/dune
diff --git a/src/popop_lib/enum.ml b/src_colibri2/popop_lib/enum.ml
similarity index 100%
rename from src/popop_lib/enum.ml
rename to src_colibri2/popop_lib/enum.ml
diff --git a/src/popop_lib/enum.mli b/src_colibri2/popop_lib/enum.mli
similarity index 100%
rename from src/popop_lib/enum.mli
rename to src_colibri2/popop_lib/enum.mli
diff --git a/src/popop_lib/exn_printer.ml b/src_colibri2/popop_lib/exn_printer.ml
similarity index 100%
rename from src/popop_lib/exn_printer.ml
rename to src_colibri2/popop_lib/exn_printer.ml
diff --git a/src/popop_lib/exn_printer.mli b/src_colibri2/popop_lib/exn_printer.mli
similarity index 100%
rename from src/popop_lib/exn_printer.mli
rename to src_colibri2/popop_lib/exn_printer.mli
diff --git a/src/popop_lib/exthtbl.ml b/src_colibri2/popop_lib/exthtbl.ml
similarity index 100%
rename from src/popop_lib/exthtbl.ml
rename to src_colibri2/popop_lib/exthtbl.ml
diff --git a/src/popop_lib/exthtbl.mli b/src_colibri2/popop_lib/exthtbl.mli
similarity index 100%
rename from src/popop_lib/exthtbl.mli
rename to src_colibri2/popop_lib/exthtbl.mli
diff --git a/src/popop_lib/extmap.ml b/src_colibri2/popop_lib/extmap.ml
similarity index 100%
rename from src/popop_lib/extmap.ml
rename to src_colibri2/popop_lib/extmap.ml
diff --git a/src/popop_lib/extmap.mli b/src_colibri2/popop_lib/extmap.mli
similarity index 100%
rename from src/popop_lib/extmap.mli
rename to src_colibri2/popop_lib/extmap.mli
diff --git a/src/popop_lib/extset.ml b/src_colibri2/popop_lib/extset.ml
similarity index 100%
rename from src/popop_lib/extset.ml
rename to src_colibri2/popop_lib/extset.ml
diff --git a/src/popop_lib/extset.mli b/src_colibri2/popop_lib/extset.mli
similarity index 100%
rename from src/popop_lib/extset.mli
rename to src_colibri2/popop_lib/extset.mli
diff --git a/src/popop_lib/hashcons.ml b/src_colibri2/popop_lib/hashcons.ml
similarity index 100%
rename from src/popop_lib/hashcons.ml
rename to src_colibri2/popop_lib/hashcons.ml
diff --git a/src/popop_lib/hashcons.mli b/src_colibri2/popop_lib/hashcons.mli
similarity index 100%
rename from src/popop_lib/hashcons.mli
rename to src_colibri2/popop_lib/hashcons.mli
diff --git a/src/popop_lib/intmap.ml b/src_colibri2/popop_lib/intmap.ml
similarity index 100%
rename from src/popop_lib/intmap.ml
rename to src_colibri2/popop_lib/intmap.ml
diff --git a/src/popop_lib/intmap.mli b/src_colibri2/popop_lib/intmap.mli
similarity index 100%
rename from src/popop_lib/intmap.mli
rename to src_colibri2/popop_lib/intmap.mli
diff --git a/src/popop_lib/intmap_hetero.ml b/src_colibri2/popop_lib/intmap_hetero.ml
similarity index 100%
rename from src/popop_lib/intmap_hetero.ml
rename to src_colibri2/popop_lib/intmap_hetero.ml
diff --git a/src/popop_lib/intmap_hetero.mli b/src_colibri2/popop_lib/intmap_hetero.mli
similarity index 100%
rename from src/popop_lib/intmap_hetero.mli
rename to src_colibri2/popop_lib/intmap_hetero.mli
diff --git a/src/popop_lib/leftistheap.ml b/src_colibri2/popop_lib/leftistheap.ml
similarity index 100%
rename from src/popop_lib/leftistheap.ml
rename to src_colibri2/popop_lib/leftistheap.ml
diff --git a/src/popop_lib/leftistheap.mli b/src_colibri2/popop_lib/leftistheap.mli
similarity index 100%
rename from src/popop_lib/leftistheap.mli
rename to src_colibri2/popop_lib/leftistheap.mli
diff --git a/src/popop_lib/lists.ml b/src_colibri2/popop_lib/lists.ml
similarity index 100%
rename from src/popop_lib/lists.ml
rename to src_colibri2/popop_lib/lists.ml
diff --git a/src/popop_lib/lists.mli b/src_colibri2/popop_lib/lists.mli
similarity index 100%
rename from src/popop_lib/lists.mli
rename to src_colibri2/popop_lib/lists.mli
diff --git a/src/popop_lib/loc.ml b/src_colibri2/popop_lib/loc.ml
similarity index 100%
rename from src/popop_lib/loc.ml
rename to src_colibri2/popop_lib/loc.ml
diff --git a/src/popop_lib/loc.mli b/src_colibri2/popop_lib/loc.mli
similarity index 100%
rename from src/popop_lib/loc.mli
rename to src_colibri2/popop_lib/loc.mli
diff --git a/src/popop_lib/map_intf.ml b/src_colibri2/popop_lib/map_intf.ml
similarity index 100%
rename from src/popop_lib/map_intf.ml
rename to src_colibri2/popop_lib/map_intf.ml
diff --git a/src/popop_lib/number.ml b/src_colibri2/popop_lib/number.ml
similarity index 100%
rename from src/popop_lib/number.ml
rename to src_colibri2/popop_lib/number.ml
diff --git a/src/popop_lib/number.mli b/src_colibri2/popop_lib/number.mli
similarity index 100%
rename from src/popop_lib/number.mli
rename to src_colibri2/popop_lib/number.mli
diff --git a/src/popop_lib/opt.ml b/src_colibri2/popop_lib/opt.ml
similarity index 100%
rename from src/popop_lib/opt.ml
rename to src_colibri2/popop_lib/opt.ml
diff --git a/src/popop_lib/opt.mli b/src_colibri2/popop_lib/opt.mli
similarity index 100%
rename from src/popop_lib/opt.mli
rename to src_colibri2/popop_lib/opt.mli
diff --git a/src/popop_lib/plugin.ml b/src_colibri2/popop_lib/plugin.ml
similarity index 100%
rename from src/popop_lib/plugin.ml
rename to src_colibri2/popop_lib/plugin.ml
diff --git a/src/popop_lib/plugin.mli b/src_colibri2/popop_lib/plugin.mli
similarity index 100%
rename from src/popop_lib/plugin.mli
rename to src_colibri2/popop_lib/plugin.mli
diff --git a/src/popop_lib/popop_stdlib.ml b/src_colibri2/popop_lib/popop_stdlib.ml
similarity index 100%
rename from src/popop_lib/popop_stdlib.ml
rename to src_colibri2/popop_lib/popop_stdlib.ml
diff --git a/src/popop_lib/popop_stdlib.mli b/src_colibri2/popop_lib/popop_stdlib.mli
similarity index 100%
rename from src/popop_lib/popop_stdlib.mli
rename to src_colibri2/popop_lib/popop_stdlib.mli
diff --git a/src/popop_lib/pp.ml b/src_colibri2/popop_lib/pp.ml
similarity index 100%
rename from src/popop_lib/pp.ml
rename to src_colibri2/popop_lib/pp.ml
diff --git a/src/popop_lib/pp.mli b/src_colibri2/popop_lib/pp.mli
similarity index 100%
rename from src/popop_lib/pp.mli
rename to src_colibri2/popop_lib/pp.mli
diff --git a/src/popop_lib/print_tree.ml b/src_colibri2/popop_lib/print_tree.ml
similarity index 100%
rename from src/popop_lib/print_tree.ml
rename to src_colibri2/popop_lib/print_tree.ml
diff --git a/src/popop_lib/print_tree.mli b/src_colibri2/popop_lib/print_tree.mli
similarity index 100%
rename from src/popop_lib/print_tree.mli
rename to src_colibri2/popop_lib/print_tree.mli
diff --git a/src/popop_lib/refo.ml b/src_colibri2/popop_lib/refo.ml
similarity index 100%
rename from src/popop_lib/refo.ml
rename to src_colibri2/popop_lib/refo.ml
diff --git a/src/popop_lib/refo.mli b/src_colibri2/popop_lib/refo.mli
similarity index 100%
rename from src/popop_lib/refo.mli
rename to src_colibri2/popop_lib/refo.mli
diff --git a/src/popop_lib/simple_vector.ml b/src_colibri2/popop_lib/simple_vector.ml
similarity index 100%
rename from src/popop_lib/simple_vector.ml
rename to src_colibri2/popop_lib/simple_vector.ml
diff --git a/src/popop_lib/simple_vector.mli b/src_colibri2/popop_lib/simple_vector.mli
similarity index 100%
rename from src/popop_lib/simple_vector.mli
rename to src_colibri2/popop_lib/simple_vector.mli
diff --git a/src/popop_lib/strings.ml b/src_colibri2/popop_lib/strings.ml
similarity index 100%
rename from src/popop_lib/strings.ml
rename to src_colibri2/popop_lib/strings.ml
diff --git a/src/popop_lib/strings.mli b/src_colibri2/popop_lib/strings.mli
similarity index 100%
rename from src/popop_lib/strings.mli
rename to src_colibri2/popop_lib/strings.mli
diff --git a/src/popop_lib/sysutil.ml b/src_colibri2/popop_lib/sysutil.ml
similarity index 100%
rename from src/popop_lib/sysutil.ml
rename to src_colibri2/popop_lib/sysutil.ml
diff --git a/src/popop_lib/sysutil.mli b/src_colibri2/popop_lib/sysutil.mli
similarity index 100%
rename from src/popop_lib/sysutil.mli
rename to src_colibri2/popop_lib/sysutil.mli
diff --git a/src/popop_lib/unit.ml b/src_colibri2/popop_lib/unit.ml
similarity index 100%
rename from src/popop_lib/unit.ml
rename to src_colibri2/popop_lib/unit.ml
diff --git a/src/popop_lib/unit.mli b/src_colibri2/popop_lib/unit.mli
similarity index 100%
rename from src/popop_lib/unit.mli
rename to src_colibri2/popop_lib/unit.mli
diff --git a/src/popop_lib/util.ml b/src_colibri2/popop_lib/util.ml
similarity index 100%
rename from src/popop_lib/util.ml
rename to src_colibri2/popop_lib/util.ml
diff --git a/src/popop_lib/util.mli b/src_colibri2/popop_lib/util.mli
similarity index 100%
rename from src/popop_lib/util.mli
rename to src_colibri2/popop_lib/util.mli
diff --git a/src/popop_lib/vector_hetero.ml b/src_colibri2/popop_lib/vector_hetero.ml
similarity index 100%
rename from src/popop_lib/vector_hetero.ml
rename to src_colibri2/popop_lib/vector_hetero.ml
diff --git a/src/popop_lib/vector_hetero.mli b/src_colibri2/popop_lib/vector_hetero.mli
similarity index 100%
rename from src/popop_lib/vector_hetero.mli
rename to src_colibri2/popop_lib/vector_hetero.mli
diff --git a/src/popop_lib/warning.ml b/src_colibri2/popop_lib/warning.ml
similarity index 100%
rename from src/popop_lib/warning.ml
rename to src_colibri2/popop_lib/warning.ml
diff --git a/src/popop_lib/warning.mli b/src_colibri2/popop_lib/warning.mli
similarity index 100%
rename from src/popop_lib/warning.mli
rename to src_colibri2/popop_lib/warning.mli
diff --git a/src/popop_lib/weakhtbl.ml b/src_colibri2/popop_lib/weakhtbl.ml
similarity index 100%
rename from src/popop_lib/weakhtbl.ml
rename to src_colibri2/popop_lib/weakhtbl.ml
diff --git a/src/popop_lib/weakhtbl.mli b/src_colibri2/popop_lib/weakhtbl.mli
similarity index 100%
rename from src/popop_lib/weakhtbl.mli
rename to src_colibri2/popop_lib/weakhtbl.mli
diff --git a/src/solver/dune b/src_colibri2/solver/dune
similarity index 100%
rename from src/solver/dune
rename to src_colibri2/solver/dune
diff --git a/src/solver/input.ml b/src_colibri2/solver/input.ml
similarity index 100%
rename from src/solver/input.ml
rename to src_colibri2/solver/input.ml
diff --git a/src/solver/scheduler.ml b/src_colibri2/solver/scheduler.ml
similarity index 100%
rename from src/solver/scheduler.ml
rename to src_colibri2/solver/scheduler.ml
diff --git a/src/solver/scheduler.mli b/src_colibri2/solver/scheduler.mli
similarity index 100%
rename from src/solver/scheduler.mli
rename to src_colibri2/solver/scheduler.mli
diff --git a/src/solver/solver.ml b/src_colibri2/solver/solver.ml
similarity index 100%
rename from src/solver/solver.ml
rename to src_colibri2/solver/solver.ml
diff --git a/src/stdlib/comp_keys.ml b/src_colibri2/stdlib/comp_keys.ml
similarity index 100%
rename from src/stdlib/comp_keys.ml
rename to src_colibri2/stdlib/comp_keys.ml
diff --git a/src/stdlib/comp_keys.mli b/src_colibri2/stdlib/comp_keys.mli
similarity index 100%
rename from src/stdlib/comp_keys.mli
rename to src_colibri2/stdlib/comp_keys.mli
diff --git a/src/stdlib/config.ml b/src_colibri2/stdlib/config.ml
similarity index 100%
rename from src/stdlib/config.ml
rename to src_colibri2/stdlib/config.ml
diff --git a/src/stdlib/context.ml b/src_colibri2/stdlib/context.ml
similarity index 100%
rename from src/stdlib/context.ml
rename to src_colibri2/stdlib/context.ml
diff --git a/src/stdlib/context.mli b/src_colibri2/stdlib/context.mli
similarity index 100%
rename from src/stdlib/context.mli
rename to src_colibri2/stdlib/context.mli
diff --git a/src/stdlib/dune b/src_colibri2/stdlib/dune
similarity index 100%
rename from src/stdlib/dune
rename to src_colibri2/stdlib/dune
diff --git a/src/stdlib/hashtbl_hetero.ml b/src_colibri2/stdlib/hashtbl_hetero.ml
similarity index 100%
rename from src/stdlib/hashtbl_hetero.ml
rename to src_colibri2/stdlib/hashtbl_hetero.ml
diff --git a/src/stdlib/hashtbl_hetero.mli b/src_colibri2/stdlib/hashtbl_hetero.mli
similarity index 100%
rename from src/stdlib/hashtbl_hetero.mli
rename to src_colibri2/stdlib/hashtbl_hetero.mli
diff --git a/src/stdlib/hashtbl_hetero_sig.ml b/src_colibri2/stdlib/hashtbl_hetero_sig.ml
similarity index 100%
rename from src/stdlib/hashtbl_hetero_sig.ml
rename to src_colibri2/stdlib/hashtbl_hetero_sig.ml
diff --git a/src/stdlib/keys.ml b/src_colibri2/stdlib/keys.ml
similarity index 100%
rename from src/stdlib/keys.ml
rename to src_colibri2/stdlib/keys.ml
diff --git a/src/stdlib/keys.mli b/src_colibri2/stdlib/keys.mli
similarity index 100%
rename from src/stdlib/keys.mli
rename to src_colibri2/stdlib/keys.mli
diff --git a/src/stdlib/keys_sig.ml b/src_colibri2/stdlib/keys_sig.ml
similarity index 100%
rename from src/stdlib/keys_sig.ml
rename to src_colibri2/stdlib/keys_sig.ml
diff --git a/src/stdlib/map_hetero.ml b/src_colibri2/stdlib/map_hetero.ml
similarity index 100%
rename from src/stdlib/map_hetero.ml
rename to src_colibri2/stdlib/map_hetero.ml
diff --git a/src/stdlib/map_hetero.mli b/src_colibri2/stdlib/map_hetero.mli
similarity index 100%
rename from src/stdlib/map_hetero.mli
rename to src_colibri2/stdlib/map_hetero.mli
diff --git a/src/stdlib/map_hetero_sig.ml b/src_colibri2/stdlib/map_hetero_sig.ml
similarity index 100%
rename from src/stdlib/map_hetero_sig.ml
rename to src_colibri2/stdlib/map_hetero_sig.ml
diff --git a/src/stdlib/shuffle.ml b/src_colibri2/stdlib/shuffle.ml
similarity index 100%
rename from src/stdlib/shuffle.ml
rename to src_colibri2/stdlib/shuffle.ml
diff --git a/src/stdlib/shuffle.mli b/src_colibri2/stdlib/shuffle.mli
similarity index 100%
rename from src/stdlib/shuffle.mli
rename to src_colibri2/stdlib/shuffle.mli
diff --git a/src/stdlib/std.ml b/src_colibri2/stdlib/std.ml
similarity index 100%
rename from src/stdlib/std.ml
rename to src_colibri2/stdlib/std.ml
diff --git a/src/stdlib/std.mli b/src_colibri2/stdlib/std.mli
similarity index 100%
rename from src/stdlib/std.mli
rename to src_colibri2/stdlib/std.mli
diff --git a/src/stdlib/std_sig.ml b/src_colibri2/stdlib/std_sig.ml
similarity index 100%
rename from src/stdlib/std_sig.ml
rename to src_colibri2/stdlib/std_sig.ml
diff --git a/src/tests/dune b/src_colibri2/tests/dune
similarity index 100%
rename from src/tests/dune
rename to src_colibri2/tests/dune
diff --git a/src/tests/solve/dimacs/sat/anomaly_agetooold.cnf b/src_colibri2/tests/solve/dimacs/sat/anomaly_agetooold.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/anomaly_agetooold.cnf
rename to src_colibri2/tests/solve/dimacs/sat/anomaly_agetooold.cnf
diff --git a/src/tests/solve/dimacs/sat/anomaly_agetooold2.cnf b/src_colibri2/tests/solve/dimacs/sat/anomaly_agetooold2.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/anomaly_agetooold2.cnf
rename to src_colibri2/tests/solve/dimacs/sat/anomaly_agetooold2.cnf
diff --git a/src/tests/solve/dimacs/sat/assertion_fail.cnf b/src_colibri2/tests/solve/dimacs/sat/assertion_fail.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/assertion_fail.cnf
rename to src_colibri2/tests/solve/dimacs/sat/assertion_fail.cnf
diff --git a/src/tests/solve/dimacs/sat/fuzzing1.cnf b/src_colibri2/tests/solve/dimacs/sat/fuzzing1.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/fuzzing1.cnf
rename to src_colibri2/tests/solve/dimacs/sat/fuzzing1.cnf
diff --git a/src/tests/solve/dimacs/sat/fuzzing2.cnf b/src_colibri2/tests/solve/dimacs/sat/fuzzing2.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/fuzzing2.cnf
rename to src_colibri2/tests/solve/dimacs/sat/fuzzing2.cnf
diff --git a/src/tests/solve/dimacs/sat/par8-1-c.cnf b/src_colibri2/tests/solve/dimacs/sat/par8-1-c.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/par8-1-c.cnf
rename to src_colibri2/tests/solve/dimacs/sat/par8-1-c.cnf
diff --git a/src/tests/solve/dimacs/sat/pigeon-2.cnf b/src_colibri2/tests/solve/dimacs/sat/pigeon-2.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/pigeon-2.cnf
rename to src_colibri2/tests/solve/dimacs/sat/pigeon-2.cnf
diff --git a/src/tests/solve/dimacs/sat/pigeon-3.cnf b/src_colibri2/tests/solve/dimacs/sat/pigeon-3.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/pigeon-3.cnf
rename to src_colibri2/tests/solve/dimacs/sat/pigeon-3.cnf
diff --git a/src/tests/solve/dimacs/sat/pigeon-4.cnf b/src_colibri2/tests/solve/dimacs/sat/pigeon-4.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/pigeon-4.cnf
rename to src_colibri2/tests/solve/dimacs/sat/pigeon-4.cnf
diff --git a/src/tests/solve/dimacs/sat/quinn.cnf b/src_colibri2/tests/solve/dimacs/sat/quinn.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/quinn.cnf
rename to src_colibri2/tests/solve/dimacs/sat/quinn.cnf
diff --git a/src/tests/solve/dimacs/sat/simple_v3_c2.cnf b/src_colibri2/tests/solve/dimacs/sat/simple_v3_c2.cnf
similarity index 100%
rename from src/tests/solve/dimacs/sat/simple_v3_c2.cnf
rename to src_colibri2/tests/solve/dimacs/sat/simple_v3_c2.cnf
diff --git a/src/tests/solve/dimacs/unsat/anomaly_agetooold.cnf b/src_colibri2/tests/solve/dimacs/unsat/anomaly_agetooold.cnf
similarity index 100%
rename from src/tests/solve/dimacs/unsat/anomaly_agetooold.cnf
rename to src_colibri2/tests/solve/dimacs/unsat/anomaly_agetooold.cnf
diff --git a/src/tests/solve/dimacs/unsat/modus_ponens.cnf b/src_colibri2/tests/solve/dimacs/unsat/modus_ponens.cnf
similarity index 100%
rename from src/tests/solve/dimacs/unsat/modus_ponens.cnf
rename to src_colibri2/tests/solve/dimacs/unsat/modus_ponens.cnf
diff --git a/src/tests/solve/dimacs/unsat/pigeon-1.cnf b/src_colibri2/tests/solve/dimacs/unsat/pigeon-1.cnf
similarity index 100%
rename from src/tests/solve/dimacs/unsat/pigeon-1.cnf
rename to src_colibri2/tests/solve/dimacs/unsat/pigeon-1.cnf
diff --git a/src/tests/solve/dimacs/unsat/pigeon-2.cnf b/src_colibri2/tests/solve/dimacs/unsat/pigeon-2.cnf
similarity index 100%
rename from src/tests/solve/dimacs/unsat/pigeon-2.cnf
rename to src_colibri2/tests/solve/dimacs/unsat/pigeon-2.cnf
diff --git a/src/tests/solve/dimacs/unsat/pigeon-3.cnf b/src_colibri2/tests/solve/dimacs/unsat/pigeon-3.cnf
similarity index 100%
rename from src/tests/solve/dimacs/unsat/pigeon-3.cnf
rename to src_colibri2/tests/solve/dimacs/unsat/pigeon-3.cnf
diff --git a/src/tests/solve/dimacs/unsat/pigeon-4.cnf b/src_colibri2/tests/solve/dimacs/unsat/pigeon-4.cnf
similarity index 100%
rename from src/tests/solve/dimacs/unsat/pigeon-4.cnf
rename to src_colibri2/tests/solve/dimacs/unsat/pigeon-4.cnf
diff --git a/src/tests/solve/smt_lra/sat/arith_merge_case_4.smt2 b/src_colibri2/tests/solve/smt_lra/sat/arith_merge_case_4.smt2
similarity index 100%
rename from src/tests/solve/smt_lra/sat/arith_merge_case_4.smt2
rename to src_colibri2/tests/solve/smt_lra/sat/arith_merge_case_4.smt2
diff --git a/src/tests/solve/smt_lra/sat/arith_zero_dom.smt2 b/src_colibri2/tests/solve/smt_lra/sat/arith_zero_dom.smt2
similarity index 100%
rename from src/tests/solve/smt_lra/sat/arith_zero_dom.smt2
rename to src_colibri2/tests/solve/smt_lra/sat/arith_zero_dom.smt2
diff --git a/src/tests/solve/smt_uf/sat/bad_conflict.smt2 b/src_colibri2/tests/solve/smt_uf/sat/bad_conflict.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/sat/bad_conflict.smt2
rename to src_colibri2/tests/solve/smt_uf/sat/bad_conflict.smt2
diff --git a/src/tests/solve/smt_uf/unsat/NEQ004_size4__decide_eq_us.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/NEQ004_size4__decide_eq_us.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/NEQ004_size4__decide_eq_us.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/NEQ004_size4__decide_eq_us.smt2
diff --git a/src/tests/solve/smt_uf/unsat/deltaed0.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/deltaed0.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/deltaed0.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/deltaed0.smt2
diff --git a/src/tests/solve/smt_uf/unsat/diff_to_value_for_bool.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/diff_to_value_for_bool.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/diff_to_value_for_bool.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/diff_to_value_for_bool.smt2
diff --git a/src/tests/solve/smt_uf/unsat/diff_value_substupfalse.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/diff_value_substupfalse.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/diff_value_substupfalse.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/diff_value_substupfalse.smt2
diff --git a/src/tests/solve/smt_uf/unsat/distinct.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/distinct.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/distinct.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/distinct.smt2
diff --git a/src/tests/solve/smt_uf/unsat/eq_diamond2.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/eq_diamond2.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/eq_diamond2.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/eq_diamond2.smt2
diff --git a/src/tests/solve/smt_uf/unsat/equality_norm_set.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/equality_norm_set.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/equality_norm_set.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/equality_norm_set.smt2
diff --git a/src/tests/solve/smt_uf/unsat/many_distinct.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/many_distinct.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/many_distinct.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/many_distinct.smt2
diff --git a/src/tests/solve/smt_uf/unsat/polyeq_genequality_deltaed.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/polyeq_genequality_deltaed.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/polyeq_genequality_deltaed.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/polyeq_genequality_deltaed.smt2
diff --git a/src/tests/solve/smt_uf/unsat/xor.smt2 b/src_colibri2/tests/solve/smt_uf/unsat/xor.smt2
similarity index 100%
rename from src/tests/solve/smt_uf/unsat/xor.smt2
rename to src_colibri2/tests/solve/smt_uf/unsat/xor.smt2
diff --git a/src/tests/test.ml b/src_colibri2/tests/test.ml
similarity index 100%
rename from src/tests/test.ml
rename to src_colibri2/tests/test.ml
diff --git a/src/tests/tests.ml b/src_colibri2/tests/tests.ml
similarity index 100%
rename from src/tests/tests.ml
rename to src_colibri2/tests/tests.ml
diff --git a/src/tests/tests_LRA.ml b/src_colibri2/tests/tests_LRA.ml
similarity index 100%
rename from src/tests/tests_LRA.ml
rename to src_colibri2/tests/tests_LRA.ml
diff --git a/src/tests/tests_bool.ml b/src_colibri2/tests/tests_bool.ml
similarity index 100%
rename from src/tests/tests_bool.ml
rename to src_colibri2/tests/tests_bool.ml
diff --git a/src/tests/tests_lib.ml b/src_colibri2/tests/tests_lib.ml
similarity index 100%
rename from src/tests/tests_lib.ml
rename to src_colibri2/tests/tests_lib.ml
diff --git a/src/tests/tests_uf.ml b/src_colibri2/tests/tests_uf.ml
similarity index 100%
rename from src/tests/tests_uf.ml
rename to src_colibri2/tests/tests_uf.ml
diff --git a/src/theories/LRA/LRA.ml b/src_colibri2/theories/LRA/LRA.ml
similarity index 100%
rename from src/theories/LRA/LRA.ml
rename to src_colibri2/theories/LRA/LRA.ml
diff --git a/src/theories/LRA/LRA.mli b/src_colibri2/theories/LRA/LRA.mli
similarity index 100%
rename from src/theories/LRA/LRA.mli
rename to src_colibri2/theories/LRA/LRA.mli
diff --git a/src/theories/LRA/dune b/src_colibri2/theories/LRA/dune
similarity index 100%
rename from src/theories/LRA/dune
rename to src_colibri2/theories/LRA/dune
diff --git a/src/theories/LRA/interval.ml b/src_colibri2/theories/LRA/interval.ml
similarity index 100%
rename from src/theories/LRA/interval.ml
rename to src_colibri2/theories/LRA/interval.ml
diff --git a/src/theories/LRA/interval.mli b/src_colibri2/theories/LRA/interval.mli
similarity index 100%
rename from src/theories/LRA/interval.mli
rename to src_colibri2/theories/LRA/interval.mli
diff --git a/src/theories/LRA/interval_sig.ml b/src_colibri2/theories/LRA/interval_sig.ml
similarity index 100%
rename from src/theories/LRA/interval_sig.ml
rename to src_colibri2/theories/LRA/interval_sig.ml
diff --git a/src/theories/LRA/polynome.ml b/src_colibri2/theories/LRA/polynome.ml
similarity index 100%
rename from src/theories/LRA/polynome.ml
rename to src_colibri2/theories/LRA/polynome.ml
diff --git a/src/theories/LRA/polynome.mli b/src_colibri2/theories/LRA/polynome.mli
similarity index 100%
rename from src/theories/LRA/polynome.mli
rename to src_colibri2/theories/LRA/polynome.mli
diff --git a/src/theories/bool/boolean.ml b/src_colibri2/theories/bool/boolean.ml
similarity index 100%
rename from src/theories/bool/boolean.ml
rename to src_colibri2/theories/bool/boolean.ml
diff --git a/src/theories/bool/boolean.mli b/src_colibri2/theories/bool/boolean.mli
similarity index 100%
rename from src/theories/bool/boolean.mli
rename to src_colibri2/theories/bool/boolean.mli
diff --git a/src/theories/bool/dune b/src_colibri2/theories/bool/dune
similarity index 100%
rename from src/theories/bool/dune
rename to src_colibri2/theories/bool/dune
diff --git a/src/theories/bool/equality.ml b/src_colibri2/theories/bool/equality.ml
similarity index 100%
rename from src/theories/bool/equality.ml
rename to src_colibri2/theories/bool/equality.ml
diff --git a/src/theories/bool/equality.mli b/src_colibri2/theories/bool/equality.mli
similarity index 100%
rename from src/theories/bool/equality.mli
rename to src_colibri2/theories/bool/equality.mli
diff --git a/src/theories/bool/uninterp.ml b/src_colibri2/theories/bool/uninterp.ml
similarity index 100%
rename from src/theories/bool/uninterp.ml
rename to src_colibri2/theories/bool/uninterp.ml
diff --git a/src/theories/bool/uninterp.mli b/src_colibri2/theories/bool/uninterp.mli
similarity index 100%
rename from src/theories/bool/uninterp.mli
rename to src_colibri2/theories/bool/uninterp.mli