diff --git a/scripts/mk_make.py b/scripts/mk_make.py index 711d2e39a..a9d2e481d 100644 --- a/scripts/mk_make.py +++ b/scripts/mk_make.py @@ -41,22 +41,22 @@ add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'tactic'], 'tact add_lib('smt', ['bit_blaster', 'macros', 'normal_forms', 'cmd_context', 'substitution', 'grobner', 'euclid', 'proof_checker', 'pattern', 'parser_util']) add_lib('user_plugin', ['smt'], 'smt/user_plugin') -add_lib('core_tactics', ['tactic', 'normal_forms'], 'tactic/core_tactics') -add_lib('sat_tactic', ['tactic', 'sat'], 'tactic/sat_tactic') -add_lib('arith_tactics', ['core_tactics', 'sat'], 'tactic/arith_tactics') -add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'tactic/nlsat_tactic') -add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'tactic/subpaving_tactic') -add_lib('bv_tactics', ['tactic', 'bit_blaster'], 'tactic/bv_tactics') +add_lib('core_tactics', ['tactic', 'normal_forms'], 'tactic/core') +add_lib('sat_tactic', ['tactic', 'sat'], 'tactic/sat') +add_lib('arith_tactics', ['core_tactics', 'sat'], 'tactic/arith') +add_lib('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'tactic/nlsat') +add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'tactic/subpaving') +add_lib('bv_tactics', ['tactic', 'bit_blaster'], 'tactic/bv') add_lib('fuzzing', ['ast'], 'test/fuzzing') add_lib('fpa', ['core_tactics', 'bv_tactics', 'sat_tactic'], 'tactic/fpa') -add_lib('smt_tactic', ['smt'], 'tactic/smt_tactic') +add_lib('smt_tactic', ['smt'], 'tactic/smt') 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'], 'tactic/sls_tactic') +add_lib('sls_tactic', ['tactic', 'normal_forms', 'core_tactics', 'bv_tactics'], 'tactic/sls') add_lib('aig', ['tactic'], 'tactic/aig') # 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'], 'tactic/smtlogic_tactics') -add_lib('ufbv_tactic', ['normal_forms', 'core_tactics', 'macros', 'smt_tactic', 'rewriter'], 'tactic/ufbv_tactic') +add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt_tactic', 'aig', 'muz_qe'], 'tactic/smtlogics') +add_lib('ufbv_tactic', ['normal_forms', 'core_tactics', 'macros', 'smt_tactic', 'rewriter'], 'tactic/ufbv') add_lib('portfolio', ['smtlogic_tactics', 'ufbv_tactic', 'fpa', 'aig', 'muz_qe', 'sls_tactic', 'subpaving_tactic'], 'tactic/portfolio') # TODO: delete SMT 1.0 frontend add_lib('api', ['portfolio', 'user_plugin']) diff --git a/src/api/dll/dll.cpp b/src/api/dll/dll.cpp index 5f6f7a443..1730ede23 100644 --- a/src/api/dll/dll.cpp +++ b/src/api/dll/dll.cpp @@ -1,6 +1,6 @@ +#ifdef _WINDOWS -#include "windows.h" - +#include #ifdef _MANAGED #pragma managed(push, off) @@ -25,3 +25,5 @@ BOOL APIENTRY DllMain( HMODULE hModule, #ifdef _MANAGED #pragma managed(pop) #endif + +#endif diff --git a/src/tactic/arith_tactics/add_bounds_tactic.cpp b/src/tactic/arith/add_bounds_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/add_bounds_tactic.cpp rename to src/tactic/arith/add_bounds_tactic.cpp diff --git a/src/tactic/arith_tactics/add_bounds_tactic.h b/src/tactic/arith/add_bounds_tactic.h similarity index 100% rename from src/tactic/arith_tactics/add_bounds_tactic.h rename to src/tactic/arith/add_bounds_tactic.h diff --git a/src/tactic/arith_tactics/bound_manager.cpp b/src/tactic/arith/bound_manager.cpp similarity index 100% rename from src/tactic/arith_tactics/bound_manager.cpp rename to src/tactic/arith/bound_manager.cpp diff --git a/src/tactic/arith_tactics/bound_manager.h b/src/tactic/arith/bound_manager.h similarity index 100% rename from src/tactic/arith_tactics/bound_manager.h rename to src/tactic/arith/bound_manager.h diff --git a/src/tactic/arith_tactics/bound_propagator.cpp b/src/tactic/arith/bound_propagator.cpp similarity index 100% rename from src/tactic/arith_tactics/bound_propagator.cpp rename to src/tactic/arith/bound_propagator.cpp diff --git a/src/tactic/arith_tactics/bound_propagator.h b/src/tactic/arith/bound_propagator.h similarity index 100% rename from src/tactic/arith_tactics/bound_propagator.h rename to src/tactic/arith/bound_propagator.h diff --git a/src/tactic/arith_tactics/bv2int_rewriter.cpp b/src/tactic/arith/bv2int_rewriter.cpp similarity index 100% rename from src/tactic/arith_tactics/bv2int_rewriter.cpp rename to src/tactic/arith/bv2int_rewriter.cpp diff --git a/src/tactic/arith_tactics/bv2int_rewriter.h b/src/tactic/arith/bv2int_rewriter.h similarity index 100% rename from src/tactic/arith_tactics/bv2int_rewriter.h rename to src/tactic/arith/bv2int_rewriter.h diff --git a/src/tactic/arith_tactics/bv2real_rewriter.cpp b/src/tactic/arith/bv2real_rewriter.cpp similarity index 100% rename from src/tactic/arith_tactics/bv2real_rewriter.cpp rename to src/tactic/arith/bv2real_rewriter.cpp diff --git a/src/tactic/arith_tactics/bv2real_rewriter.h b/src/tactic/arith/bv2real_rewriter.h similarity index 100% rename from src/tactic/arith_tactics/bv2real_rewriter.h rename to src/tactic/arith/bv2real_rewriter.h diff --git a/src/tactic/arith_tactics/dead/lu.cpp b/src/tactic/arith/dead/lu.cpp similarity index 100% rename from src/tactic/arith_tactics/dead/lu.cpp rename to src/tactic/arith/dead/lu.cpp diff --git a/src/tactic/arith_tactics/dead/lu.h b/src/tactic/arith/dead/lu.h similarity index 100% rename from src/tactic/arith_tactics/dead/lu.h rename to src/tactic/arith/dead/lu.h diff --git a/src/tactic/arith_tactics/dead/mip_tactic.cpp b/src/tactic/arith/dead/mip_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/dead/mip_tactic.cpp rename to src/tactic/arith/dead/mip_tactic.cpp diff --git a/src/tactic/arith_tactics/dead/mip_tactic.h b/src/tactic/arith/dead/mip_tactic.h similarity index 100% rename from src/tactic/arith_tactics/dead/mip_tactic.h rename to src/tactic/arith/dead/mip_tactic.h diff --git a/src/tactic/arith_tactics/dead/smt_arith.cpp b/src/tactic/arith/dead/smt_arith.cpp similarity index 100% rename from src/tactic/arith_tactics/dead/smt_arith.cpp rename to src/tactic/arith/dead/smt_arith.cpp diff --git a/src/tactic/arith_tactics/dead/smt_arith.h b/src/tactic/arith/dead/smt_arith.h similarity index 100% rename from src/tactic/arith_tactics/dead/smt_arith.h rename to src/tactic/arith/dead/smt_arith.h diff --git a/src/tactic/arith_tactics/dead/smt_formula_compiler.cpp b/src/tactic/arith/dead/smt_formula_compiler.cpp similarity index 100% rename from src/tactic/arith_tactics/dead/smt_formula_compiler.cpp rename to src/tactic/arith/dead/smt_formula_compiler.cpp diff --git a/src/tactic/arith_tactics/dead/smt_formula_compiler.h b/src/tactic/arith/dead/smt_formula_compiler.h similarity index 100% rename from src/tactic/arith_tactics/dead/smt_formula_compiler.h rename to src/tactic/arith/dead/smt_formula_compiler.h diff --git a/src/tactic/arith_tactics/dead/smt_solver_exp.cpp b/src/tactic/arith/dead/smt_solver_exp.cpp similarity index 100% rename from src/tactic/arith_tactics/dead/smt_solver_exp.cpp rename to src/tactic/arith/dead/smt_solver_exp.cpp diff --git a/src/tactic/arith_tactics/dead/smt_solver_exp.h b/src/tactic/arith/dead/smt_solver_exp.h similarity index 100% rename from src/tactic/arith_tactics/dead/smt_solver_exp.h rename to src/tactic/arith/dead/smt_solver_exp.h diff --git a/src/tactic/arith_tactics/dead/smt_solver_types.h b/src/tactic/arith/dead/smt_solver_types.h similarity index 100% rename from src/tactic/arith_tactics/dead/smt_solver_types.h rename to src/tactic/arith/dead/smt_solver_types.h diff --git a/src/tactic/arith_tactics/degree_shift_tactic.cpp b/src/tactic/arith/degree_shift_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/degree_shift_tactic.cpp rename to src/tactic/arith/degree_shift_tactic.cpp diff --git a/src/tactic/arith_tactics/degree_shift_tactic.h b/src/tactic/arith/degree_shift_tactic.h similarity index 100% rename from src/tactic/arith_tactics/degree_shift_tactic.h rename to src/tactic/arith/degree_shift_tactic.h diff --git a/src/tactic/arith_tactics/diff_neq_tactic.cpp b/src/tactic/arith/diff_neq_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/diff_neq_tactic.cpp rename to src/tactic/arith/diff_neq_tactic.cpp diff --git a/src/tactic/arith_tactics/diff_neq_tactic.h b/src/tactic/arith/diff_neq_tactic.h similarity index 100% rename from src/tactic/arith_tactics/diff_neq_tactic.h rename to src/tactic/arith/diff_neq_tactic.h diff --git a/src/tactic/arith_tactics/factor_tactic.cpp b/src/tactic/arith/factor_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/factor_tactic.cpp rename to src/tactic/arith/factor_tactic.cpp diff --git a/src/tactic/arith_tactics/factor_tactic.h b/src/tactic/arith/factor_tactic.h similarity index 100% rename from src/tactic/arith_tactics/factor_tactic.h rename to src/tactic/arith/factor_tactic.h diff --git a/src/tactic/arith_tactics/fix_dl_var_tactic.cpp b/src/tactic/arith/fix_dl_var_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/fix_dl_var_tactic.cpp rename to src/tactic/arith/fix_dl_var_tactic.cpp diff --git a/src/tactic/arith_tactics/fix_dl_var_tactic.h b/src/tactic/arith/fix_dl_var_tactic.h similarity index 100% rename from src/tactic/arith_tactics/fix_dl_var_tactic.h rename to src/tactic/arith/fix_dl_var_tactic.h diff --git a/src/tactic/arith_tactics/fm_tactic.cpp b/src/tactic/arith/fm_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/fm_tactic.cpp rename to src/tactic/arith/fm_tactic.cpp diff --git a/src/tactic/arith_tactics/fm_tactic.h b/src/tactic/arith/fm_tactic.h similarity index 100% rename from src/tactic/arith_tactics/fm_tactic.h rename to src/tactic/arith/fm_tactic.h diff --git a/src/tactic/arith_tactics/lia2pb_tactic.cpp b/src/tactic/arith/lia2pb_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/lia2pb_tactic.cpp rename to src/tactic/arith/lia2pb_tactic.cpp diff --git a/src/tactic/arith_tactics/lia2pb_tactic.h b/src/tactic/arith/lia2pb_tactic.h similarity index 100% rename from src/tactic/arith_tactics/lia2pb_tactic.h rename to src/tactic/arith/lia2pb_tactic.h diff --git a/src/tactic/arith_tactics/linear_equation.cpp b/src/tactic/arith/linear_equation.cpp similarity index 100% rename from src/tactic/arith_tactics/linear_equation.cpp rename to src/tactic/arith/linear_equation.cpp diff --git a/src/tactic/arith_tactics/linear_equation.h b/src/tactic/arith/linear_equation.h similarity index 100% rename from src/tactic/arith_tactics/linear_equation.h rename to src/tactic/arith/linear_equation.h diff --git a/src/tactic/arith_tactics/nla2bv_tactic.cpp b/src/tactic/arith/nla2bv_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/nla2bv_tactic.cpp rename to src/tactic/arith/nla2bv_tactic.cpp diff --git a/src/tactic/arith_tactics/nla2bv_tactic.h b/src/tactic/arith/nla2bv_tactic.h similarity index 100% rename from src/tactic/arith_tactics/nla2bv_tactic.h rename to src/tactic/arith/nla2bv_tactic.h diff --git a/src/tactic/arith_tactics/normalize_bounds_tactic.cpp b/src/tactic/arith/normalize_bounds_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/normalize_bounds_tactic.cpp rename to src/tactic/arith/normalize_bounds_tactic.cpp diff --git a/src/tactic/arith_tactics/normalize_bounds_tactic.h b/src/tactic/arith/normalize_bounds_tactic.h similarity index 100% rename from src/tactic/arith_tactics/normalize_bounds_tactic.h rename to src/tactic/arith/normalize_bounds_tactic.h diff --git a/src/tactic/arith_tactics/pb2bv_model_converter.cpp b/src/tactic/arith/pb2bv_model_converter.cpp similarity index 100% rename from src/tactic/arith_tactics/pb2bv_model_converter.cpp rename to src/tactic/arith/pb2bv_model_converter.cpp diff --git a/src/tactic/arith_tactics/pb2bv_model_converter.h b/src/tactic/arith/pb2bv_model_converter.h similarity index 100% rename from src/tactic/arith_tactics/pb2bv_model_converter.h rename to src/tactic/arith/pb2bv_model_converter.h diff --git a/src/tactic/arith_tactics/pb2bv_tactic.cpp b/src/tactic/arith/pb2bv_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/pb2bv_tactic.cpp rename to src/tactic/arith/pb2bv_tactic.cpp diff --git a/src/tactic/arith_tactics/pb2bv_tactic.h b/src/tactic/arith/pb2bv_tactic.h similarity index 100% rename from src/tactic/arith_tactics/pb2bv_tactic.h rename to src/tactic/arith/pb2bv_tactic.h diff --git a/src/tactic/arith_tactics/probe_arith.cpp b/src/tactic/arith/probe_arith.cpp similarity index 100% rename from src/tactic/arith_tactics/probe_arith.cpp rename to src/tactic/arith/probe_arith.cpp diff --git a/src/tactic/arith_tactics/probe_arith.h b/src/tactic/arith/probe_arith.h similarity index 100% rename from src/tactic/arith_tactics/probe_arith.h rename to src/tactic/arith/probe_arith.h diff --git a/src/tactic/arith_tactics/propagate_ineqs_tactic.cpp b/src/tactic/arith/propagate_ineqs_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/propagate_ineqs_tactic.cpp rename to src/tactic/arith/propagate_ineqs_tactic.cpp diff --git a/src/tactic/arith_tactics/propagate_ineqs_tactic.h b/src/tactic/arith/propagate_ineqs_tactic.h similarity index 100% rename from src/tactic/arith_tactics/propagate_ineqs_tactic.h rename to src/tactic/arith/propagate_ineqs_tactic.h diff --git a/src/tactic/arith_tactics/purify_arith_tactic.cpp b/src/tactic/arith/purify_arith_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/purify_arith_tactic.cpp rename to src/tactic/arith/purify_arith_tactic.cpp diff --git a/src/tactic/arith_tactics/purify_arith_tactic.h b/src/tactic/arith/purify_arith_tactic.h similarity index 100% rename from src/tactic/arith_tactics/purify_arith_tactic.h rename to src/tactic/arith/purify_arith_tactic.h diff --git a/src/tactic/arith_tactics/recover_01_tactic.cpp b/src/tactic/arith/recover_01_tactic.cpp similarity index 100% rename from src/tactic/arith_tactics/recover_01_tactic.cpp rename to src/tactic/arith/recover_01_tactic.cpp diff --git a/src/tactic/arith_tactics/recover_01_tactic.h b/src/tactic/arith/recover_01_tactic.h similarity index 100% rename from src/tactic/arith_tactics/recover_01_tactic.h rename to src/tactic/arith/recover_01_tactic.h diff --git a/src/tactic/bv_tactics/bit_blaster_tactic.cpp b/src/tactic/bv/bit_blaster_tactic.cpp similarity index 100% rename from src/tactic/bv_tactics/bit_blaster_tactic.cpp rename to src/tactic/bv/bit_blaster_tactic.cpp diff --git a/src/tactic/bv_tactics/bit_blaster_tactic.h b/src/tactic/bv/bit_blaster_tactic.h similarity index 100% rename from src/tactic/bv_tactics/bit_blaster_tactic.h rename to src/tactic/bv/bit_blaster_tactic.h diff --git a/src/tactic/bv_tactics/bv_size_reduction_tactic.cpp b/src/tactic/bv/bv_size_reduction_tactic.cpp similarity index 100% rename from src/tactic/bv_tactics/bv_size_reduction_tactic.cpp rename to src/tactic/bv/bv_size_reduction_tactic.cpp diff --git a/src/tactic/bv_tactics/bv_size_reduction_tactic.h b/src/tactic/bv/bv_size_reduction_tactic.h similarity index 100% rename from src/tactic/bv_tactics/bv_size_reduction_tactic.h rename to src/tactic/bv/bv_size_reduction_tactic.h diff --git a/src/tactic/bv_tactics/max_bv_sharing_tactic.cpp b/src/tactic/bv/max_bv_sharing_tactic.cpp similarity index 100% rename from src/tactic/bv_tactics/max_bv_sharing_tactic.cpp rename to src/tactic/bv/max_bv_sharing_tactic.cpp diff --git a/src/tactic/bv_tactics/max_bv_sharing_tactic.h b/src/tactic/bv/max_bv_sharing_tactic.h similarity index 100% rename from src/tactic/bv_tactics/max_bv_sharing_tactic.h rename to src/tactic/bv/max_bv_sharing_tactic.h diff --git a/src/tactic/core_tactics/cofactor_elim_term_ite.cpp b/src/tactic/core/cofactor_elim_term_ite.cpp similarity index 100% rename from src/tactic/core_tactics/cofactor_elim_term_ite.cpp rename to src/tactic/core/cofactor_elim_term_ite.cpp diff --git a/src/tactic/core_tactics/cofactor_elim_term_ite.h b/src/tactic/core/cofactor_elim_term_ite.h similarity index 100% rename from src/tactic/core_tactics/cofactor_elim_term_ite.h rename to src/tactic/core/cofactor_elim_term_ite.h diff --git a/src/tactic/core_tactics/cofactor_term_ite_tactic.cpp b/src/tactic/core/cofactor_term_ite_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/cofactor_term_ite_tactic.cpp rename to src/tactic/core/cofactor_term_ite_tactic.cpp diff --git a/src/tactic/core_tactics/cofactor_term_ite_tactic.h b/src/tactic/core/cofactor_term_ite_tactic.h similarity index 100% rename from src/tactic/core_tactics/cofactor_term_ite_tactic.h rename to src/tactic/core/cofactor_term_ite_tactic.h diff --git a/src/tactic/core_tactics/ctx_simplify_tactic.cpp b/src/tactic/core/ctx_simplify_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/ctx_simplify_tactic.cpp rename to src/tactic/core/ctx_simplify_tactic.cpp diff --git a/src/tactic/core_tactics/ctx_simplify_tactic.h b/src/tactic/core/ctx_simplify_tactic.h similarity index 100% rename from src/tactic/core_tactics/ctx_simplify_tactic.h rename to src/tactic/core/ctx_simplify_tactic.h diff --git a/src/tactic/core_tactics/der_tactic.cpp b/src/tactic/core/der_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/der_tactic.cpp rename to src/tactic/core/der_tactic.cpp diff --git a/src/tactic/core_tactics/der_tactic.h b/src/tactic/core/der_tactic.h similarity index 100% rename from src/tactic/core_tactics/der_tactic.h rename to src/tactic/core/der_tactic.h diff --git a/src/tactic/core_tactics/distribute_forall_tactic.cpp b/src/tactic/core/distribute_forall_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/distribute_forall_tactic.cpp rename to src/tactic/core/distribute_forall_tactic.cpp diff --git a/src/tactic/core_tactics/distribute_forall_tactic.h b/src/tactic/core/distribute_forall_tactic.h similarity index 100% rename from src/tactic/core_tactics/distribute_forall_tactic.h rename to src/tactic/core/distribute_forall_tactic.h diff --git a/src/tactic/core_tactics/elim_term_ite_tactic.cpp b/src/tactic/core/elim_term_ite_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/elim_term_ite_tactic.cpp rename to src/tactic/core/elim_term_ite_tactic.cpp diff --git a/src/tactic/core_tactics/elim_term_ite_tactic.h b/src/tactic/core/elim_term_ite_tactic.h similarity index 100% rename from src/tactic/core_tactics/elim_term_ite_tactic.h rename to src/tactic/core/elim_term_ite_tactic.h diff --git a/src/tactic/core_tactics/elim_uncnstr_tactic.cpp b/src/tactic/core/elim_uncnstr_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/elim_uncnstr_tactic.cpp rename to src/tactic/core/elim_uncnstr_tactic.cpp diff --git a/src/tactic/core_tactics/elim_uncnstr_tactic.h b/src/tactic/core/elim_uncnstr_tactic.h similarity index 100% rename from src/tactic/core_tactics/elim_uncnstr_tactic.h rename to src/tactic/core/elim_uncnstr_tactic.h diff --git a/src/tactic/core_tactics/nnf_tactic.cpp b/src/tactic/core/nnf_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/nnf_tactic.cpp rename to src/tactic/core/nnf_tactic.cpp diff --git a/src/tactic/core_tactics/nnf_tactic.h b/src/tactic/core/nnf_tactic.h similarity index 100% rename from src/tactic/core_tactics/nnf_tactic.h rename to src/tactic/core/nnf_tactic.h diff --git a/src/tactic/core_tactics/occf_tactic.cpp b/src/tactic/core/occf_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/occf_tactic.cpp rename to src/tactic/core/occf_tactic.cpp diff --git a/src/tactic/core_tactics/occf_tactic.h b/src/tactic/core/occf_tactic.h similarity index 100% rename from src/tactic/core_tactics/occf_tactic.h rename to src/tactic/core/occf_tactic.h diff --git a/src/tactic/core_tactics/propagate_values_tactic.cpp b/src/tactic/core/propagate_values_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/propagate_values_tactic.cpp rename to src/tactic/core/propagate_values_tactic.cpp diff --git a/src/tactic/core_tactics/propagate_values_tactic.h b/src/tactic/core/propagate_values_tactic.h similarity index 100% rename from src/tactic/core_tactics/propagate_values_tactic.h rename to src/tactic/core/propagate_values_tactic.h diff --git a/src/tactic/core_tactics/reduce_args_tactic.cpp b/src/tactic/core/reduce_args_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/reduce_args_tactic.cpp rename to src/tactic/core/reduce_args_tactic.cpp diff --git a/src/tactic/core_tactics/reduce_args_tactic.h b/src/tactic/core/reduce_args_tactic.h similarity index 100% rename from src/tactic/core_tactics/reduce_args_tactic.h rename to src/tactic/core/reduce_args_tactic.h diff --git a/src/tactic/core_tactics/simplify_tactic.cpp b/src/tactic/core/simplify_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/simplify_tactic.cpp rename to src/tactic/core/simplify_tactic.cpp diff --git a/src/tactic/core_tactics/simplify_tactic.h b/src/tactic/core/simplify_tactic.h similarity index 100% rename from src/tactic/core_tactics/simplify_tactic.h rename to src/tactic/core/simplify_tactic.h diff --git a/src/tactic/core_tactics/solve_eqs_tactic.cpp b/src/tactic/core/solve_eqs_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/solve_eqs_tactic.cpp rename to src/tactic/core/solve_eqs_tactic.cpp diff --git a/src/tactic/core_tactics/solve_eqs_tactic.h b/src/tactic/core/solve_eqs_tactic.h similarity index 100% rename from src/tactic/core_tactics/solve_eqs_tactic.h rename to src/tactic/core/solve_eqs_tactic.h diff --git a/src/tactic/core_tactics/split_clause_tactic.cpp b/src/tactic/core/split_clause_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/split_clause_tactic.cpp rename to src/tactic/core/split_clause_tactic.cpp diff --git a/src/tactic/core_tactics/split_clause_tactic.h b/src/tactic/core/split_clause_tactic.h similarity index 100% rename from src/tactic/core_tactics/split_clause_tactic.h rename to src/tactic/core/split_clause_tactic.h diff --git a/src/tactic/core_tactics/symmetry_reduce_tactic.cpp b/src/tactic/core/symmetry_reduce_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/symmetry_reduce_tactic.cpp rename to src/tactic/core/symmetry_reduce_tactic.cpp diff --git a/src/tactic/core_tactics/symmetry_reduce_tactic.h b/src/tactic/core/symmetry_reduce_tactic.h similarity index 100% rename from src/tactic/core_tactics/symmetry_reduce_tactic.h rename to src/tactic/core/symmetry_reduce_tactic.h diff --git a/src/tactic/core_tactics/tseitin_cnf_tactic.cpp b/src/tactic/core/tseitin_cnf_tactic.cpp similarity index 100% rename from src/tactic/core_tactics/tseitin_cnf_tactic.cpp rename to src/tactic/core/tseitin_cnf_tactic.cpp diff --git a/src/tactic/core_tactics/tseitin_cnf_tactic.h b/src/tactic/core/tseitin_cnf_tactic.h similarity index 100% rename from src/tactic/core_tactics/tseitin_cnf_tactic.h rename to src/tactic/core/tseitin_cnf_tactic.h diff --git a/src/tactic/nlsat_tactic/goal2nlsat.cpp b/src/tactic/nlsat/goal2nlsat.cpp similarity index 100% rename from src/tactic/nlsat_tactic/goal2nlsat.cpp rename to src/tactic/nlsat/goal2nlsat.cpp diff --git a/src/tactic/nlsat_tactic/goal2nlsat.h b/src/tactic/nlsat/goal2nlsat.h similarity index 100% rename from src/tactic/nlsat_tactic/goal2nlsat.h rename to src/tactic/nlsat/goal2nlsat.h diff --git a/src/tactic/nlsat_tactic/nlsat_tactic.cpp b/src/tactic/nlsat/nlsat_tactic.cpp similarity index 100% rename from src/tactic/nlsat_tactic/nlsat_tactic.cpp rename to src/tactic/nlsat/nlsat_tactic.cpp diff --git a/src/tactic/nlsat_tactic/nlsat_tactic.h b/src/tactic/nlsat/nlsat_tactic.h similarity index 100% rename from src/tactic/nlsat_tactic/nlsat_tactic.h rename to src/tactic/nlsat/nlsat_tactic.h diff --git a/src/tactic/nlsat_tactic/qfnra_nlsat_tactic.cpp b/src/tactic/nlsat/qfnra_nlsat_tactic.cpp similarity index 100% rename from src/tactic/nlsat_tactic/qfnra_nlsat_tactic.cpp rename to src/tactic/nlsat/qfnra_nlsat_tactic.cpp diff --git a/src/tactic/nlsat_tactic/qfnra_nlsat_tactic.h b/src/tactic/nlsat/qfnra_nlsat_tactic.h similarity index 100% rename from src/tactic/nlsat_tactic/qfnra_nlsat_tactic.h rename to src/tactic/nlsat/qfnra_nlsat_tactic.h diff --git a/src/tactic/sat_tactic/atom2bool_var.cpp b/src/tactic/sat/atom2bool_var.cpp similarity index 100% rename from src/tactic/sat_tactic/atom2bool_var.cpp rename to src/tactic/sat/atom2bool_var.cpp diff --git a/src/tactic/sat_tactic/atom2bool_var.h b/src/tactic/sat/atom2bool_var.h similarity index 100% rename from src/tactic/sat_tactic/atom2bool_var.h rename to src/tactic/sat/atom2bool_var.h diff --git a/src/tactic/sat_tactic/goal2sat.cpp b/src/tactic/sat/goal2sat.cpp similarity index 100% rename from src/tactic/sat_tactic/goal2sat.cpp rename to src/tactic/sat/goal2sat.cpp diff --git a/src/tactic/sat_tactic/goal2sat.h b/src/tactic/sat/goal2sat.h similarity index 100% rename from src/tactic/sat_tactic/goal2sat.h rename to src/tactic/sat/goal2sat.h diff --git a/src/tactic/sat_tactic/sat_tactic.cpp b/src/tactic/sat/sat_tactic.cpp similarity index 100% rename from src/tactic/sat_tactic/sat_tactic.cpp rename to src/tactic/sat/sat_tactic.cpp diff --git a/src/tactic/sat_tactic/sat_tactic.h b/src/tactic/sat/sat_tactic.h similarity index 100% rename from src/tactic/sat_tactic/sat_tactic.h rename to src/tactic/sat/sat_tactic.h diff --git a/src/tactic/sls_tactic/sls_strategy.h b/src/tactic/sls/sls_strategy.h similarity index 100% rename from src/tactic/sls_tactic/sls_strategy.h rename to src/tactic/sls/sls_strategy.h diff --git a/src/tactic/sls_tactic/sls_tactic.cpp b/src/tactic/sls/sls_tactic.cpp similarity index 100% rename from src/tactic/sls_tactic/sls_tactic.cpp rename to src/tactic/sls/sls_tactic.cpp diff --git a/src/tactic/sls_tactic/sls_tactic.h b/src/tactic/sls/sls_tactic.h similarity index 100% rename from src/tactic/sls_tactic/sls_tactic.h rename to src/tactic/sls/sls_tactic.h diff --git a/src/tactic/smt_tactic/smt_tactic.cpp b/src/tactic/smt/smt_tactic.cpp similarity index 100% rename from src/tactic/smt_tactic/smt_tactic.cpp rename to src/tactic/smt/smt_tactic.cpp diff --git a/src/tactic/smt_tactic/smt_tactic.h b/src/tactic/smt/smt_tactic.h similarity index 100% rename from src/tactic/smt_tactic/smt_tactic.h rename to src/tactic/smt/smt_tactic.h diff --git a/src/tactic/smtlogic_tactics/nra_tactic.cpp b/src/tactic/smtlogics/nra_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/nra_tactic.cpp rename to src/tactic/smtlogics/nra_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/nra_tactic.h b/src/tactic/smtlogics/nra_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/nra_tactic.h rename to src/tactic/smtlogics/nra_tactic.h diff --git a/src/tactic/smtlogic_tactics/qfaufbv_tactic.cpp b/src/tactic/smtlogics/qfaufbv_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qfaufbv_tactic.cpp rename to src/tactic/smtlogics/qfaufbv_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qfaufbv_tactic.h b/src/tactic/smtlogics/qfaufbv_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qfaufbv_tactic.h rename to src/tactic/smtlogics/qfaufbv_tactic.h diff --git a/src/tactic/smtlogic_tactics/qfauflia_tactic.cpp b/src/tactic/smtlogics/qfauflia_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qfauflia_tactic.cpp rename to src/tactic/smtlogics/qfauflia_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qfauflia_tactic.h b/src/tactic/smtlogics/qfauflia_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qfauflia_tactic.h rename to src/tactic/smtlogics/qfauflia_tactic.h diff --git a/src/tactic/smtlogic_tactics/qfbv_tactic.cpp b/src/tactic/smtlogics/qfbv_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qfbv_tactic.cpp rename to src/tactic/smtlogics/qfbv_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qfbv_tactic.h b/src/tactic/smtlogics/qfbv_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qfbv_tactic.h rename to src/tactic/smtlogics/qfbv_tactic.h diff --git a/src/tactic/smtlogic_tactics/qfidl_tactic.cpp b/src/tactic/smtlogics/qfidl_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qfidl_tactic.cpp rename to src/tactic/smtlogics/qfidl_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qfidl_tactic.h b/src/tactic/smtlogics/qfidl_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qfidl_tactic.h rename to src/tactic/smtlogics/qfidl_tactic.h diff --git a/src/tactic/smtlogic_tactics/qflia_tactic.cpp b/src/tactic/smtlogics/qflia_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qflia_tactic.cpp rename to src/tactic/smtlogics/qflia_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qflia_tactic.h b/src/tactic/smtlogics/qflia_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qflia_tactic.h rename to src/tactic/smtlogics/qflia_tactic.h diff --git a/src/tactic/smtlogic_tactics/qflra_tactic.cpp b/src/tactic/smtlogics/qflra_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qflra_tactic.cpp rename to src/tactic/smtlogics/qflra_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qflra_tactic.h b/src/tactic/smtlogics/qflra_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qflra_tactic.h rename to src/tactic/smtlogics/qflra_tactic.h diff --git a/src/tactic/smtlogic_tactics/qfnia_tactic.cpp b/src/tactic/smtlogics/qfnia_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qfnia_tactic.cpp rename to src/tactic/smtlogics/qfnia_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qfnia_tactic.h b/src/tactic/smtlogics/qfnia_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qfnia_tactic.h rename to src/tactic/smtlogics/qfnia_tactic.h diff --git a/src/tactic/smtlogic_tactics/qfnra_tactic.cpp b/src/tactic/smtlogics/qfnra_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qfnra_tactic.cpp rename to src/tactic/smtlogics/qfnra_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qfnra_tactic.h b/src/tactic/smtlogics/qfnra_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qfnra_tactic.h rename to src/tactic/smtlogics/qfnra_tactic.h diff --git a/src/tactic/smtlogic_tactics/qfuf_tactic.cpp b/src/tactic/smtlogics/qfuf_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qfuf_tactic.cpp rename to src/tactic/smtlogics/qfuf_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qfuf_tactic.h b/src/tactic/smtlogics/qfuf_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qfuf_tactic.h rename to src/tactic/smtlogics/qfuf_tactic.h diff --git a/src/tactic/smtlogic_tactics/qfufbv_tactic.cpp b/src/tactic/smtlogics/qfufbv_tactic.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/qfufbv_tactic.cpp rename to src/tactic/smtlogics/qfufbv_tactic.cpp diff --git a/src/tactic/smtlogic_tactics/qfufbv_tactic.h b/src/tactic/smtlogics/qfufbv_tactic.h similarity index 100% rename from src/tactic/smtlogic_tactics/qfufbv_tactic.h rename to src/tactic/smtlogics/qfufbv_tactic.h diff --git a/src/tactic/smtlogic_tactics/quant_tactics.cpp b/src/tactic/smtlogics/quant_tactics.cpp similarity index 100% rename from src/tactic/smtlogic_tactics/quant_tactics.cpp rename to src/tactic/smtlogics/quant_tactics.cpp diff --git a/src/tactic/smtlogic_tactics/quant_tactics.h b/src/tactic/smtlogics/quant_tactics.h similarity index 100% rename from src/tactic/smtlogic_tactics/quant_tactics.h rename to src/tactic/smtlogics/quant_tactics.h diff --git a/src/tactic/subpaving_tactic/expr2subpaving.cpp b/src/tactic/subpaving/expr2subpaving.cpp similarity index 100% rename from src/tactic/subpaving_tactic/expr2subpaving.cpp rename to src/tactic/subpaving/expr2subpaving.cpp diff --git a/src/tactic/subpaving_tactic/expr2subpaving.h b/src/tactic/subpaving/expr2subpaving.h similarity index 100% rename from src/tactic/subpaving_tactic/expr2subpaving.h rename to src/tactic/subpaving/expr2subpaving.h diff --git a/src/tactic/subpaving_tactic/subpaving_tactic.cpp b/src/tactic/subpaving/subpaving_tactic.cpp similarity index 100% rename from src/tactic/subpaving_tactic/subpaving_tactic.cpp rename to src/tactic/subpaving/subpaving_tactic.cpp diff --git a/src/tactic/subpaving_tactic/subpaving_tactic.h b/src/tactic/subpaving/subpaving_tactic.h similarity index 100% rename from src/tactic/subpaving_tactic/subpaving_tactic.h rename to src/tactic/subpaving/subpaving_tactic.h diff --git a/src/tactic/ufbv_tactic/ufbv_rewriter.cpp b/src/tactic/ufbv/ufbv_rewriter.cpp similarity index 100% rename from src/tactic/ufbv_tactic/ufbv_rewriter.cpp rename to src/tactic/ufbv/ufbv_rewriter.cpp diff --git a/src/tactic/ufbv_tactic/ufbv_rewriter.h b/src/tactic/ufbv/ufbv_rewriter.h similarity index 100% rename from src/tactic/ufbv_tactic/ufbv_rewriter.h rename to src/tactic/ufbv/ufbv_rewriter.h diff --git a/src/tactic/ufbv_tactic/ufbv_tactic.cpp b/src/tactic/ufbv/ufbv_tactic.cpp similarity index 100% rename from src/tactic/ufbv_tactic/ufbv_tactic.cpp rename to src/tactic/ufbv/ufbv_tactic.cpp diff --git a/src/tactic/ufbv_tactic/ufbv_tactic.h b/src/tactic/ufbv/ufbv_tactic.h similarity index 100% rename from src/tactic/ufbv_tactic/ufbv_tactic.h rename to src/tactic/ufbv/ufbv_tactic.h