diff --git a/scripts/mk_project.py b/scripts/mk_project.py index d6c97c8ac..7c1786f29 100644 --- a/scripts/mk_project.py +++ b/scripts/mk_project.py @@ -32,10 +32,10 @@ def init_project_def(): add_lib('simplifier', ['rewriter', 'old_params'], 'ast/simplifier') add_lib('normal_forms', ['rewriter', 'simplifier'], 'ast/normal_forms') add_lib('core_tactics', ['tactic', 'normal_forms'], 'tactic/core') - add_lib('sat_tactic', ['tactic', 'sat'], 'tactic/sat') + add_lib('sat_tactic', ['tactic', 'sat'], 'sat/tactic') 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('nlsat_tactic', ['nlsat', 'sat_tactic', 'arith_tactics'], 'nlsat/tactic') + add_lib('subpaving_tactic', ['core_tactics', 'subpaving'], 'math/subpaving/tactic') add_lib('aig_tactic', ['tactic'], 'tactic/aig') add_lib('cmd_context', ['tactic', 'rewriter', 'model', 'old_params']) add_lib('extra_cmds', ['cmd_context', 'subpaving_tactic', 'arith_tactics'], 'cmd_context/extra_cmds') @@ -68,9 +68,9 @@ def init_project_def(): reexports=['api'], dll_name='libz3', export_files=API_files) - add_dot_net_dll('dotnet', ['api_dll'], 'bindings/dotnet', dll_name='Microsoft.Z3', assembly_info_dir='Properties') - add_hlib('cpp', 'bindings/c++', includes2install=['z3++.h']) - set_z3py_dir('bindings/python') + add_dot_net_dll('dotnet', ['api_dll'], 'api/dotnet', dll_name='Microsoft.Z3', assembly_info_dir='Properties') + add_hlib('cpp', 'api/c++', includes2install=['z3++.h']) + set_z3py_dir('api/python') # Examples add_cpp_example('cpp_example', 'c++') add_c_example('c_example', 'c') diff --git a/src/bindings/c++/z3++.h b/src/api/c++/z3++.h similarity index 100% rename from src/bindings/c++/z3++.h rename to src/api/c++/z3++.h diff --git a/src/bindings/dotnet/AST.cs b/src/api/dotnet/AST.cs similarity index 100% rename from src/bindings/dotnet/AST.cs rename to src/api/dotnet/AST.cs diff --git a/src/bindings/dotnet/ASTMap.cs b/src/api/dotnet/ASTMap.cs similarity index 100% rename from src/bindings/dotnet/ASTMap.cs rename to src/api/dotnet/ASTMap.cs diff --git a/src/bindings/dotnet/ASTVector.cs b/src/api/dotnet/ASTVector.cs similarity index 100% rename from src/bindings/dotnet/ASTVector.cs rename to src/api/dotnet/ASTVector.cs diff --git a/src/bindings/dotnet/ApplyResult.cs b/src/api/dotnet/ApplyResult.cs similarity index 100% rename from src/bindings/dotnet/ApplyResult.cs rename to src/api/dotnet/ApplyResult.cs diff --git a/src/bindings/dotnet/Constructor.cs b/src/api/dotnet/Constructor.cs similarity index 100% rename from src/bindings/dotnet/Constructor.cs rename to src/api/dotnet/Constructor.cs diff --git a/src/bindings/dotnet/Context.cs b/src/api/dotnet/Context.cs similarity index 100% rename from src/bindings/dotnet/Context.cs rename to src/api/dotnet/Context.cs diff --git a/src/bindings/dotnet/DecRefQUeue.cs b/src/api/dotnet/DecRefQUeue.cs similarity index 100% rename from src/bindings/dotnet/DecRefQUeue.cs rename to src/api/dotnet/DecRefQUeue.cs diff --git a/src/bindings/dotnet/Expr.cs b/src/api/dotnet/Expr.cs similarity index 100% rename from src/bindings/dotnet/Expr.cs rename to src/api/dotnet/Expr.cs diff --git a/src/bindings/dotnet/Fixedpoint.cs b/src/api/dotnet/Fixedpoint.cs similarity index 100% rename from src/bindings/dotnet/Fixedpoint.cs rename to src/api/dotnet/Fixedpoint.cs diff --git a/src/bindings/dotnet/FuncDecl.cs b/src/api/dotnet/FuncDecl.cs similarity index 100% rename from src/bindings/dotnet/FuncDecl.cs rename to src/api/dotnet/FuncDecl.cs diff --git a/src/bindings/dotnet/FuncInterp.cs b/src/api/dotnet/FuncInterp.cs similarity index 100% rename from src/bindings/dotnet/FuncInterp.cs rename to src/api/dotnet/FuncInterp.cs diff --git a/src/bindings/dotnet/Goal.cs b/src/api/dotnet/Goal.cs similarity index 100% rename from src/bindings/dotnet/Goal.cs rename to src/api/dotnet/Goal.cs diff --git a/src/bindings/dotnet/Log.cs b/src/api/dotnet/Log.cs similarity index 100% rename from src/bindings/dotnet/Log.cs rename to src/api/dotnet/Log.cs diff --git a/src/bindings/dotnet/Microsoft.Z3.csproj b/src/api/dotnet/Microsoft.Z3.csproj similarity index 100% rename from src/bindings/dotnet/Microsoft.Z3.csproj rename to src/api/dotnet/Microsoft.Z3.csproj diff --git a/src/bindings/dotnet/Microsoft.Z3_35.csproj b/src/api/dotnet/Microsoft.Z3_35.csproj similarity index 100% rename from src/bindings/dotnet/Microsoft.Z3_35.csproj rename to src/api/dotnet/Microsoft.Z3_35.csproj diff --git a/src/bindings/dotnet/Model.cs b/src/api/dotnet/Model.cs similarity index 100% rename from src/bindings/dotnet/Model.cs rename to src/api/dotnet/Model.cs diff --git a/src/bindings/dotnet/Numeral.cs b/src/api/dotnet/Numeral.cs similarity index 100% rename from src/bindings/dotnet/Numeral.cs rename to src/api/dotnet/Numeral.cs diff --git a/src/bindings/dotnet/ParamDescrs.cs b/src/api/dotnet/ParamDescrs.cs similarity index 100% rename from src/bindings/dotnet/ParamDescrs.cs rename to src/api/dotnet/ParamDescrs.cs diff --git a/src/bindings/dotnet/Params.cs b/src/api/dotnet/Params.cs similarity index 100% rename from src/bindings/dotnet/Params.cs rename to src/api/dotnet/Params.cs diff --git a/src/bindings/dotnet/Pattern.cs b/src/api/dotnet/Pattern.cs similarity index 100% rename from src/bindings/dotnet/Pattern.cs rename to src/api/dotnet/Pattern.cs diff --git a/src/bindings/dotnet/Probe.cs b/src/api/dotnet/Probe.cs similarity index 100% rename from src/bindings/dotnet/Probe.cs rename to src/api/dotnet/Probe.cs diff --git a/src/bindings/dotnet/Properties/AssemblyInfo.cs b/src/api/dotnet/Properties/AssemblyInfo.cs similarity index 100% rename from src/bindings/dotnet/Properties/AssemblyInfo.cs rename to src/api/dotnet/Properties/AssemblyInfo.cs diff --git a/src/bindings/dotnet/Quantifier.cs b/src/api/dotnet/Quantifier.cs similarity index 100% rename from src/bindings/dotnet/Quantifier.cs rename to src/api/dotnet/Quantifier.cs diff --git a/src/bindings/dotnet/Solver.cs b/src/api/dotnet/Solver.cs similarity index 100% rename from src/bindings/dotnet/Solver.cs rename to src/api/dotnet/Solver.cs diff --git a/src/bindings/dotnet/Sort.cs b/src/api/dotnet/Sort.cs similarity index 100% rename from src/bindings/dotnet/Sort.cs rename to src/api/dotnet/Sort.cs diff --git a/src/bindings/dotnet/Statistics.cs b/src/api/dotnet/Statistics.cs similarity index 100% rename from src/bindings/dotnet/Statistics.cs rename to src/api/dotnet/Statistics.cs diff --git a/src/bindings/dotnet/Status.cs b/src/api/dotnet/Status.cs similarity index 100% rename from src/bindings/dotnet/Status.cs rename to src/api/dotnet/Status.cs diff --git a/src/bindings/dotnet/Symbol.cs b/src/api/dotnet/Symbol.cs similarity index 100% rename from src/bindings/dotnet/Symbol.cs rename to src/api/dotnet/Symbol.cs diff --git a/src/bindings/dotnet/Tactic.cs b/src/api/dotnet/Tactic.cs similarity index 100% rename from src/bindings/dotnet/Tactic.cs rename to src/api/dotnet/Tactic.cs diff --git a/src/bindings/dotnet/Version.cs b/src/api/dotnet/Version.cs similarity index 100% rename from src/bindings/dotnet/Version.cs rename to src/api/dotnet/Version.cs diff --git a/src/bindings/dotnet/Z3Exception.cs b/src/api/dotnet/Z3Exception.cs similarity index 100% rename from src/bindings/dotnet/Z3Exception.cs rename to src/api/dotnet/Z3Exception.cs diff --git a/src/bindings/dotnet/Z3Object.cs b/src/api/dotnet/Z3Object.cs similarity index 100% rename from src/bindings/dotnet/Z3Object.cs rename to src/api/dotnet/Z3Object.cs diff --git a/src/bindings/dotnet/dead/Microsoft.Z3V3/AssemblyInfo.cpp b/src/api/dotnet/dead/Microsoft.Z3V3/AssemblyInfo.cpp similarity index 100% rename from src/bindings/dotnet/dead/Microsoft.Z3V3/AssemblyInfo.cpp rename to src/api/dotnet/dead/Microsoft.Z3V3/AssemblyInfo.cpp diff --git a/src/bindings/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.cpp b/src/api/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.cpp similarity index 100% rename from src/bindings/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.cpp rename to src/api/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.cpp diff --git a/src/bindings/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.h b/src/api/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.h similarity index 100% rename from src/bindings/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.h rename to src/api/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.h diff --git a/src/bindings/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.vcxproj b/src/api/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.vcxproj similarity index 100% rename from src/bindings/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.vcxproj rename to src/api/dotnet/dead/Microsoft.Z3V3/Microsoft.Z3V3.vcxproj diff --git a/src/bindings/ml/README-linux b/src/api/ml/README-linux similarity index 100% rename from src/bindings/ml/README-linux rename to src/api/ml/README-linux diff --git a/src/bindings/ml/README-osx b/src/api/ml/README-osx similarity index 100% rename from src/bindings/ml/README-osx rename to src/api/ml/README-osx diff --git a/src/bindings/ml/README-test-linux b/src/api/ml/README-test-linux similarity index 100% rename from src/bindings/ml/README-test-linux rename to src/api/ml/README-test-linux diff --git a/src/bindings/ml/README-test-osx b/src/api/ml/README-test-osx similarity index 100% rename from src/bindings/ml/README-test-osx rename to src/api/ml/README-test-osx diff --git a/src/bindings/ml/README-test-win b/src/api/ml/README-test-win similarity index 100% rename from src/bindings/ml/README-test-win rename to src/api/ml/README-test-win diff --git a/src/bindings/ml/README-win b/src/api/ml/README-win similarity index 100% rename from src/bindings/ml/README-win rename to src/api/ml/README-win diff --git a/src/bindings/ml/add_error_checking.V3.sed b/src/api/ml/add_error_checking.V3.sed similarity index 100% rename from src/bindings/ml/add_error_checking.V3.sed rename to src/api/ml/add_error_checking.V3.sed diff --git a/src/bindings/ml/add_error_checking.sed b/src/api/ml/add_error_checking.sed similarity index 100% rename from src/bindings/ml/add_error_checking.sed rename to src/api/ml/add_error_checking.sed diff --git a/src/bindings/ml/build-lib.cmd b/src/api/ml/build-lib.cmd similarity index 100% rename from src/bindings/ml/build-lib.cmd rename to src/api/ml/build-lib.cmd diff --git a/src/bindings/ml/build-lib.sh b/src/api/ml/build-lib.sh similarity index 100% rename from src/bindings/ml/build-lib.sh rename to src/api/ml/build-lib.sh diff --git a/src/bindings/ml/build-test.cmd b/src/api/ml/build-test.cmd similarity index 100% rename from src/bindings/ml/build-test.cmd rename to src/api/ml/build-test.cmd diff --git a/src/bindings/ml/build-test.sh b/src/api/ml/build-test.sh similarity index 100% rename from src/bindings/ml/build-test.sh rename to src/api/ml/build-test.sh diff --git a/src/bindings/ml/build.cmd b/src/api/ml/build.cmd similarity index 100% rename from src/bindings/ml/build.cmd rename to src/api/ml/build.cmd diff --git a/src/bindings/ml/build.sed b/src/api/ml/build.sed similarity index 100% rename from src/bindings/ml/build.sed rename to src/api/ml/build.sed diff --git a/src/bindings/ml/clean.cmd b/src/api/ml/clean.cmd similarity index 100% rename from src/bindings/ml/clean.cmd rename to src/api/ml/clean.cmd diff --git a/src/bindings/ml/cleantmp.cmd b/src/api/ml/cleantmp.cmd similarity index 100% rename from src/bindings/ml/cleantmp.cmd rename to src/api/ml/cleantmp.cmd diff --git a/src/bindings/ml/compile_mlapi.cmd b/src/api/ml/compile_mlapi.cmd similarity index 100% rename from src/bindings/ml/compile_mlapi.cmd rename to src/api/ml/compile_mlapi.cmd diff --git a/src/bindings/ml/error_handling.idl b/src/api/ml/error_handling.idl similarity index 100% rename from src/bindings/ml/error_handling.idl rename to src/api/ml/error_handling.idl diff --git a/src/bindings/ml/exec.cmd b/src/api/ml/exec.cmd similarity index 100% rename from src/bindings/ml/exec.cmd rename to src/api/ml/exec.cmd diff --git a/src/bindings/ml/exec.sh b/src/api/ml/exec.sh similarity index 100% rename from src/bindings/ml/exec.sh rename to src/api/ml/exec.sh diff --git a/src/bindings/ml/generate_mlapi.cmd b/src/api/ml/generate_mlapi.cmd similarity index 100% rename from src/bindings/ml/generate_mlapi.cmd rename to src/api/ml/generate_mlapi.cmd diff --git a/src/bindings/ml/import.cmd b/src/api/ml/import.cmd similarity index 100% rename from src/bindings/ml/import.cmd rename to src/api/ml/import.cmd diff --git a/src/bindings/ml/mlx_get_app_args.idl b/src/api/ml/mlx_get_app_args.idl similarity index 100% rename from src/bindings/ml/mlx_get_app_args.idl rename to src/api/ml/mlx_get_app_args.idl diff --git a/src/bindings/ml/mlx_get_array_sort.idl b/src/api/ml/mlx_get_array_sort.idl similarity index 100% rename from src/bindings/ml/mlx_get_array_sort.idl rename to src/api/ml/mlx_get_array_sort.idl diff --git a/src/bindings/ml/mlx_get_datatype_sort.idl b/src/api/ml/mlx_get_datatype_sort.idl similarity index 100% rename from src/bindings/ml/mlx_get_datatype_sort.idl rename to src/api/ml/mlx_get_datatype_sort.idl diff --git a/src/bindings/ml/mlx_get_domains.idl b/src/api/ml/mlx_get_domains.idl similarity index 100% rename from src/bindings/ml/mlx_get_domains.idl rename to src/api/ml/mlx_get_domains.idl diff --git a/src/bindings/ml/mlx_get_error_msg.idl b/src/api/ml/mlx_get_error_msg.idl similarity index 100% rename from src/bindings/ml/mlx_get_error_msg.idl rename to src/api/ml/mlx_get_error_msg.idl diff --git a/src/bindings/ml/mlx_get_pattern_terms.idl b/src/api/ml/mlx_get_pattern_terms.idl similarity index 100% rename from src/bindings/ml/mlx_get_pattern_terms.idl rename to src/api/ml/mlx_get_pattern_terms.idl diff --git a/src/bindings/ml/mlx_get_tuple_sort.idl b/src/api/ml/mlx_get_tuple_sort.idl similarity index 100% rename from src/bindings/ml/mlx_get_tuple_sort.idl rename to src/api/ml/mlx_get_tuple_sort.idl diff --git a/src/bindings/ml/mlx_mk_context_x.idl b/src/api/ml/mlx_mk_context_x.idl similarity index 100% rename from src/bindings/ml/mlx_mk_context_x.idl rename to src/api/ml/mlx_mk_context_x.idl diff --git a/src/bindings/ml/mlx_mk_datatypes.idl b/src/api/ml/mlx_mk_datatypes.idl similarity index 100% rename from src/bindings/ml/mlx_mk_datatypes.idl rename to src/api/ml/mlx_mk_datatypes.idl diff --git a/src/bindings/ml/mlx_mk_numeral.idl b/src/api/ml/mlx_mk_numeral.idl similarity index 100% rename from src/bindings/ml/mlx_mk_numeral.idl rename to src/api/ml/mlx_mk_numeral.idl diff --git a/src/bindings/ml/mlx_mk_sort.idl b/src/api/ml/mlx_mk_sort.idl similarity index 100% rename from src/bindings/ml/mlx_mk_sort.idl rename to src/api/ml/mlx_mk_sort.idl diff --git a/src/bindings/ml/mlx_mk_symbol.idl b/src/api/ml/mlx_mk_symbol.idl similarity index 100% rename from src/bindings/ml/mlx_mk_symbol.idl rename to src/api/ml/mlx_mk_symbol.idl diff --git a/src/bindings/ml/mlx_model.idl b/src/api/ml/mlx_model.idl similarity index 100% rename from src/bindings/ml/mlx_model.idl rename to src/api/ml/mlx_model.idl diff --git a/src/bindings/ml/mlx_numeral_refine.idl b/src/api/ml/mlx_numeral_refine.idl similarity index 100% rename from src/bindings/ml/mlx_numeral_refine.idl rename to src/api/ml/mlx_numeral_refine.idl diff --git a/src/bindings/ml/mlx_parse_smtlib.idl b/src/api/ml/mlx_parse_smtlib.idl similarity index 100% rename from src/bindings/ml/mlx_parse_smtlib.idl rename to src/api/ml/mlx_parse_smtlib.idl diff --git a/src/bindings/ml/mlx_sort_refine.idl b/src/api/ml/mlx_sort_refine.idl similarity index 100% rename from src/bindings/ml/mlx_sort_refine.idl rename to src/api/ml/mlx_sort_refine.idl diff --git a/src/bindings/ml/mlx_statistics.idl b/src/api/ml/mlx_statistics.idl similarity index 100% rename from src/bindings/ml/mlx_statistics.idl rename to src/api/ml/mlx_statistics.idl diff --git a/src/bindings/ml/mlx_symbol_refine.idl b/src/api/ml/mlx_symbol_refine.idl similarity index 100% rename from src/bindings/ml/mlx_symbol_refine.idl rename to src/api/ml/mlx_symbol_refine.idl diff --git a/src/bindings/ml/mlx_term_refine.idl b/src/api/ml/mlx_term_refine.idl similarity index 100% rename from src/bindings/ml/mlx_term_refine.idl rename to src/api/ml/mlx_term_refine.idl diff --git a/src/bindings/ml/queen.ml b/src/api/ml/queen.ml similarity index 100% rename from src/bindings/ml/queen.ml rename to src/api/ml/queen.ml diff --git a/src/bindings/ml/queen.regress.err b/src/api/ml/queen.regress.err similarity index 100% rename from src/bindings/ml/queen.regress.err rename to src/api/ml/queen.regress.err diff --git a/src/bindings/ml/queen.regress.out b/src/api/ml/queen.regress.out similarity index 100% rename from src/bindings/ml/queen.regress.out rename to src/api/ml/queen.regress.out diff --git a/src/bindings/ml/test_capi.regress.err b/src/api/ml/test_capi.regress.err similarity index 100% rename from src/bindings/ml/test_capi.regress.err rename to src/api/ml/test_capi.regress.err diff --git a/src/bindings/ml/test_capi.regress.out b/src/api/ml/test_capi.regress.out similarity index 100% rename from src/bindings/ml/test_capi.regress.out rename to src/api/ml/test_capi.regress.out diff --git a/src/bindings/ml/test_mlapi.cmd b/src/api/ml/test_mlapi.cmd similarity index 100% rename from src/bindings/ml/test_mlapi.cmd rename to src/api/ml/test_mlapi.cmd diff --git a/src/bindings/ml/test_mlapi.ml b/src/api/ml/test_mlapi.ml similarity index 100% rename from src/bindings/ml/test_mlapi.ml rename to src/api/ml/test_mlapi.ml diff --git a/src/bindings/ml/test_mlapi.regress.err b/src/api/ml/test_mlapi.regress.err similarity index 100% rename from src/bindings/ml/test_mlapi.regress.err rename to src/api/ml/test_mlapi.regress.err diff --git a/src/bindings/ml/test_mlapi.regress.out b/src/api/ml/test_mlapi.regress.out similarity index 100% rename from src/bindings/ml/test_mlapi.regress.out rename to src/api/ml/test_mlapi.regress.out diff --git a/src/bindings/ml/test_mlapiV3.ml b/src/api/ml/test_mlapiV3.ml similarity index 100% rename from src/bindings/ml/test_mlapiV3.ml rename to src/api/ml/test_mlapiV3.ml diff --git a/src/bindings/ml/test_mlapiV3.regress.err b/src/api/ml/test_mlapiV3.regress.err similarity index 100% rename from src/bindings/ml/test_mlapiV3.regress.err rename to src/api/ml/test_mlapiV3.regress.err diff --git a/src/bindings/ml/test_mlapiV3.regress.out b/src/api/ml/test_mlapiV3.regress.out similarity index 100% rename from src/bindings/ml/test_mlapiV3.regress.out rename to src/api/ml/test_mlapiV3.regress.out diff --git a/src/bindings/ml/test_theory.ml b/src/api/ml/test_theory.ml similarity index 100% rename from src/bindings/ml/test_theory.ml rename to src/api/ml/test_theory.ml diff --git a/src/bindings/ml/update-ml-doc.cmd b/src/api/ml/update-ml-doc.cmd similarity index 100% rename from src/bindings/ml/update-ml-doc.cmd rename to src/api/ml/update-ml-doc.cmd diff --git a/src/bindings/ml/x3.ml b/src/api/ml/x3.ml similarity index 100% rename from src/bindings/ml/x3.ml rename to src/api/ml/x3.ml diff --git a/src/bindings/ml/x3V3.ml b/src/api/ml/x3V3.ml similarity index 100% rename from src/bindings/ml/x3V3.ml rename to src/api/ml/x3V3.ml diff --git a/src/bindings/ml/x3V3.mli b/src/api/ml/x3V3.mli similarity index 100% rename from src/bindings/ml/x3V3.mli rename to src/api/ml/x3V3.mli diff --git a/src/bindings/ml/z3.idl b/src/api/ml/z3.idl similarity index 100% rename from src/bindings/ml/z3.idl rename to src/api/ml/z3.idl diff --git a/src/bindings/ml/z3.ml b/src/api/ml/z3.ml similarity index 100% rename from src/bindings/ml/z3.ml rename to src/api/ml/z3.ml diff --git a/src/bindings/ml/z3.mli b/src/api/ml/z3.mli similarity index 100% rename from src/bindings/ml/z3.mli rename to src/api/ml/z3.mli diff --git a/src/bindings/ml/z3_stubs.c b/src/api/ml/z3_stubs.c similarity index 100% rename from src/bindings/ml/z3_stubs.c rename to src/api/ml/z3_stubs.c diff --git a/src/bindings/ml/z3_theory_stubs.c b/src/api/ml/z3_theory_stubs.c similarity index 100% rename from src/bindings/ml/z3_theory_stubs.c rename to src/api/ml/z3_theory_stubs.c diff --git a/src/bindings/python/README.txt b/src/api/python/README.txt similarity index 100% rename from src/bindings/python/README.txt rename to src/api/python/README.txt diff --git a/src/bindings/python/z3.py b/src/api/python/z3.py similarity index 100% rename from src/bindings/python/z3.py rename to src/api/python/z3.py diff --git a/src/bindings/python/z3poly.py b/src/api/python/z3poly.py similarity index 100% rename from src/bindings/python/z3poly.py rename to src/api/python/z3poly.py diff --git a/src/bindings/python/z3printer.py b/src/api/python/z3printer.py similarity index 100% rename from src/bindings/python/z3printer.py rename to src/api/python/z3printer.py diff --git a/src/bindings/python/z3test.py b/src/api/python/z3test.py similarity index 100% rename from src/bindings/python/z3test.py rename to src/api/python/z3test.py diff --git a/src/bindings/python/z3types.py b/src/api/python/z3types.py similarity index 100% rename from src/bindings/python/z3types.py rename to src/api/python/z3types.py diff --git a/src/tactic/subpaving/expr2subpaving.cpp b/src/math/subpaving/tactic/expr2subpaving.cpp similarity index 100% rename from src/tactic/subpaving/expr2subpaving.cpp rename to src/math/subpaving/tactic/expr2subpaving.cpp diff --git a/src/tactic/subpaving/expr2subpaving.h b/src/math/subpaving/tactic/expr2subpaving.h similarity index 100% rename from src/tactic/subpaving/expr2subpaving.h rename to src/math/subpaving/tactic/expr2subpaving.h diff --git a/src/tactic/subpaving/subpaving_tactic.cpp b/src/math/subpaving/tactic/subpaving_tactic.cpp similarity index 100% rename from src/tactic/subpaving/subpaving_tactic.cpp rename to src/math/subpaving/tactic/subpaving_tactic.cpp diff --git a/src/tactic/subpaving/subpaving_tactic.h b/src/math/subpaving/tactic/subpaving_tactic.h similarity index 100% rename from src/tactic/subpaving/subpaving_tactic.h rename to src/math/subpaving/tactic/subpaving_tactic.h diff --git a/src/tactic/nlsat/goal2nlsat.cpp b/src/nlsat/tactic/goal2nlsat.cpp similarity index 100% rename from src/tactic/nlsat/goal2nlsat.cpp rename to src/nlsat/tactic/goal2nlsat.cpp diff --git a/src/tactic/nlsat/goal2nlsat.h b/src/nlsat/tactic/goal2nlsat.h similarity index 100% rename from src/tactic/nlsat/goal2nlsat.h rename to src/nlsat/tactic/goal2nlsat.h diff --git a/src/tactic/nlsat/nlsat_tactic.cpp b/src/nlsat/tactic/nlsat_tactic.cpp similarity index 100% rename from src/tactic/nlsat/nlsat_tactic.cpp rename to src/nlsat/tactic/nlsat_tactic.cpp diff --git a/src/tactic/nlsat/nlsat_tactic.h b/src/nlsat/tactic/nlsat_tactic.h similarity index 100% rename from src/tactic/nlsat/nlsat_tactic.h rename to src/nlsat/tactic/nlsat_tactic.h diff --git a/src/tactic/nlsat/qfnra_nlsat_tactic.cpp b/src/nlsat/tactic/qfnra_nlsat_tactic.cpp similarity index 100% rename from src/tactic/nlsat/qfnra_nlsat_tactic.cpp rename to src/nlsat/tactic/qfnra_nlsat_tactic.cpp diff --git a/src/tactic/nlsat/qfnra_nlsat_tactic.h b/src/nlsat/tactic/qfnra_nlsat_tactic.h similarity index 100% rename from src/tactic/nlsat/qfnra_nlsat_tactic.h rename to src/nlsat/tactic/qfnra_nlsat_tactic.h diff --git a/src/tactic/sat/atom2bool_var.cpp b/src/sat/tactic/atom2bool_var.cpp similarity index 100% rename from src/tactic/sat/atom2bool_var.cpp rename to src/sat/tactic/atom2bool_var.cpp diff --git a/src/tactic/sat/atom2bool_var.h b/src/sat/tactic/atom2bool_var.h similarity index 100% rename from src/tactic/sat/atom2bool_var.h rename to src/sat/tactic/atom2bool_var.h diff --git a/src/tactic/sat/goal2sat.cpp b/src/sat/tactic/goal2sat.cpp similarity index 100% rename from src/tactic/sat/goal2sat.cpp rename to src/sat/tactic/goal2sat.cpp diff --git a/src/tactic/sat/goal2sat.h b/src/sat/tactic/goal2sat.h similarity index 100% rename from src/tactic/sat/goal2sat.h rename to src/sat/tactic/goal2sat.h diff --git a/src/tactic/sat/sat_tactic.cpp b/src/sat/tactic/sat_tactic.cpp similarity index 100% rename from src/tactic/sat/sat_tactic.cpp rename to src/sat/tactic/sat_tactic.cpp diff --git a/src/tactic/sat/sat_tactic.h b/src/sat/tactic/sat_tactic.h similarity index 100% rename from src/tactic/sat/sat_tactic.h rename to src/sat/tactic/sat_tactic.h