From 9e299b88c4784688addf8a7041481788d5f8fd00 Mon Sep 17 00:00:00 2001 From: Leonardo de Moura Date: Tue, 23 Oct 2012 21:53:34 -0700 Subject: [PATCH] reorganizing the code Signed-off-by: Leonardo de Moura --- scripts/mk_make.py | 32 +++++++++---------- src/{ => bv}/bit_blaster/bit_blaster.cpp | 0 src/{ => bv}/bit_blaster/bit_blaster.h | 0 .../bit_blaster_model_converter.cpp | 0 .../bit_blaster/bit_blaster_model_converter.h | 0 .../bit_blaster/bit_blaster_rewriter.cpp | 0 .../bit_blaster/bit_blaster_rewriter.h | 0 src/{ => bv}/bit_blaster/bit_blaster_tpl.h | 0 .../bit_blaster/bit_blaster_tpl_def.h | 0 .../bit_blaster/bv1_blaster_tactic.cpp | 0 src/{ => bv}/bit_blaster/bv1_blaster_tactic.h | 0 .../bit_blaster/eager_bit_blaster.cpp | 0 src/{ => bv}/bit_blaster/eager_bit_blaster.h | 0 src/{ => bv}/sls_tactic/sls_strategy.h | 0 src/{ => bv}/sls_tactic/sls_tactic.cpp | 0 src/{ => bv}/sls_tactic/sls_tactic.h | 0 .../tactics}/bit_blaster_tactic.cpp | 0 .../tactics}/bit_blaster_tactic.h | 0 .../tactics}/bv_size_reduction_tactic.cpp | 0 .../tactics}/bv_size_reduction_tactic.h | 0 .../tactics}/max_bv_sharing_tactic.cpp | 0 .../tactics}/max_bv_sharing_tactic.h | 0 src/{ => bv}/ufbv_strategy/ufbv_strategy.cpp | 0 src/{ => bv}/ufbv_strategy/ufbv_strategy.h | 0 src/{ => cmd_context}/extra_cmds/dbg_cmds.cpp | 0 src/{ => cmd_context}/extra_cmds/dbg_cmds.h | 0 .../extra_cmds/polynomial_cmds.cpp | 0 .../extra_cmds/polynomial_cmds.h | 0 .../extra_cmds/subpaving_cmds.cpp | 0 .../extra_cmds/subpaving_cmds.h | 0 src/{ => math}/euclid/euclidean_solver.cpp | 0 src/{ => math}/euclid/euclidean_solver.h | 0 src/{ => math}/grobner/grobner.cpp | 0 src/{ => math}/grobner/grobner.h | 0 .../polynomial/algebraic_numbers.cpp | 0 src/{ => math}/polynomial/algebraic_numbers.h | 0 src/{ => math}/polynomial/linear_eq_solver.h | 0 src/{ => math}/polynomial/polynomial.cpp | 0 src/{ => math}/polynomial/polynomial.h | 0 .../polynomial/polynomial_cache.cpp | 0 src/{ => math}/polynomial/polynomial_cache.h | 0 .../polynomial/polynomial_factorization.cpp | 0 .../polynomial/polynomial_factorization.h | 0 src/{ => math}/polynomial/polynomial_primes.h | 0 .../polynomial/polynomial_var2value.h | 0 src/{ => math}/polynomial/rpolynomial.cpp | 0 src/{ => math}/polynomial/rpolynomial.h | 0 .../polynomial/sexpr2upolynomial.cpp | 0 src/{ => math}/polynomial/sexpr2upolynomial.h | 0 src/{ => math}/polynomial/upolynomial.cpp | 0 src/{ => math}/polynomial/upolynomial.h | 0 .../polynomial/upolynomial_factorization.cpp | 0 .../polynomial/upolynomial_factorization.h | 0 .../upolynomial_factorization_int.h | 0 src/{ => math}/subpaving/subpaving.cpp | 0 src/{ => math}/subpaving/subpaving.h | 0 src/{ => math}/subpaving/subpaving_hwf.cpp | 0 src/{ => math}/subpaving/subpaving_hwf.h | 0 src/{ => math}/subpaving/subpaving_mpf.cpp | 0 src/{ => math}/subpaving/subpaving_mpf.h | 0 src/{ => math}/subpaving/subpaving_mpff.cpp | 0 src/{ => math}/subpaving/subpaving_mpff.h | 0 src/{ => math}/subpaving/subpaving_mpfx.cpp | 0 src/{ => math}/subpaving/subpaving_mpfx.h | 0 src/{ => math}/subpaving/subpaving_mpq.cpp | 0 src/{ => math}/subpaving/subpaving_mpq.h | 0 src/{ => math}/subpaving/subpaving_t.h | 0 src/{ => math}/subpaving/subpaving_t_def.h | 0 src/{ => math}/subpaving/subpaving_types.h | 0 .../subpaving/tactic}/expr2subpaving.cpp | 0 .../subpaving/tactic}/expr2subpaving.h | 0 .../subpaving/tactic}/subpaving_tactic.cpp | 0 .../subpaving/tactic}/subpaving_tactic.h | 0 .../tactic}/goal2nlsat.cpp | 0 .../tactic}/goal2nlsat.h | 0 .../tactic}/nlsat_tactic.cpp | 0 .../tactic}/nlsat_tactic.h | 0 .../tactic}/qfnra_nlsat_tactic.cpp | 0 .../tactic}/qfnra_nlsat_tactic.h | 0 .../strategy}/assertion_set2sat.cpp | 0 .../strategy}/assertion_set2sat.h | 0 .../strategy}/sat_solver_strategy.cpp | 0 .../strategy}/sat_solver_strategy.h | 0 .../tactic}/atom2bool_var.cpp | 0 .../tactic}/atom2bool_var.h | 0 src/{sat_tactic => sat/tactic}/goal2sat.cpp | 0 src/{sat_tactic => sat/tactic}/goal2sat.h | 0 src/{sat_tactic => sat/tactic}/sat_tactic.cpp | 0 src/{sat_tactic => sat/tactic}/sat_tactic.h | 0 src/{smt_tactic => smt/tactic}/smt_tactic.cpp | 0 src/{smt_tactic => smt/tactic}/smt_tactic.h | 0 .../user_plugin/user_decl_plugin.cpp | 0 src/{ => smt}/user_plugin/user_decl_plugin.h | 0 .../user_plugin/user_simplifier_plugin.cpp | 0 .../user_plugin/user_simplifier_plugin.h | 0 src/{ => smt}/user_plugin/user_smt_theory.cpp | 0 src/{ => smt}/user_plugin/user_smt_theory.h | 0 src/{ => test}/fuzzing/expr_delta.cpp | 0 src/{ => test}/fuzzing/expr_delta.h | 0 src/{ => test}/fuzzing/expr_rand.cpp | 0 src/{ => test}/fuzzing/expr_rand.h | 0 101 files changed, 16 insertions(+), 16 deletions(-) rename src/{ => bv}/bit_blaster/bit_blaster.cpp (100%) rename src/{ => bv}/bit_blaster/bit_blaster.h (100%) rename src/{ => bv}/bit_blaster/bit_blaster_model_converter.cpp (100%) rename src/{ => bv}/bit_blaster/bit_blaster_model_converter.h (100%) rename src/{ => bv}/bit_blaster/bit_blaster_rewriter.cpp (100%) rename src/{ => bv}/bit_blaster/bit_blaster_rewriter.h (100%) rename src/{ => bv}/bit_blaster/bit_blaster_tpl.h (100%) rename src/{ => bv}/bit_blaster/bit_blaster_tpl_def.h (100%) rename src/{ => bv}/bit_blaster/bv1_blaster_tactic.cpp (100%) rename src/{ => bv}/bit_blaster/bv1_blaster_tactic.h (100%) rename src/{ => bv}/bit_blaster/eager_bit_blaster.cpp (100%) rename src/{ => bv}/bit_blaster/eager_bit_blaster.h (100%) rename src/{ => bv}/sls_tactic/sls_strategy.h (100%) rename src/{ => bv}/sls_tactic/sls_tactic.cpp (100%) rename src/{ => bv}/sls_tactic/sls_tactic.h (100%) rename src/{bv_tactics => bv/tactics}/bit_blaster_tactic.cpp (100%) rename src/{bv_tactics => bv/tactics}/bit_blaster_tactic.h (100%) rename src/{bv_tactics => bv/tactics}/bv_size_reduction_tactic.cpp (100%) rename src/{bv_tactics => bv/tactics}/bv_size_reduction_tactic.h (100%) rename src/{bv_tactics => bv/tactics}/max_bv_sharing_tactic.cpp (100%) rename src/{bv_tactics => bv/tactics}/max_bv_sharing_tactic.h (100%) rename src/{ => bv}/ufbv_strategy/ufbv_strategy.cpp (100%) rename src/{ => bv}/ufbv_strategy/ufbv_strategy.h (100%) rename src/{ => cmd_context}/extra_cmds/dbg_cmds.cpp (100%) rename src/{ => cmd_context}/extra_cmds/dbg_cmds.h (100%) rename src/{ => cmd_context}/extra_cmds/polynomial_cmds.cpp (100%) rename src/{ => cmd_context}/extra_cmds/polynomial_cmds.h (100%) rename src/{ => cmd_context}/extra_cmds/subpaving_cmds.cpp (100%) rename src/{ => cmd_context}/extra_cmds/subpaving_cmds.h (100%) rename src/{ => math}/euclid/euclidean_solver.cpp (100%) rename src/{ => math}/euclid/euclidean_solver.h (100%) rename src/{ => math}/grobner/grobner.cpp (100%) rename src/{ => math}/grobner/grobner.h (100%) rename src/{ => math}/polynomial/algebraic_numbers.cpp (100%) rename src/{ => math}/polynomial/algebraic_numbers.h (100%) rename src/{ => math}/polynomial/linear_eq_solver.h (100%) rename src/{ => math}/polynomial/polynomial.cpp (100%) rename src/{ => math}/polynomial/polynomial.h (100%) rename src/{ => math}/polynomial/polynomial_cache.cpp (100%) rename src/{ => math}/polynomial/polynomial_cache.h (100%) rename src/{ => math}/polynomial/polynomial_factorization.cpp (100%) rename src/{ => math}/polynomial/polynomial_factorization.h (100%) rename src/{ => math}/polynomial/polynomial_primes.h (100%) rename src/{ => math}/polynomial/polynomial_var2value.h (100%) rename src/{ => math}/polynomial/rpolynomial.cpp (100%) rename src/{ => math}/polynomial/rpolynomial.h (100%) rename src/{ => math}/polynomial/sexpr2upolynomial.cpp (100%) rename src/{ => math}/polynomial/sexpr2upolynomial.h (100%) rename src/{ => math}/polynomial/upolynomial.cpp (100%) rename src/{ => math}/polynomial/upolynomial.h (100%) rename src/{ => math}/polynomial/upolynomial_factorization.cpp (100%) rename src/{ => math}/polynomial/upolynomial_factorization.h (100%) rename src/{ => math}/polynomial/upolynomial_factorization_int.h (100%) rename src/{ => math}/subpaving/subpaving.cpp (100%) rename src/{ => math}/subpaving/subpaving.h (100%) rename src/{ => math}/subpaving/subpaving_hwf.cpp (100%) rename src/{ => math}/subpaving/subpaving_hwf.h (100%) rename src/{ => math}/subpaving/subpaving_mpf.cpp (100%) rename src/{ => math}/subpaving/subpaving_mpf.h (100%) rename src/{ => math}/subpaving/subpaving_mpff.cpp (100%) rename src/{ => math}/subpaving/subpaving_mpff.h (100%) rename src/{ => math}/subpaving/subpaving_mpfx.cpp (100%) rename src/{ => math}/subpaving/subpaving_mpfx.h (100%) rename src/{ => math}/subpaving/subpaving_mpq.cpp (100%) rename src/{ => math}/subpaving/subpaving_mpq.h (100%) rename src/{ => math}/subpaving/subpaving_t.h (100%) rename src/{ => math}/subpaving/subpaving_t_def.h (100%) rename src/{ => math}/subpaving/subpaving_types.h (100%) rename src/{subpaving_tactic => math/subpaving/tactic}/expr2subpaving.cpp (100%) rename src/{subpaving_tactic => math/subpaving/tactic}/expr2subpaving.h (100%) rename src/{subpaving_tactic => math/subpaving/tactic}/subpaving_tactic.cpp (100%) rename src/{subpaving_tactic => math/subpaving/tactic}/subpaving_tactic.h (100%) rename src/{nlsat_tactic => nlsat/tactic}/goal2nlsat.cpp (100%) rename src/{nlsat_tactic => nlsat/tactic}/goal2nlsat.h (100%) rename src/{nlsat_tactic => nlsat/tactic}/nlsat_tactic.cpp (100%) rename src/{nlsat_tactic => nlsat/tactic}/nlsat_tactic.h (100%) rename src/{nlsat_tactic => nlsat/tactic}/qfnra_nlsat_tactic.cpp (100%) rename src/{nlsat_tactic => nlsat/tactic}/qfnra_nlsat_tactic.h (100%) rename src/{sat_strategy => sat/strategy}/assertion_set2sat.cpp (100%) rename src/{sat_strategy => sat/strategy}/assertion_set2sat.h (100%) rename src/{sat_strategy => sat/strategy}/sat_solver_strategy.cpp (100%) rename src/{sat_strategy => sat/strategy}/sat_solver_strategy.h (100%) rename src/{sat_tactic => sat/tactic}/atom2bool_var.cpp (100%) rename src/{sat_tactic => sat/tactic}/atom2bool_var.h (100%) rename src/{sat_tactic => sat/tactic}/goal2sat.cpp (100%) rename src/{sat_tactic => sat/tactic}/goal2sat.h (100%) rename src/{sat_tactic => sat/tactic}/sat_tactic.cpp (100%) rename src/{sat_tactic => sat/tactic}/sat_tactic.h (100%) rename src/{smt_tactic => smt/tactic}/smt_tactic.cpp (100%) rename src/{smt_tactic => smt/tactic}/smt_tactic.h (100%) rename src/{ => smt}/user_plugin/user_decl_plugin.cpp (100%) rename src/{ => smt}/user_plugin/user_decl_plugin.h (100%) rename src/{ => smt}/user_plugin/user_simplifier_plugin.cpp (100%) rename src/{ => smt}/user_plugin/user_simplifier_plugin.h (100%) rename src/{ => smt}/user_plugin/user_smt_theory.cpp (100%) rename src/{ => smt}/user_plugin/user_smt_theory.h (100%) rename src/{ => test}/fuzzing/expr_delta.cpp (100%) rename src/{ => test}/fuzzing/expr_delta.h (100%) rename src/{ => test}/fuzzing/expr_rand.cpp (100%) rename src/{ => test}/fuzzing/expr_rand.h (100%) diff --git a/scripts/mk_make.py b/scripts/mk_make.py index 590e8a50b..e260d99c7 100644 --- a/scripts/mk_make.py +++ b/scripts/mk_make.py @@ -19,11 +19,11 @@ parse_options() # 'NDEBUG;_EXTERNAL_RELEASE') add_lib('util', []) -add_lib('polynomial', ['util']) +add_lib('polynomial', ['util'], 'math/polynomial') add_lib('sat', ['util']) # nlsat only reuses the file sat_types.h from sat add_lib('nlsat', ['polynomial', 'sat']) -add_lib('subpaving', ['util']) +add_lib('subpaving', ['util'], 'math/subpaving') add_lib('ast', ['util', 'polynomial']) add_lib('rewriter', ['ast', 'polynomial']) # Simplifier module will be deleted in the future. @@ -47,31 +47,31 @@ add_lib('spc', ['simplifier', 'substitution', 'old_params', 'pattern']) add_lib('parser_util', ['ast']) add_lib('smt2parser', ['cmd_context', 'parser_util']) add_lib('macros', ['simplifier', 'old_params']) -add_lib('grobner', ['ast']) -add_lib('euclid', ['util']) +add_lib('grobner', ['ast'], 'math/grobner') +add_lib('euclid', ['util'], 'math/euclid') add_lib('proof_checker', ['rewriter', 'spc']) -add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'tactic', 'assertion_set']) +add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'tactic', 'assertion_set'], 'bv/bit_blaster') add_lib('smt', ['assertion_set', 'bit_blaster', 'macros', 'normal_forms', 'cmd_context', 'substitution', 'grobner', 'euclid', 'proof_checker', 'pattern', 'parser_util']) -add_lib('user_plugin', ['smt']) +add_lib('user_plugin', ['smt'], 'smt/user_plugin') add_lib('core_tactics', ['tactic', 'normal_forms']) -add_lib('sat_tactic', ['tactic', 'sat']) -add_lib('sat_strategy', ['assertion_set', 'sat_tactic']) +add_lib('sat_tactic', ['tactic', 'sat'], 'sat/tactic') +add_lib('sat_strategy', ['assertion_set', 'sat_tactic'], 'sat/strategy') add_lib('arith_tactics', ['core_tactics', 'assertion_set', 'sat', 'sat_strategy']) -add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics']) -add_lib('subpaving_tactic', ['core_tactics', 'subpaving']) -add_lib('bv_tactics', ['tactic', 'bit_blaster']) -add_lib('fuzzing', ['ast']) +add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'nlsat/tactic') +add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'math/subpaving/tactic') +add_lib('bv_tactics', ['tactic', 'bit_blaster'], 'bv/tactics') +add_lib('fuzzing', ['ast'], 'test/fuzzing') add_lib('fpa', ['core_tactics', 'bv_tactics', 'sat_tactic']) -add_lib('smt_tactic', ['smt']) -add_lib('extra_cmds', ['cmd_context', 'subpaving_tactic', 'arith_tactics']) -add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics']) +add_lib('smt_tactic', ['smt'], 'smt/tactic') +add_lib('extra_cmds', ['cmd_context', 'subpaving_tactic', 'arith_tactics'], 'cmd_context/extra_cmds') +add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics'], 'bv/sls_tactic') add_lib('aig', ['cmd_context', 'assertion_set']) # TODO: split muz_qe into muz, qe. Perhaps, we should also consider breaking muz into muz and pdr. add_lib('muz_qe', ['smt', 'sat', 'smt2parser']) add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt_tactic', 'aig', 'muz_qe']) # TODO: rewrite ufbv_strategy as a tactic and move to smtlogic_tactics. -add_lib('ufbv_strategy', ['assertion_set', 'normal_forms', 'macros', 'smt_tactic', 'rewriter']) +add_lib('ufbv_strategy', ['assertion_set', 'normal_forms', 'macros', 'smt_tactic', 'rewriter'], 'bv/ufbv_strategy') add_lib('portfolio', ['smtlogic_tactics', 'ufbv_strategy', 'fpa', 'aig', 'muz_qe', 'sls_tactic', 'subpaving_tactic']) # TODO: delete SMT 1.0 frontend add_lib('api', ['portfolio', 'user_plugin']) diff --git a/src/bit_blaster/bit_blaster.cpp b/src/bv/bit_blaster/bit_blaster.cpp similarity index 100% rename from src/bit_blaster/bit_blaster.cpp rename to src/bv/bit_blaster/bit_blaster.cpp diff --git a/src/bit_blaster/bit_blaster.h b/src/bv/bit_blaster/bit_blaster.h similarity index 100% rename from src/bit_blaster/bit_blaster.h rename to src/bv/bit_blaster/bit_blaster.h diff --git a/src/bit_blaster/bit_blaster_model_converter.cpp b/src/bv/bit_blaster/bit_blaster_model_converter.cpp similarity index 100% rename from src/bit_blaster/bit_blaster_model_converter.cpp rename to src/bv/bit_blaster/bit_blaster_model_converter.cpp diff --git a/src/bit_blaster/bit_blaster_model_converter.h b/src/bv/bit_blaster/bit_blaster_model_converter.h similarity index 100% rename from src/bit_blaster/bit_blaster_model_converter.h rename to src/bv/bit_blaster/bit_blaster_model_converter.h diff --git a/src/bit_blaster/bit_blaster_rewriter.cpp b/src/bv/bit_blaster/bit_blaster_rewriter.cpp similarity index 100% rename from src/bit_blaster/bit_blaster_rewriter.cpp rename to src/bv/bit_blaster/bit_blaster_rewriter.cpp diff --git a/src/bit_blaster/bit_blaster_rewriter.h b/src/bv/bit_blaster/bit_blaster_rewriter.h similarity index 100% rename from src/bit_blaster/bit_blaster_rewriter.h rename to src/bv/bit_blaster/bit_blaster_rewriter.h diff --git a/src/bit_blaster/bit_blaster_tpl.h b/src/bv/bit_blaster/bit_blaster_tpl.h similarity index 100% rename from src/bit_blaster/bit_blaster_tpl.h rename to src/bv/bit_blaster/bit_blaster_tpl.h diff --git a/src/bit_blaster/bit_blaster_tpl_def.h b/src/bv/bit_blaster/bit_blaster_tpl_def.h similarity index 100% rename from src/bit_blaster/bit_blaster_tpl_def.h rename to src/bv/bit_blaster/bit_blaster_tpl_def.h diff --git a/src/bit_blaster/bv1_blaster_tactic.cpp b/src/bv/bit_blaster/bv1_blaster_tactic.cpp similarity index 100% rename from src/bit_blaster/bv1_blaster_tactic.cpp rename to src/bv/bit_blaster/bv1_blaster_tactic.cpp diff --git a/src/bit_blaster/bv1_blaster_tactic.h b/src/bv/bit_blaster/bv1_blaster_tactic.h similarity index 100% rename from src/bit_blaster/bv1_blaster_tactic.h rename to src/bv/bit_blaster/bv1_blaster_tactic.h diff --git a/src/bit_blaster/eager_bit_blaster.cpp b/src/bv/bit_blaster/eager_bit_blaster.cpp similarity index 100% rename from src/bit_blaster/eager_bit_blaster.cpp rename to src/bv/bit_blaster/eager_bit_blaster.cpp diff --git a/src/bit_blaster/eager_bit_blaster.h b/src/bv/bit_blaster/eager_bit_blaster.h similarity index 100% rename from src/bit_blaster/eager_bit_blaster.h rename to src/bv/bit_blaster/eager_bit_blaster.h diff --git a/src/sls_tactic/sls_strategy.h b/src/bv/sls_tactic/sls_strategy.h similarity index 100% rename from src/sls_tactic/sls_strategy.h rename to src/bv/sls_tactic/sls_strategy.h diff --git a/src/sls_tactic/sls_tactic.cpp b/src/bv/sls_tactic/sls_tactic.cpp similarity index 100% rename from src/sls_tactic/sls_tactic.cpp rename to src/bv/sls_tactic/sls_tactic.cpp diff --git a/src/sls_tactic/sls_tactic.h b/src/bv/sls_tactic/sls_tactic.h similarity index 100% rename from src/sls_tactic/sls_tactic.h rename to src/bv/sls_tactic/sls_tactic.h diff --git a/src/bv_tactics/bit_blaster_tactic.cpp b/src/bv/tactics/bit_blaster_tactic.cpp similarity index 100% rename from src/bv_tactics/bit_blaster_tactic.cpp rename to src/bv/tactics/bit_blaster_tactic.cpp diff --git a/src/bv_tactics/bit_blaster_tactic.h b/src/bv/tactics/bit_blaster_tactic.h similarity index 100% rename from src/bv_tactics/bit_blaster_tactic.h rename to src/bv/tactics/bit_blaster_tactic.h diff --git a/src/bv_tactics/bv_size_reduction_tactic.cpp b/src/bv/tactics/bv_size_reduction_tactic.cpp similarity index 100% rename from src/bv_tactics/bv_size_reduction_tactic.cpp rename to src/bv/tactics/bv_size_reduction_tactic.cpp diff --git a/src/bv_tactics/bv_size_reduction_tactic.h b/src/bv/tactics/bv_size_reduction_tactic.h similarity index 100% rename from src/bv_tactics/bv_size_reduction_tactic.h rename to src/bv/tactics/bv_size_reduction_tactic.h diff --git a/src/bv_tactics/max_bv_sharing_tactic.cpp b/src/bv/tactics/max_bv_sharing_tactic.cpp similarity index 100% rename from src/bv_tactics/max_bv_sharing_tactic.cpp rename to src/bv/tactics/max_bv_sharing_tactic.cpp diff --git a/src/bv_tactics/max_bv_sharing_tactic.h b/src/bv/tactics/max_bv_sharing_tactic.h similarity index 100% rename from src/bv_tactics/max_bv_sharing_tactic.h rename to src/bv/tactics/max_bv_sharing_tactic.h diff --git a/src/ufbv_strategy/ufbv_strategy.cpp b/src/bv/ufbv_strategy/ufbv_strategy.cpp similarity index 100% rename from src/ufbv_strategy/ufbv_strategy.cpp rename to src/bv/ufbv_strategy/ufbv_strategy.cpp diff --git a/src/ufbv_strategy/ufbv_strategy.h b/src/bv/ufbv_strategy/ufbv_strategy.h similarity index 100% rename from src/ufbv_strategy/ufbv_strategy.h rename to src/bv/ufbv_strategy/ufbv_strategy.h diff --git a/src/extra_cmds/dbg_cmds.cpp b/src/cmd_context/extra_cmds/dbg_cmds.cpp similarity index 100% rename from src/extra_cmds/dbg_cmds.cpp rename to src/cmd_context/extra_cmds/dbg_cmds.cpp diff --git a/src/extra_cmds/dbg_cmds.h b/src/cmd_context/extra_cmds/dbg_cmds.h similarity index 100% rename from src/extra_cmds/dbg_cmds.h rename to src/cmd_context/extra_cmds/dbg_cmds.h diff --git a/src/extra_cmds/polynomial_cmds.cpp b/src/cmd_context/extra_cmds/polynomial_cmds.cpp similarity index 100% rename from src/extra_cmds/polynomial_cmds.cpp rename to src/cmd_context/extra_cmds/polynomial_cmds.cpp diff --git a/src/extra_cmds/polynomial_cmds.h b/src/cmd_context/extra_cmds/polynomial_cmds.h similarity index 100% rename from src/extra_cmds/polynomial_cmds.h rename to src/cmd_context/extra_cmds/polynomial_cmds.h diff --git a/src/extra_cmds/subpaving_cmds.cpp b/src/cmd_context/extra_cmds/subpaving_cmds.cpp similarity index 100% rename from src/extra_cmds/subpaving_cmds.cpp rename to src/cmd_context/extra_cmds/subpaving_cmds.cpp diff --git a/src/extra_cmds/subpaving_cmds.h b/src/cmd_context/extra_cmds/subpaving_cmds.h similarity index 100% rename from src/extra_cmds/subpaving_cmds.h rename to src/cmd_context/extra_cmds/subpaving_cmds.h diff --git a/src/euclid/euclidean_solver.cpp b/src/math/euclid/euclidean_solver.cpp similarity index 100% rename from src/euclid/euclidean_solver.cpp rename to src/math/euclid/euclidean_solver.cpp diff --git a/src/euclid/euclidean_solver.h b/src/math/euclid/euclidean_solver.h similarity index 100% rename from src/euclid/euclidean_solver.h rename to src/math/euclid/euclidean_solver.h diff --git a/src/grobner/grobner.cpp b/src/math/grobner/grobner.cpp similarity index 100% rename from src/grobner/grobner.cpp rename to src/math/grobner/grobner.cpp diff --git a/src/grobner/grobner.h b/src/math/grobner/grobner.h similarity index 100% rename from src/grobner/grobner.h rename to src/math/grobner/grobner.h diff --git a/src/polynomial/algebraic_numbers.cpp b/src/math/polynomial/algebraic_numbers.cpp similarity index 100% rename from src/polynomial/algebraic_numbers.cpp rename to src/math/polynomial/algebraic_numbers.cpp diff --git a/src/polynomial/algebraic_numbers.h b/src/math/polynomial/algebraic_numbers.h similarity index 100% rename from src/polynomial/algebraic_numbers.h rename to src/math/polynomial/algebraic_numbers.h diff --git a/src/polynomial/linear_eq_solver.h b/src/math/polynomial/linear_eq_solver.h similarity index 100% rename from src/polynomial/linear_eq_solver.h rename to src/math/polynomial/linear_eq_solver.h diff --git a/src/polynomial/polynomial.cpp b/src/math/polynomial/polynomial.cpp similarity index 100% rename from src/polynomial/polynomial.cpp rename to src/math/polynomial/polynomial.cpp diff --git a/src/polynomial/polynomial.h b/src/math/polynomial/polynomial.h similarity index 100% rename from src/polynomial/polynomial.h rename to src/math/polynomial/polynomial.h diff --git a/src/polynomial/polynomial_cache.cpp b/src/math/polynomial/polynomial_cache.cpp similarity index 100% rename from src/polynomial/polynomial_cache.cpp rename to src/math/polynomial/polynomial_cache.cpp diff --git a/src/polynomial/polynomial_cache.h b/src/math/polynomial/polynomial_cache.h similarity index 100% rename from src/polynomial/polynomial_cache.h rename to src/math/polynomial/polynomial_cache.h diff --git a/src/polynomial/polynomial_factorization.cpp b/src/math/polynomial/polynomial_factorization.cpp similarity index 100% rename from src/polynomial/polynomial_factorization.cpp rename to src/math/polynomial/polynomial_factorization.cpp diff --git a/src/polynomial/polynomial_factorization.h b/src/math/polynomial/polynomial_factorization.h similarity index 100% rename from src/polynomial/polynomial_factorization.h rename to src/math/polynomial/polynomial_factorization.h diff --git a/src/polynomial/polynomial_primes.h b/src/math/polynomial/polynomial_primes.h similarity index 100% rename from src/polynomial/polynomial_primes.h rename to src/math/polynomial/polynomial_primes.h diff --git a/src/polynomial/polynomial_var2value.h b/src/math/polynomial/polynomial_var2value.h similarity index 100% rename from src/polynomial/polynomial_var2value.h rename to src/math/polynomial/polynomial_var2value.h diff --git a/src/polynomial/rpolynomial.cpp b/src/math/polynomial/rpolynomial.cpp similarity index 100% rename from src/polynomial/rpolynomial.cpp rename to src/math/polynomial/rpolynomial.cpp diff --git a/src/polynomial/rpolynomial.h b/src/math/polynomial/rpolynomial.h similarity index 100% rename from src/polynomial/rpolynomial.h rename to src/math/polynomial/rpolynomial.h diff --git a/src/polynomial/sexpr2upolynomial.cpp b/src/math/polynomial/sexpr2upolynomial.cpp similarity index 100% rename from src/polynomial/sexpr2upolynomial.cpp rename to src/math/polynomial/sexpr2upolynomial.cpp diff --git a/src/polynomial/sexpr2upolynomial.h b/src/math/polynomial/sexpr2upolynomial.h similarity index 100% rename from src/polynomial/sexpr2upolynomial.h rename to src/math/polynomial/sexpr2upolynomial.h diff --git a/src/polynomial/upolynomial.cpp b/src/math/polynomial/upolynomial.cpp similarity index 100% rename from src/polynomial/upolynomial.cpp rename to src/math/polynomial/upolynomial.cpp diff --git a/src/polynomial/upolynomial.h b/src/math/polynomial/upolynomial.h similarity index 100% rename from src/polynomial/upolynomial.h rename to src/math/polynomial/upolynomial.h diff --git a/src/polynomial/upolynomial_factorization.cpp b/src/math/polynomial/upolynomial_factorization.cpp similarity index 100% rename from src/polynomial/upolynomial_factorization.cpp rename to src/math/polynomial/upolynomial_factorization.cpp diff --git a/src/polynomial/upolynomial_factorization.h b/src/math/polynomial/upolynomial_factorization.h similarity index 100% rename from src/polynomial/upolynomial_factorization.h rename to src/math/polynomial/upolynomial_factorization.h diff --git a/src/polynomial/upolynomial_factorization_int.h b/src/math/polynomial/upolynomial_factorization_int.h similarity index 100% rename from src/polynomial/upolynomial_factorization_int.h rename to src/math/polynomial/upolynomial_factorization_int.h diff --git a/src/subpaving/subpaving.cpp b/src/math/subpaving/subpaving.cpp similarity index 100% rename from src/subpaving/subpaving.cpp rename to src/math/subpaving/subpaving.cpp diff --git a/src/subpaving/subpaving.h b/src/math/subpaving/subpaving.h similarity index 100% rename from src/subpaving/subpaving.h rename to src/math/subpaving/subpaving.h diff --git a/src/subpaving/subpaving_hwf.cpp b/src/math/subpaving/subpaving_hwf.cpp similarity index 100% rename from src/subpaving/subpaving_hwf.cpp rename to src/math/subpaving/subpaving_hwf.cpp diff --git a/src/subpaving/subpaving_hwf.h b/src/math/subpaving/subpaving_hwf.h similarity index 100% rename from src/subpaving/subpaving_hwf.h rename to src/math/subpaving/subpaving_hwf.h diff --git a/src/subpaving/subpaving_mpf.cpp b/src/math/subpaving/subpaving_mpf.cpp similarity index 100% rename from src/subpaving/subpaving_mpf.cpp rename to src/math/subpaving/subpaving_mpf.cpp diff --git a/src/subpaving/subpaving_mpf.h b/src/math/subpaving/subpaving_mpf.h similarity index 100% rename from src/subpaving/subpaving_mpf.h rename to src/math/subpaving/subpaving_mpf.h diff --git a/src/subpaving/subpaving_mpff.cpp b/src/math/subpaving/subpaving_mpff.cpp similarity index 100% rename from src/subpaving/subpaving_mpff.cpp rename to src/math/subpaving/subpaving_mpff.cpp diff --git a/src/subpaving/subpaving_mpff.h b/src/math/subpaving/subpaving_mpff.h similarity index 100% rename from src/subpaving/subpaving_mpff.h rename to src/math/subpaving/subpaving_mpff.h diff --git a/src/subpaving/subpaving_mpfx.cpp b/src/math/subpaving/subpaving_mpfx.cpp similarity index 100% rename from src/subpaving/subpaving_mpfx.cpp rename to src/math/subpaving/subpaving_mpfx.cpp diff --git a/src/subpaving/subpaving_mpfx.h b/src/math/subpaving/subpaving_mpfx.h similarity index 100% rename from src/subpaving/subpaving_mpfx.h rename to src/math/subpaving/subpaving_mpfx.h diff --git a/src/subpaving/subpaving_mpq.cpp b/src/math/subpaving/subpaving_mpq.cpp similarity index 100% rename from src/subpaving/subpaving_mpq.cpp rename to src/math/subpaving/subpaving_mpq.cpp diff --git a/src/subpaving/subpaving_mpq.h b/src/math/subpaving/subpaving_mpq.h similarity index 100% rename from src/subpaving/subpaving_mpq.h rename to src/math/subpaving/subpaving_mpq.h diff --git a/src/subpaving/subpaving_t.h b/src/math/subpaving/subpaving_t.h similarity index 100% rename from src/subpaving/subpaving_t.h rename to src/math/subpaving/subpaving_t.h diff --git a/src/subpaving/subpaving_t_def.h b/src/math/subpaving/subpaving_t_def.h similarity index 100% rename from src/subpaving/subpaving_t_def.h rename to src/math/subpaving/subpaving_t_def.h diff --git a/src/subpaving/subpaving_types.h b/src/math/subpaving/subpaving_types.h similarity index 100% rename from src/subpaving/subpaving_types.h rename to src/math/subpaving/subpaving_types.h diff --git a/src/subpaving_tactic/expr2subpaving.cpp b/src/math/subpaving/tactic/expr2subpaving.cpp similarity index 100% rename from src/subpaving_tactic/expr2subpaving.cpp rename to src/math/subpaving/tactic/expr2subpaving.cpp diff --git a/src/subpaving_tactic/expr2subpaving.h b/src/math/subpaving/tactic/expr2subpaving.h similarity index 100% rename from src/subpaving_tactic/expr2subpaving.h rename to src/math/subpaving/tactic/expr2subpaving.h diff --git a/src/subpaving_tactic/subpaving_tactic.cpp b/src/math/subpaving/tactic/subpaving_tactic.cpp similarity index 100% rename from src/subpaving_tactic/subpaving_tactic.cpp rename to src/math/subpaving/tactic/subpaving_tactic.cpp diff --git a/src/subpaving_tactic/subpaving_tactic.h b/src/math/subpaving/tactic/subpaving_tactic.h similarity index 100% rename from src/subpaving_tactic/subpaving_tactic.h rename to src/math/subpaving/tactic/subpaving_tactic.h diff --git a/src/nlsat_tactic/goal2nlsat.cpp b/src/nlsat/tactic/goal2nlsat.cpp similarity index 100% rename from src/nlsat_tactic/goal2nlsat.cpp rename to src/nlsat/tactic/goal2nlsat.cpp diff --git a/src/nlsat_tactic/goal2nlsat.h b/src/nlsat/tactic/goal2nlsat.h similarity index 100% rename from src/nlsat_tactic/goal2nlsat.h rename to src/nlsat/tactic/goal2nlsat.h diff --git a/src/nlsat_tactic/nlsat_tactic.cpp b/src/nlsat/tactic/nlsat_tactic.cpp similarity index 100% rename from src/nlsat_tactic/nlsat_tactic.cpp rename to src/nlsat/tactic/nlsat_tactic.cpp diff --git a/src/nlsat_tactic/nlsat_tactic.h b/src/nlsat/tactic/nlsat_tactic.h similarity index 100% rename from src/nlsat_tactic/nlsat_tactic.h rename to src/nlsat/tactic/nlsat_tactic.h diff --git a/src/nlsat_tactic/qfnra_nlsat_tactic.cpp b/src/nlsat/tactic/qfnra_nlsat_tactic.cpp similarity index 100% rename from src/nlsat_tactic/qfnra_nlsat_tactic.cpp rename to src/nlsat/tactic/qfnra_nlsat_tactic.cpp diff --git a/src/nlsat_tactic/qfnra_nlsat_tactic.h b/src/nlsat/tactic/qfnra_nlsat_tactic.h similarity index 100% rename from src/nlsat_tactic/qfnra_nlsat_tactic.h rename to src/nlsat/tactic/qfnra_nlsat_tactic.h diff --git a/src/sat_strategy/assertion_set2sat.cpp b/src/sat/strategy/assertion_set2sat.cpp similarity index 100% rename from src/sat_strategy/assertion_set2sat.cpp rename to src/sat/strategy/assertion_set2sat.cpp diff --git a/src/sat_strategy/assertion_set2sat.h b/src/sat/strategy/assertion_set2sat.h similarity index 100% rename from src/sat_strategy/assertion_set2sat.h rename to src/sat/strategy/assertion_set2sat.h diff --git a/src/sat_strategy/sat_solver_strategy.cpp b/src/sat/strategy/sat_solver_strategy.cpp similarity index 100% rename from src/sat_strategy/sat_solver_strategy.cpp rename to src/sat/strategy/sat_solver_strategy.cpp diff --git a/src/sat_strategy/sat_solver_strategy.h b/src/sat/strategy/sat_solver_strategy.h similarity index 100% rename from src/sat_strategy/sat_solver_strategy.h rename to src/sat/strategy/sat_solver_strategy.h diff --git a/src/sat_tactic/atom2bool_var.cpp b/src/sat/tactic/atom2bool_var.cpp similarity index 100% rename from src/sat_tactic/atom2bool_var.cpp rename to src/sat/tactic/atom2bool_var.cpp diff --git a/src/sat_tactic/atom2bool_var.h b/src/sat/tactic/atom2bool_var.h similarity index 100% rename from src/sat_tactic/atom2bool_var.h rename to src/sat/tactic/atom2bool_var.h diff --git a/src/sat_tactic/goal2sat.cpp b/src/sat/tactic/goal2sat.cpp similarity index 100% rename from src/sat_tactic/goal2sat.cpp rename to src/sat/tactic/goal2sat.cpp diff --git a/src/sat_tactic/goal2sat.h b/src/sat/tactic/goal2sat.h similarity index 100% rename from src/sat_tactic/goal2sat.h rename to src/sat/tactic/goal2sat.h diff --git a/src/sat_tactic/sat_tactic.cpp b/src/sat/tactic/sat_tactic.cpp similarity index 100% rename from src/sat_tactic/sat_tactic.cpp rename to src/sat/tactic/sat_tactic.cpp diff --git a/src/sat_tactic/sat_tactic.h b/src/sat/tactic/sat_tactic.h similarity index 100% rename from src/sat_tactic/sat_tactic.h rename to src/sat/tactic/sat_tactic.h diff --git a/src/smt_tactic/smt_tactic.cpp b/src/smt/tactic/smt_tactic.cpp similarity index 100% rename from src/smt_tactic/smt_tactic.cpp rename to src/smt/tactic/smt_tactic.cpp diff --git a/src/smt_tactic/smt_tactic.h b/src/smt/tactic/smt_tactic.h similarity index 100% rename from src/smt_tactic/smt_tactic.h rename to src/smt/tactic/smt_tactic.h diff --git a/src/user_plugin/user_decl_plugin.cpp b/src/smt/user_plugin/user_decl_plugin.cpp similarity index 100% rename from src/user_plugin/user_decl_plugin.cpp rename to src/smt/user_plugin/user_decl_plugin.cpp diff --git a/src/user_plugin/user_decl_plugin.h b/src/smt/user_plugin/user_decl_plugin.h similarity index 100% rename from src/user_plugin/user_decl_plugin.h rename to src/smt/user_plugin/user_decl_plugin.h diff --git a/src/user_plugin/user_simplifier_plugin.cpp b/src/smt/user_plugin/user_simplifier_plugin.cpp similarity index 100% rename from src/user_plugin/user_simplifier_plugin.cpp rename to src/smt/user_plugin/user_simplifier_plugin.cpp diff --git a/src/user_plugin/user_simplifier_plugin.h b/src/smt/user_plugin/user_simplifier_plugin.h similarity index 100% rename from src/user_plugin/user_simplifier_plugin.h rename to src/smt/user_plugin/user_simplifier_plugin.h diff --git a/src/user_plugin/user_smt_theory.cpp b/src/smt/user_plugin/user_smt_theory.cpp similarity index 100% rename from src/user_plugin/user_smt_theory.cpp rename to src/smt/user_plugin/user_smt_theory.cpp diff --git a/src/user_plugin/user_smt_theory.h b/src/smt/user_plugin/user_smt_theory.h similarity index 100% rename from src/user_plugin/user_smt_theory.h rename to src/smt/user_plugin/user_smt_theory.h diff --git a/src/fuzzing/expr_delta.cpp b/src/test/fuzzing/expr_delta.cpp similarity index 100% rename from src/fuzzing/expr_delta.cpp rename to src/test/fuzzing/expr_delta.cpp diff --git a/src/fuzzing/expr_delta.h b/src/test/fuzzing/expr_delta.h similarity index 100% rename from src/fuzzing/expr_delta.h rename to src/test/fuzzing/expr_delta.h diff --git a/src/fuzzing/expr_rand.cpp b/src/test/fuzzing/expr_rand.cpp similarity index 100% rename from src/fuzzing/expr_rand.cpp rename to src/test/fuzzing/expr_rand.cpp diff --git a/src/fuzzing/expr_rand.h b/src/test/fuzzing/expr_rand.h similarity index 100% rename from src/fuzzing/expr_rand.h rename to src/test/fuzzing/expr_rand.h