diff --git a/src/lra/dune b/src/algos/lra/dune
similarity index 100%
rename from src/lra/dune
rename to src/algos/lra/dune
diff --git a/src/lra/sidekick_arith_lra.ml b/src/algos/lra/sidekick_arith_lra.ml
similarity index 100%
rename from src/lra/sidekick_arith_lra.ml
rename to src/algos/lra/sidekick_arith_lra.ml
diff --git a/src/simplex/binary_op.ml b/src/algos/simplex/binary_op.ml
similarity index 100%
rename from src/simplex/binary_op.ml
rename to src/algos/simplex/binary_op.ml
diff --git a/src/simplex/dune b/src/algos/simplex/dune
similarity index 100%
rename from src/simplex/dune
rename to src/algos/simplex/dune
diff --git a/src/simplex/linear_expr.ml b/src/algos/simplex/linear_expr.ml
similarity index 100%
rename from src/simplex/linear_expr.ml
rename to src/algos/simplex/linear_expr.ml
diff --git a/src/simplex/linear_expr.mli b/src/algos/simplex/linear_expr.mli
similarity index 100%
rename from src/simplex/linear_expr.mli
rename to src/algos/simplex/linear_expr.mli
diff --git a/src/simplex/linear_expr_intf.ml b/src/algos/simplex/linear_expr_intf.ml
similarity index 100%
rename from src/simplex/linear_expr_intf.ml
rename to src/algos/simplex/linear_expr_intf.ml
diff --git a/src/simplex/predicate.ml b/src/algos/simplex/predicate.ml
similarity index 100%
rename from src/simplex/predicate.ml
rename to src/algos/simplex/predicate.ml
diff --git a/src/simplex/sidekick_simplex.ml b/src/algos/simplex/sidekick_simplex.ml
similarity index 100%
rename from src/simplex/sidekick_simplex.ml
rename to src/algos/simplex/sidekick_simplex.ml
diff --git a/src/simplex/tests/dune b/src/algos/simplex/tests/dune
similarity index 100%
rename from src/simplex/tests/dune
rename to src/algos/simplex/tests/dune
diff --git a/src/simplex/tests/test_simplex.real.ml b/src/algos/simplex/tests/test_simplex.real.ml
similarity index 100%
rename from src/simplex/tests/test_simplex.real.ml
rename to src/algos/simplex/tests/test_simplex.real.ml
diff --git a/src/proof-trace/Storage.ml b/src/base/proof-trace/Storage.ml
similarity index 100%
rename from src/proof-trace/Storage.ml
rename to src/base/proof-trace/Storage.ml
diff --git a/src/proof-trace/Storage.mli b/src/base/proof-trace/Storage.mli
similarity index 100%
rename from src/proof-trace/Storage.mli
rename to src/base/proof-trace/Storage.mli
diff --git a/src/proof-trace/dune b/src/base/proof-trace/dune
similarity index 100%
rename from src/proof-trace/dune
rename to src/base/proof-trace/dune
diff --git a/src/proof-trace/proof_ser.bare b/src/base/proof-trace/proof_ser.bare
similarity index 100%
rename from src/proof-trace/proof_ser.bare
rename to src/base/proof-trace/proof_ser.bare
diff --git a/src/proof-trace/proof_ser.ml b/src/base/proof-trace/proof_ser.ml
similarity index 100%
rename from src/proof-trace/proof_ser.ml
rename to src/base/proof-trace/proof_ser.ml
diff --git a/src/proof-trace/sidekick_base_proof_trace.ml b/src/base/proof-trace/sidekick_base_proof_trace.ml
similarity index 100%
rename from src/proof-trace/sidekick_base_proof_trace.ml
rename to src/base/proof-trace/sidekick_base_proof_trace.ml
diff --git a/src/base-solver/dune b/src/base/solver/dune
similarity index 100%
rename from src/base-solver/dune
rename to src/base/solver/dune
diff --git a/src/base-solver/sidekick_base_solver.ml b/src/base/solver/sidekick_base_solver.ml
similarity index 100%
rename from src/base-solver/sidekick_base_solver.ml
rename to src/base/solver/sidekick_base_solver.ml
diff --git a/src/mini-cc/Sidekick_mini_cc.ml b/src/cc/mini/Sidekick_mini_cc.ml
similarity index 100%
rename from src/mini-cc/Sidekick_mini_cc.ml
rename to src/cc/mini/Sidekick_mini_cc.ml
diff --git a/src/mini-cc/Sidekick_mini_cc.mli b/src/cc/mini/Sidekick_mini_cc.mli
similarity index 100%
rename from src/mini-cc/Sidekick_mini_cc.mli
rename to src/cc/mini/Sidekick_mini_cc.mli
diff --git a/src/mini-cc/dune b/src/cc/mini/dune
similarity index 100%
rename from src/mini-cc/dune
rename to src/cc/mini/dune
diff --git a/src/mini-cc/tests/dune b/src/cc/mini/tests/dune
similarity index 100%
rename from src/mini-cc/tests/dune
rename to src/cc/mini/tests/dune
diff --git a/src/mini-cc/tests/sidekick_test_minicc.ml b/src/cc/mini/tests/sidekick_test_minicc.ml
similarity index 100%
rename from src/mini-cc/tests/sidekick_test_minicc.ml
rename to src/cc/mini/tests/sidekick_test_minicc.ml
diff --git a/src/proof-trace-dump/dune b/src/proof-trace/bare/dump/dune
similarity index 100%
rename from src/proof-trace-dump/dune
rename to src/proof-trace/bare/dump/dune
diff --git a/src/proof-trace-dump/proof_trace_dump.ml b/src/proof-trace/bare/dump/proof_trace_dump.ml
similarity index 100%
rename from src/proof-trace-dump/proof_trace_dump.ml
rename to src/proof-trace/bare/dump/proof_trace_dump.ml