make include paths uniformly use path relative to src. #534

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/test/algebraic.cpp

@@ -16,10 +16,10 @@ Author:
 Notes:
 
 --*/
-#include"algebraic_numbers.h"
-#include"polynomial_var2value.h"
-#include"mpbq.h"
-#include"rlimit.h"
+#include "math/polynomial/algebraic_numbers.h"
+#include "math/polynomial/polynomial_var2value.h"
+#include "util/mpbq.h"
+#include "util/rlimit.h"
 
 static void display_anums(std::ostream & out, scoped_anum_vector const & rs) {
     out << "numbers in decimal:\n";

src/test/api.cpp

@@ -5,13 +5,13 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 #ifdef _WINDOWS
-#include "z3.h"
-#include "z3_private.h"
+#include "api/z3.h"
+#include "api/z3_private.h"
 #include <iostream>
-#include "util.h"
-#include "trace.h"
+#include "util/util.h"
+#include "util/trace.h"
 #include <map>
-#include "trace.h"
+#include "util/trace.h"
 
 void test_apps() {
     Z3_config cfg = Z3_mk_config();

src/test/api_bug.cpp

@@ -5,7 +5,7 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 #include<stdio.h>
-#include"z3.h"
+#include "api/z3.h"
 
 void tst_api_bug() {
     unsigned vmajor, vminor, vbuild, vrevision;

src/test/arith_rewriter.cpp

@@ -4,14 +4,14 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "arith_rewriter.h"
-#include "bv_decl_plugin.h"
-#include "ast_pp.h"
-#include "reg_decl_plugins.h"
-#include "th_rewriter.h"
-#include "model.h"
-#include "pdr_util.h"
-#include "smt2parser.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/reg_decl_plugins.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "model/model.h"
+#include "muz/pdr/pdr_util.h"
+#include "parsers/smt2/smt2parser.h"
 
 
 static expr_ref parse_fml(ast_manager& m, char const* str) {

src/test/arith_simplifier_plugin.cpp

@@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "arith_eq_solver.h"
-#include "smt_params.h"
+#include "smt/arith_eq_solver.h"
+#include "smt/params/smt_params.h"
 
 typedef rational numeral;
 typedef vector<numeral> row;

src/test/ast.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include "ast.h"
+#include "ast/ast.h"
 
 static void tst1() {
     ast_manager m;

src/test/bit_blaster.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 
-#include"bit_blaster.h"
-#include"ast_pp.h"
-#include"ast_ll_pp.h"
+#include "ast/rewriter/bit_blaster/bit_blaster.h"
+#include "ast/ast_pp.h"
+#include "ast/ast_ll_pp.h"
 
 void mk_bits(ast_manager & m, char const * prefix, unsigned sz, expr_ref_vector & r) {
     sort_ref b(m);

src/test/bit_vector.cpp

@@ -18,8 +18,8 @@ Revision History:
 --*/
 #include<cstdlib>
 #include<iostream>
-#include"bit_vector.h"
-#include"vector.h"
+#include "util/bit_vector.h"
+#include "util/vector.h"
 
 static void tst1() {
     bit_vector     v1;

src/test/bits.cpp

@@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 // Test some bit hacks
-#include"util.h"
-#include"debug.h"
-#include"vector.h"
-#include"mpz.h"
-#include"bit_util.h"
+#include "util/util.h"
+#include "util/debug.h"
+#include "util/vector.h"
+#include "util/mpz.h"
+#include "util/bit_util.h"
 
 static void tst_shl(unsigned src_sz, unsigned const * src, unsigned k, 
                     unsigned dst_sz, unsigned const * dst, bool trace = true) {

src/test/buffer.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"ptr_scoped_buffer.h"
+#include "util/ptr_scoped_buffer.h"
 
 typedef std::pair<int, int> point;
 

src/test/bv_simplifier_plugin.cpp

@@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "bv_simplifier_plugin.h"
-#include "arith_decl_plugin.h"
-#include "ast_pp.h"
-#include "reg_decl_plugins.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/reg_decl_plugins.h"
 
 class tst_bv_simplifier_plugin_cls {
     class mgr {

src/test/chashtable.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"chashtable.h"
-#include"hashtable.h"
-#include"hash.h"
-#include"util.h"
+#include "util/chashtable.h"
+#include "util/hashtable.h"
+#include "util/hash.h"
+#include "util/util.h"
 
 typedef chashtable<int, int_hash, default_eq<int> > int_table;
 typedef cmap<int, int, int_hash, default_eq<int> > int_map;

src/test/check_assumptions.cpp

@@ -4,13 +4,13 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "memory_manager.h"
-#include "smt_params.h"
-#include "ast.h"
-#include "arith_decl_plugin.h"
-#include "bv_decl_plugin.h"
-#include "smt_context.h"
-#include "reg_decl_plugins.h"
+#include "util/memory_manager.h"
+#include "smt/params/smt_params.h"
+#include "ast/ast.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "smt/smt_context.h"
+#include "ast/reg_decl_plugins.h"
 
 void tst_check_assumptions()
 {

src/test/cnf_backbones.cpp

@@ -5,11 +5,11 @@ Copyright (c) 2017 Microsoft Corporation
 #include<iostream>
 #include<time.h>
 #include<signal.h>
-#include"timeout.h"
-#include"rlimit.h"
-#include"dimacs.h"
-#include"sat_solver.h"
-#include"gparams.h"
+#include "util/timeout.h"
+#include "util/rlimit.h"
+#include "sat/dimacs.h"
+#include "sat/sat_solver.h"
+#include "util/gparams.h"
 
 static sat::solver * g_solver = 0;
 static clock_t       g_start_time;

src/test/datalog_parser.cpp

@@ -4,13 +4,13 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "datalog_parser.h"
-#include "ast_pp.h"
-#include "arith_decl_plugin.h"
-#include "dl_context.h"
-#include "dl_register_engine.h"
-#include "smt_params.h"
-#include "reg_decl_plugins.h"
+#include "muz/fp/datalog_parser.h"
+#include "ast/ast_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "muz/base/dl_context.h"
+#include "muz/fp/dl_register_engine.h"
+#include "smt/params/smt_params.h"
+#include "ast/reg_decl_plugins.h"
 
 using namespace datalog;
 

src/test/ddnf.cpp

@@ -3,8 +3,8 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "ddnf.h"
-#include "tbv.h"
+#include "muz/ddnf/ddnf.h"
+#include "muz/rel/tbv.h"
 #include <iostream>
 #include <fstream>
 #include <list>

src/test/diff_logic.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 #ifdef _WINDOWS
-#include"rational.h"
-#include"diff_logic.h"
-#include"smt_literal.h"
-#include"util.h"
-#include"debug.h"
+#include "util/rational.h"
+#include "smt/diff_logic.h"
+#include "smt/smt_literal.h"
+#include "util/util.h"
+#include "util/debug.h"
 
 struct diff_logic_ext {
     typedef rational numeral;

src/test/dl_context.cpp

@@ -4,12 +4,12 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "datalog_parser.h"
-#include "ast_pp.h"
-#include "arith_decl_plugin.h"
-#include "dl_context.h"
-#include "smt_params.h"
-#include "dl_register_engine.h"
+#include "muz/fp/datalog_parser.h"
+#include "ast/ast_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "muz/base/dl_context.h"
+#include "smt/params/smt_params.h"
+#include "muz/fp/dl_register_engine.h"
 
 using namespace datalog;
 

src/test/dl_product_relation.cpp

@@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 #ifdef _WINDOWS
-#include "dl_context.h"
-#include "dl_register_engine.h"
-#include "dl_finite_product_relation.h"
-#include "dl_sparse_table.h"
-#include "rel_context.h"
+#include "muz/base/dl_context.h"
+#include "muz/fp/dl_register_engine.h"
+#include "muz/rel/dl_finite_product_relation.h"
+#include "muz/rel/dl_sparse_table.h"
+#include "muz/rel/rel_context.h"
 
 namespace datalog {
 

src/test/dl_query.cpp

@@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "datalog_parser.h"
-#include "ast_pp.h"
-#include "dl_table_relation.h"
-#include "dl_context.h"
-#include "dl_register_engine.h"
-#include "smt_params.h"
-#include "stopwatch.h"
-#include "reg_decl_plugins.h"
-#include "dl_relation_manager.h"
+#include "muz/fp/datalog_parser.h"
+#include "ast/ast_pp.h"
+#include "muz/rel/dl_table_relation.h"
+#include "muz/base/dl_context.h"
+#include "muz/fp/dl_register_engine.h"
+#include "smt/params/smt_params.h"
+#include "util/stopwatch.h"
+#include "ast/reg_decl_plugins.h"
+#include "muz/rel/dl_relation_manager.h"
 
 using namespace datalog;
 

src/test/dl_relation.cpp

@@ -5,13 +5,13 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 #ifdef _WINDOWS
-#include "dl_context.h"
-#include "dl_register_engine.h"
-#include "dl_relation_manager.h"
-#include "dl_interval_relation.h"
-#include "dl_bound_relation.h"
-#include "dl_product_relation.h"
-#include "util.h"
+#include "muz/base/dl_context.h"
+#include "muz/fp/dl_register_engine.h"
+#include "muz/rel/dl_relation_manager.h"
+#include "muz/rel/dl_interval_relation.h"
+#include "muz/rel/dl_bound_relation.h"
+#include "muz/rel/dl_product_relation.h"
+#include "util/util.h"
 
 namespace datalog {
 

src/test/dl_table.cpp

@@ -3,10 +3,10 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 #if defined(_WINDOWS) || defined(_CYGWIN)
 
-#include "dl_context.h"
-#include "dl_table.h"
-#include "dl_register_engine.h"
-#include "dl_relation_manager.h"
+#include "muz/base/dl_context.h"
+#include "muz/rel/dl_table.h"
+#include "muz/fp/dl_register_engine.h"
+#include "muz/rel/dl_relation_manager.h"
 
 typedef datalog::table_base* (*mk_table_fn)(datalog::relation_manager& m, datalog::table_signature& sig);
 

src/test/dl_util.cpp

@@ -4,7 +4,7 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "dl_util.h"
+#include "muz/base/dl_util.h"
 
 using namespace datalog;
 

src/test/doc.cpp

@@ -4,19 +4,19 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "doc.h"
-#include "trace.h"
-#include "vector.h"
-#include "ast.h"
-#include "ast_pp.h"
-#include "reg_decl_plugins.h"
-#include "sorting_network.h"
-#include "smt_kernel.h"
-#include "model_smt2_pp.h"
-#include "smt_params.h"
-#include "ast_util.h"
-#include "expr_safe_replace.h"
-#include "th_rewriter.h"
+#include "muz/rel/doc.h"
+#include "util/trace.h"
+#include "util/vector.h"
+#include "ast/ast.h"
+#include "ast/ast_pp.h"
+#include "ast/reg_decl_plugins.h"
+#include "util/sorting_network.h"
+#include "smt/smt_kernel.h"
+#include "model/model_smt2_pp.h"
+#include "smt/params/smt_params.h"
+#include "ast/ast_util.h"
+#include "ast/rewriter/expr_safe_replace.h"
+#include "ast/rewriter/th_rewriter.h"
 
 
 static void tst_doc1(unsigned n) {

src/test/escaped.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"util.h"
+#include "util/util.h"
 
 void tst_escaped() {
     std::cout << "[" << escaped("\"hello\"\"world\"\n\n") << "]\n";

src/test/ex.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"z3_exception.h"
+#include "util/z3_exception.h"
 
 class ex {
 public:

src/test/expr_rand.cpp

@@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "expr_rand.h"
-#include "ast_pp.h"
-#include "bv_decl_plugin.h"
-#include "array_decl_plugin.h"
-#include "arith_decl_plugin.h"
-#include "ast_smt_pp.h"
+#include "test/fuzzing/expr_rand.h"
+#include "ast/ast_pp.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_smt_pp.h"
 #include <iostream>
 #include <sstream>
-#include "reg_decl_plugins.h"
+#include "ast/reg_decl_plugins.h"
 
 static unsigned rand_seed = 1;
 

src/test/expr_substitution.cpp

@@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "expr_substitution.h"
-#include "smt_params.h"
-#include "substitution.h"
-#include "unifier.h"
-#include "bv_decl_plugin.h"
-#include "ast_pp.h"
-#include "arith_decl_plugin.h"
-#include "reg_decl_plugins.h"
-#include "th_rewriter.h"
+#include "ast/expr_substitution.h"
+#include "smt/params/smt_params.h"
+#include "ast/substitution/substitution.h"
+#include "ast/substitution/unifier.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/reg_decl_plugins.h"
+#include "ast/rewriter/th_rewriter.h"
 
 expr* mk_bv_xor(bv_util& bv, expr* a, expr* b) {
     expr* args[2];

src/test/ext_numeral.cpp

@@ -17,8 +17,8 @@ Notes:
 
 --*/
 #include<sstream>
-#include"mpq.h"
-#include"ext_numeral.h"
+#include "util/mpq.h"
+#include "util/ext_numeral.h"
 
 #define MK_TST_UNARY(NAME)                                              \
 static void tst_ ## NAME(int a, ext_numeral_kind ak, int expected_c, ext_numeral_kind expected_ck) { \

src/test/f2n.cpp

@@ -15,9 +15,9 @@ Author:
 Revision History:
 
 --*/
-#include"f2n.h"
-#include"hwf.h"
-#include"mpf.h"
+#include "util/f2n.h"
+#include "util/hwf.h"
+#include "util/mpf.h"
 
 static void tst1() {
     hwf_manager      hm;

src/test/factor_rewriter.cpp

@@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "factor_rewriter.h"
-#include "bv_decl_plugin.h"
-#include "ast_pp.h"
-#include "reg_decl_plugins.h"
+#include "ast/rewriter/factor_rewriter.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/reg_decl_plugins.h"
 
 void tst_factor_rewriter() {
     ast_manager m;

src/test/fixed_bit_vector.cpp

@@ -20,8 +20,8 @@ Revision History:
 --*/
 #include<cstdlib>
 #include<iostream>
-#include"fixed_bit_vector.h"
-#include"vector.h"
+#include "util/fixed_bit_vector.h"
+#include "util/vector.h"
 
 
 static void tst1() {

src/test/for_each_file.cpp

@@ -21,7 +21,7 @@ Revision History:
 #include <string>
 #include <windows.h>
 #include <strsafe.h>
-#include "for_each_file.h"
+#include "test/for_each_file.h"
 
 bool for_each_file(for_each_file_proc& proc, const char* base, const char* suffix)
 {

src/test/fuzzing/expr_delta.cpp

@@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "expr_delta.h"
-#include "ast_pp.h"
+#include "test/fuzzing/expr_delta.h"
+#include "ast/ast_pp.h"
 
 expr_delta::expr_delta(ast_manager& m) : m_manager(m), m_exprs(m) {}
 

src/test/fuzzing/expr_delta.h

@@ -20,7 +20,7 @@ Revision History:
 #ifndef EXPR_DELTA_H_
 #define EXPR_DELTA_H_
 
-#include "ast.h"
+#include "ast/ast.h"
 
 class expr_delta {
     ast_manager&    m_manager;

src/test/fuzzing/expr_rand.cpp

@@ -4,11 +4,11 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "expr_rand.h"
-#include "bv_decl_plugin.h"
-#include "array_decl_plugin.h"
-#include "arith_decl_plugin.h"
-#include "ast_pp.h"
+#include "test/fuzzing/expr_rand.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_pp.h"
 
 
 expr_rand::expr_rand(ast_manager& m):

src/test/fuzzing/expr_rand.h

@@ -19,8 +19,8 @@ Revision History:
 #ifndef EXPR_RAND_H_
 #define EXPR_RAND_H_
 
-#include"ast.h"
-#include"obj_hashtable.h"
+#include "ast/ast.h"
+#include "util/obj_hashtable.h"
 
 class expr_rand {
     ast_manager& m_manager;

src/test/get_consequences.cpp

@@ -3,15 +3,15 @@ Copyright (c) 2016 Microsoft Corporation
 
 --*/
 
-#include "inc_sat_solver.h"
-#include "bv_decl_plugin.h"
-#include "datatype_decl_plugin.h"
-#include "reg_decl_plugins.h"
-#include "ast_pp.h"
-#include "dt2bv_tactic.h"
-#include "tactic.h"
-#include "model_smt2_pp.h"
-#include "fd_solver.h"
+#include "sat/sat_solver/inc_sat_solver.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/datatype_decl_plugin.h"
+#include "ast/reg_decl_plugins.h"
+#include "ast/ast_pp.h"
+#include "tactic/bv/dt2bv_tactic.h"
+#include "tactic/tactic.h"
+#include "model/model_smt2_pp.h"
+#include "tactic/portfolio/fd_solver.h"
 
 static expr_ref mk_const(ast_manager& m, char const* name, sort* s) {
     return expr_ref(m.mk_const(symbol(name), s), m);

src/test/get_implied_equalities.cpp

@@ -4,9 +4,9 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "z3.h"
-#include "trace.h"
-#include "debug.h"
+#include "api/z3.h"
+#include "util/trace.h"
+#include "util/debug.h"
 
 static Z3_ast mk_var(Z3_context ctx, char const* name, Z3_sort s) {
     return Z3_mk_const(ctx, Z3_mk_string_symbol(ctx, name), s);

src/test/hashtable.cpp

@@ -21,7 +21,7 @@ Revision History:
 #include<unordered_set>
 #include<stdlib.h>
 
-#include"hashtable.h"
+#include "util/hashtable.h"
 
 
 struct int_hash_proc { unsigned operator()(int x) const { return x * 3; } };

src/test/heap.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"heap.h"
-#include"hashtable.h"
-#include"trace.h"
+#include "util/heap.h"
+#include "util/hashtable.h"
+#include "util/trace.h"
 
 struct lt_proc { bool operator()(int v1, int v2) const { return v1 < v2; } };
 typedef heap<lt_proc> int_heap;

src/test/heap_trie.cpp

@@ -4,7 +4,7 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "heap_trie.h"
+#include "math/hilbert/heap_trie.h"
 
 struct unsigned_le {
     static bool le(unsigned i, unsigned j) { return i <= j; }

src/test/hilbert_basis.cpp

@@ -4,15 +4,15 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "hilbert_basis.h"
-#include "ast_pp.h"
-#include "reg_decl_plugins.h"
-#include "arith_decl_plugin.h"
-#include "quant_tactics.h"
-#include "tactic.h"
-#include "tactic2solver.h"
-#include "solver.h"
-#include "rlimit.h"
+#include "math/hilbert/hilbert_basis.h"
+#include "ast/ast_pp.h"
+#include "ast/reg_decl_plugins.h"
+#include "ast/arith_decl_plugin.h"
+#include "tactic/smtlogics/quant_tactics.h"
+#include "tactic/tactic.h"
+#include "solver/tactic2solver.h"
+#include "solver/solver.h"
+#include "util/rlimit.h"
 #include <signal.h>
 #include <time.h>
 #include <sstream>

src/test/horn_subsume_model_converter.cpp

@@ -5,10 +5,10 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 
-#include "horn_subsume_model_converter.h"
-#include "arith_decl_plugin.h"
-#include "model_smt2_pp.h"
-#include "reg_decl_plugins.h"
+#include "tactic/horn_subsume_model_converter.h"
+#include "ast/arith_decl_plugin.h"
+#include "model/model_smt2_pp.h"
+#include "ast/reg_decl_plugins.h"
 
 void tst_horn_subsume_model_converter() {
     ast_manager m;

src/test/hwf.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"hwf.h"
-#include"f2n.h"
-#include"rational.h"
+#include "util/hwf.h"
+#include "util/f2n.h"
+#include "util/rational.h"
 
 static void bug_set_double() {
     hwf_manager m;

src/test/im_float_config.h

@@ -19,9 +19,9 @@ Revision History:
 #ifndef IM_FLOAT_CONFIG_H_
 #define IM_FLOAT_CONFIG_H_
 
-#include"f2n.h"
-#include"mpf.h"
-#include"hwf.h"
+#include "util/f2n.h"
+#include "util/mpf.h"
+#include "util/hwf.h"
 
 template<typename f_manager>
 class im_float_config {

src/test/inf_rational.cpp

@@ -18,7 +18,7 @@ Revision History:
 
 --*/
 
-#include"inf_rational.h"
+#include "util/inf_rational.h"
 
 static void tst0() {
     inf_rational n(rational(0), false);

src/test/interval.cpp

@@ -17,12 +17,12 @@ Revision History:
 
 --*/
 #include<cstdlib>
-#include"interval_def.h"
-#include"dependency.h"
-#include"mpq.h"
-#include"ast.h"
-#include"debug.h"
-#include"rlimit.h"
+#include "math/interval/interval_def.h"
+#include "util/dependency.h"
+#include "util/mpq.h"
+#include "ast/ast.h"
+#include "util/debug.h"
+#include "util/rlimit.h"
 
 template class interval_manager<im_default_config>;
 typedef im_default_config::interval interval;
@@ -390,7 +390,7 @@ static void tst_div(unsigned N, unsigned magnitude) {
     del_interval(imc, a); del_interval(imc, b); del_interval(imc, r);
 }
 
-#include"im_float_config.h"
+#include "test/im_float_config.h"
 
 #if 0
 static void tst_float() {

src/test/karr.cpp

@@ -3,8 +3,8 @@
 Copyright (c) 2015 Microsoft Corporation
 
 --*/
-#include"rlimit.h"
-#include "hilbert_basis.h"
+#include "util/rlimit.h"
+#include "math/hilbert/hilbert_basis.h"
 
 /*
   Test generation of linear congruences a la Karr.

src/test/list.cpp

@@ -16,10 +16,10 @@ Author:
 Revision History:
 
 --*/
-#include"trace.h"
-#include"util.h"
-#include"region.h"
-#include"list.h"
+#include "util/trace.h"
+#include "util/util.h"
+#include "util/region.h"
+#include "util/list.h"
 
 static void tst1() {
     region r;

src/test/lp.cpp

@@ -19,10 +19,10 @@ Author: Lev Nachmanson
 #include "util/lp/lp_utils.h"
 #include "util/lp/lp_primal_simplex.h"
 #include "util/lp/mps_reader.h"
-#include "smt_reader.h"
+#include "test/smt_reader.h"
 #include "util/lp/binary_heap_priority_queue.h"
-#include "argument_parser.h"
-#include "test_file_reader.h"
+#include "test/argument_parser.h"
+#include "test/test_file_reader.h"
 #include "util/lp/indexed_value.h"
 #include "util/lp/lar_solver.h"
 #include "util/lp/numeric_pair.h"

src/test/main.cpp

@@ -2,13 +2,13 @@
 #include<time.h>
 #include<string>
 #include<cstring>
-#include"util.h"
-#include"trace.h"
-#include"debug.h"
-#include"timeit.h"
-#include"warning.h"
-#include "memory_manager.h"
-#include"gparams.h"
+#include "util/util.h"
+#include "util/trace.h"
+#include "util/debug.h"
+#include "util/timeit.h"
+#include "util/warning.h"
+#include "util/memory_manager.h"
+#include "util/gparams.h"
 
 //
 // Unit tests fail by asserting.

src/test/map.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"map.h"
-#include"str_hashtable.h"
+#include "util/map.h"
+#include "util/str_hashtable.h"
 
 static void tst1() {
   map<char const *, int, str_hash_proc, str_eq_proc> str2int;

src/test/matcher.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 #ifdef _WINDOWS
-#include"matcher.h"
-#include"ast_pp.h"
-#include "reg_decl_plugins.h"
+#include "ast/substitution/matcher.h"
+#include "ast/ast_pp.h"
+#include "ast/reg_decl_plugins.h"
 
 
 void tst_match(ast_manager & m, app * t, app * i) {

src/test/memory.cpp

@@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 #ifdef _WINDOWS
-#include "z3.h"
-#include "z3_private.h"
+#include "api/z3.h"
+#include "api/z3_private.h"
 #include <iostream>
-#include "util.h"
-#include "trace.h"
+#include "util/util.h"
+#include "util/trace.h"
 
 static bool oom = false;
 

src/test/model2expr.cpp

@@ -4,11 +4,11 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "model2expr.h"
-#include "ast_pp.h"
-#include "arith_decl_plugin.h"
-#include "model_smt2_pp.h"
-#include "reg_decl_plugins.h"
+#include "model/model2expr.h"
+#include "ast/ast_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "model/model_smt2_pp.h"
+#include "ast/reg_decl_plugins.h"
 
 void tst_model2expr() {
     ast_manager m;

src/test/model_based_opt.cpp

@@ -1,6 +1,6 @@
-#include "model_based_opt.h"
-#include "util.h"
-#include "uint_set.h"
+#include "math/simplex/model_based_opt.h"
+#include "util/util.h"
+#include "util/uint_set.h"
 
 typedef opt::model_based_opt::var var;
 

src/test/model_evaluator.cpp

@@ -1,9 +1,9 @@
-#include "model.h"
-#include "model_evaluator.h"
-#include "model_pp.h"
-#include "arith_decl_plugin.h"
-#include "reg_decl_plugins.h"
-#include "ast_pp.h"
+#include "model/model.h"
+#include "model/model_evaluator.h"
+#include "model/model_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/reg_decl_plugins.h"
+#include "ast/ast_pp.h"
 
 
 void tst_model_evaluator() {

src/test/model_retrieval.cpp

@@ -5,14 +5,14 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 
-#include "ast.h"
-#include "smt_params.h"
-#include "smt_context.h"
-#include "arith_decl_plugin.h"
-#include "bv_decl_plugin.h"
-#include "array_decl_plugin.h"
-#include "model_v2_pp.h"
-#include "reg_decl_plugins.h"
+#include "ast/ast.h"
+#include "smt/params/smt_params.h"
+#include "smt/smt_context.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/array_decl_plugin.h"
+#include "model/model_v2_pp.h"
+#include "ast/reg_decl_plugins.h"
 
 void tst_model_retrieval()
 {          

src/test/mpbq.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include "mpbq.h"
+#include "util/mpbq.h"
 
 static void tst1() {
     unsynch_mpz_manager zm;

src/test/mpf.cpp

@@ -16,8 +16,8 @@ Author:
 Revision History:
 
 --*/
-#include"mpf.h"
-#include"f2n.h"
+#include "util/mpf.h"
+#include "util/f2n.h"
 
 static void bug_set_int() {
     mpf_manager fm;

src/test/mpff.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 #include<sstream>
-#include"mpff.h"
-#include"mpz.h"
-#include"mpq.h"
+#include "util/mpff.h"
+#include "util/mpz.h"
+#include "util/mpq.h"
 
 static void tst1() {
     try {

src/test/mpfx.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"mpfx.h"
+#include "util/mpfx.h"
 
 static void tst1() {
     mpfx_manager m;

src/test/mpq.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 
-#include"mpq.h"
-#include"rational.h"
-#include"timeit.h"
+#include "util/mpq.h"
+#include "util/rational.h"
+#include "util/timeit.h"
 
 static void tst0() {
     synch_mpq_manager m;

src/test/mpz.cpp

@@ -17,10 +17,10 @@ Revision History:
 
 --*/
 
-#include"mpz.h"
-#include"rational.h"
-#include"timeit.h"
-#include"scoped_numeral.h"
+#include "util/mpz.h"
+#include "util/rational.h"
+#include "util/timeit.h"
+#include "util/scoped_numeral.h"
 
 static void tst1() {
     synch_mpz_manager m;

src/test/nlarith_util.cpp

@@ -4,10 +4,10 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "nlarith_util.h"
-#include "arith_decl_plugin.h"
-#include "ast_pp.h"
-#include "reg_decl_plugins.h"
+#include "qe/nlarith_util.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/reg_decl_plugins.h"
 
 void tst_nlarith_util() {
     ast_manager M;

src/test/nlsat.cpp

@@ -16,14 +16,14 @@ Author:
 Notes:
 
 --*/
-#include"nlsat_assignment.h"
-#include"nlsat_interval_set.h"
-#include"nlsat_evaluator.h"
-#include"nlsat_solver.h"
-#include"util.h"
-#include"nlsat_explain.h"
-#include"polynomial_cache.h"
-#include"rlimit.h"
+#include "nlsat/nlsat_assignment.h"
+#include "nlsat/nlsat_interval_set.h"
+#include "nlsat/nlsat_evaluator.h"
+#include "nlsat/nlsat_solver.h"
+#include "util/util.h"
+#include "nlsat/nlsat_explain.h"
+#include "math/polynomial/polynomial_cache.h"
+#include "util/rlimit.h"
 
 nlsat::interval_set_ref tst_interval(nlsat::interval_set_ref const & s1,
                                      nlsat::interval_set_ref const & s2,

src/test/no_overflow.cpp

@@ -18,9 +18,9 @@ Revision History:
 --*/
 #ifdef _WINDOWS
 
-#include "z3.h"
-#include "trace.h"
-#include "rational.h"
+#include "api/z3.h"
+#include "util/trace.h"
+#include "util/rational.h"
 
 #define TEST(TEST_NAME, TEST_OUTCOME, NEG_TEST_OUTCOME) \
     do { \

src/test/object_allocator.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#include"rational.h"
-#include"object_allocator.h"
+#include "util/rational.h"
+#include "util/object_allocator.h"
 
 struct cell {
     rational m_coeff;

src/test/old_interval.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"old_interval.h"
+#include "smt/old_interval.h"
 
 static void tst1() {
     ext_numeral inf(true);
@@ -166,9 +166,9 @@ public:
     }
 };
 
-#include"basic_interval.h"
-#include"mpz.h"
-#include"scoped_numeral.h"
+#include "util/basic_interval.h"
+#include "util/mpz.h"
+#include "util/scoped_numeral.h"
 
 static void tst2() {
     typedef basic_interval_manager<unsynch_mpz_manager, false> mpzi_manager;

src/test/optional.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"trace.h"
-#include"debug.h"
-#include"optional.h"
+#include "util/trace.h"
+#include "util/debug.h"
+#include "util/optional.h"
 
 static void tst1() {
     optional<int> v;

src/test/parray.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"parray.h"
-#include"small_object_allocator.h"
-#include"ast.h"
+#include "util/parray.h"
+#include "util/small_object_allocator.h"
+#include "ast/ast.h"
 
 template<bool PRESERVE_ROOTS>
 struct int_parray_config {

src/test/pb2bv.cpp

@@ -3,21 +3,21 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "trace.h"
-#include "vector.h"
-#include "ast.h"
-#include "ast_pp.h"
-#include "statistics.h"
-#include "reg_decl_plugins.h"
-#include "pb2bv_rewriter.h"
-#include "smt_kernel.h"
-#include "model_smt2_pp.h"
-#include "smt_params.h"
-#include "ast_util.h"
-#include "pb_decl_plugin.h"
-#include "th_rewriter.h"
-#include "fd_solver.h"
-#include "solver.h"
+#include "util/trace.h"
+#include "util/vector.h"
+#include "ast/ast.h"
+#include "ast/ast_pp.h"
+#include "util/statistics.h"
+#include "ast/reg_decl_plugins.h"
+#include "ast/rewriter/pb2bv_rewriter.h"
+#include "smt/smt_kernel.h"
+#include "model/model_smt2_pp.h"
+#include "smt/params/smt_params.h"
+#include "ast/ast_util.h"
+#include "ast/pb_decl_plugin.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "tactic/portfolio/fd_solver.h"
+#include "solver/solver.h"
 
 static void test1() {
     ast_manager m;

src/test/pdr.cpp

@@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "pdr_context.h"
-#include "reg_decl_plugins.h"
+#include "muz/pdr/pdr_context.h"
+#include "ast/reg_decl_plugins.h"
 
 
 using namespace pdr;

src/test/permutation.cpp

@@ -16,9 +16,9 @@ Author:
 Revision History:
 
 --*/
-#include"permutation.h"
-#include"util.h"
-#include"vector.h"
+#include "util/permutation.h"
+#include "util/util.h"
+#include "util/vector.h"
 
 void apply_permutation_copy(unsigned sz, unsigned const * src, unsigned const * p, unsigned * target) {
     for (unsigned i = 0; i < sz; i++) {

src/test/polynomial.cpp

@@ -17,11 +17,11 @@ Notes:
 
 --*/
 #if !defined(__clang__)
-#include"polynomial.h"
-#include"polynomial_var2value.h"
-#include"polynomial_cache.h"
-#include"linear_eq_solver.h"
-#include"rlimit.h"
+#include "math/polynomial/polynomial.h"
+#include "math/polynomial/polynomial_var2value.h"
+#include "math/polynomial/polynomial_cache.h"
+#include "math/polynomial/linear_eq_solver.h"
+#include "util/rlimit.h"
 
 static void tst1() {
     std::cout << "\n----- Basic testing -------\n";

src/test/polynorm.cpp

@@ -4,12 +4,12 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "th_rewriter.h"
-#include "smt2parser.h"
-#include "arith_decl_plugin.h"
-#include "reg_decl_plugins.h"
-#include "arith_rewriter.h"
-#include "ast_pp.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "parsers/smt2/smt2parser.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/reg_decl_plugins.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/ast_pp.h"
 
 
 static expr_ref parse_fml(ast_manager& m, char const* str) {

src/test/prime_generator.cpp

@@ -16,8 +16,8 @@ Author:
 Notes:
 
 --*/
-#include"mpz.h"
-#include"prime_generator.h"
+#include "util/mpz.h"
+#include "util/prime_generator.h"
 
 void tst_prime_generator() {
     unsynch_mpz_manager m;

src/test/proof_checker.cpp

@@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "proof_checker.h"
-#include "ast_ll_pp.h"
+#include "ast/proof_checker/proof_checker.h"
+#include "ast/ast_ll_pp.h"
 
 void tst_checker1() {
     ast_manager m(PGM_FINE);

src/test/qe_arith.cpp

@@ -4,17 +4,17 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "qe_arith.h"
-#include "qe.h"
-#include "th_rewriter.h"
-#include "smt2parser.h"
-#include "arith_decl_plugin.h"
-#include "reg_decl_plugins.h"
-#include "arith_rewriter.h"
-#include "ast_pp.h"
-#include "smt_context.h"
-#include "expr_abstract.h"
-#include "expr_safe_replace.h"
+#include "qe/qe_arith.h"
+#include "qe/qe.h"
+#include "ast/rewriter/th_rewriter.h"
+#include "parsers/smt2/smt2parser.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/reg_decl_plugins.h"
+#include "ast/rewriter/arith_rewriter.h"
+#include "ast/ast_pp.h"
+#include "smt/smt_context.h"
+#include "ast/expr_abstract.h"
+#include "ast/rewriter/expr_safe_replace.h"
 
 static expr_ref parse_fml(ast_manager& m, char const* str) {
     expr_ref result(m);

src/test/quant_elim.cpp

@@ -4,20 +4,20 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "ast.h"
-#include "smt_params.h"
-#include "simplifier.h"
-#include "qe.h"
-#include "basic_simplifier_plugin.h"
-#include "arith_simplifier_plugin.h"
-#include "array_simplifier_plugin.h"
-#include "bv_simplifier_plugin.h"
-#include "ast_pp.h"
-#include "smtlib.h"
-#include "smtparser.h"
-#include "lbool.h"
+#include "ast/ast.h"
+#include "smt/params/smt_params.h"
+#include "ast/simplifier/simplifier.h"
+#include "qe/qe.h"
+#include "ast/simplifier/basic_simplifier_plugin.h"
+#include "ast/simplifier/arith_simplifier_plugin.h"
+#include "ast/simplifier/array_simplifier_plugin.h"
+#include "ast/simplifier/bv_simplifier_plugin.h"
+#include "ast/ast_pp.h"
+#include "parsers/smt/smtlib.h"
+#include "parsers/smt/smtparser.h"
+#include "util/lbool.h"
 #include <sstream>
-#include "reg_decl_plugins.h"
+#include "ast/reg_decl_plugins.h"
 
 
 static void test_qe(ast_manager& m, lbool expected_outcome, expr* fml, char const* option) {

src/test/quant_solve.cpp

@@ -4,20 +4,20 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "ast.h"
-#include "smt_params.h"
-#include "qe.h"
-#include "arith_decl_plugin.h"
-#include "ast_pp.h"
-#include "lbool.h"
+#include "ast/ast.h"
+#include "smt/params/smt_params.h"
+#include "qe/qe.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "util/lbool.h"
 #include <sstream>
-#include "expr_replacer.h"
-#include "smt_kernel.h"
-#include "reg_decl_plugins.h"
-#include "expr_abstract.h"
-#include "model_smt2_pp.h"
-#include "smt2parser.h"
-#include "var_subst.h"
+#include "ast/rewriter/expr_replacer.h"
+#include "smt/smt_kernel.h"
+#include "ast/reg_decl_plugins.h"
+#include "ast/expr_abstract.h"
+#include "model/model_smt2_pp.h"
+#include "parsers/smt2/smt2parser.h"
+#include "ast/rewriter/var_subst.h"
 
 static void validate_quant_solution(ast_manager& m, expr* fml, expr* guard, qe::def_vector const& defs) {
     // verify:

src/test/random.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 
-#include"util.h"
-#include"trace.h"
+#include "util/util.h"
+#include "util/trace.h"
 
 static void tst1() {
     random_gen r(0);

src/test/rational.cpp

@@ -17,11 +17,11 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"vector.h"
-#include"rational.h"
-#include"trace.h"
-#include"ext_gcd.h"
-#include"timeit.h"
+#include "util/vector.h"
+#include "util/rational.h"
+#include "util/trace.h"
+#include "util/ext_gcd.h"
+#include "util/timeit.h"
 
 static void tst1() {
     rational r1(1);

src/test/rcf.cpp

@@ -16,9 +16,9 @@ Author:
 Notes:
 
 --*/
-#include"realclosure.h"
-#include"mpz_matrix.h"
-#include"rlimit.h"
+#include "math/realclosure/realclosure.h"
+#include "math/realclosure/mpz_matrix.h"
+#include "util/rlimit.h"
 
 static void tst1() {
     unsynch_mpq_manager qm;

src/test/region.cpp

@@ -17,7 +17,7 @@ Revision History:
 
 --*/
 #include<stdlib.h>
-#include"region.h"
+#include "util/region.h"
 
 static void tst1() {
     // TODO

src/test/sat_user_scope.cpp

@@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "sat_solver.h"
-#include "util.h"
+#include "sat/sat_solver.h"
+#include "util/util.h"
 
 typedef sat::literal_vector clause_t;
 typedef vector<clause_t> clauses_t;

src/test/simple_parser.cpp

@@ -16,13 +16,13 @@ Author:
 Revision History:
 
 --*/
-#include"cost_parser.h"
-#include"cost_evaluator.h"
-#include"arith_decl_plugin.h"
-#include"ast_pp.h"
-#include"well_sorted.h"
-#include"warning.h"
-#include"reg_decl_plugins.h"
+#include "parsers/util/cost_parser.h"
+#include "smt/cost_evaluator.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/well_sorted.h"
+#include "util/warning.h"
+#include "ast/reg_decl_plugins.h"
 
 void tst_simple_parser() {
     ast_manager    m;

src/test/simplex.cpp

@@ -4,14 +4,14 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "sparse_matrix.h"
-#include "sparse_matrix_def.h"
-#include "simplex.h"
-#include "simplex_def.h"
-#include "mpq_inf.h"
-#include "vector.h"
-#include "rational.h"
-#include "rlimit.h"
+#include "util/lp/sparse_matrix.h"
+#include "math/simplex/sparse_matrix_def.h"
+#include "math/simplex/simplex.h"
+#include "math/simplex/simplex_def.h"
+#include "util/mpq_inf.h"
+#include "util/vector.h"
+#include "util/rational.h"
+#include "util/rlimit.h"
 
 #define R rational
 typedef simplex::simplex<simplex::mpz_ext> Simplex;

src/test/simplifier.cpp

@@ -5,11 +5,11 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 #ifdef _WINDOWS
-#include "z3.h"
-#include "z3_private.h"
+#include "api/z3.h"
+#include "api/z3_private.h"
 #include <iostream>
-#include "util.h"
-#include "trace.h"
+#include "util/util.h"
+#include "util/trace.h"
 
 
 static void ev_const(Z3_context ctx, Z3_ast e) {

src/test/small_object_allocator.cpp

@@ -5,9 +5,9 @@ Copyright (c) 2015 Microsoft Corporation
 --*/
 
 #include<iostream>
-#include"util.h"
-#include"trace.h"
-#include"small_object_allocator.h"
+#include "util/util.h"
+#include "util/trace.h"
+#include "util/small_object_allocator.h"
 
 void tst_small_object_allocator() {
     small_object_allocator soa;

src/test/smt2print_parse.cpp

@@ -7,7 +7,7 @@ Copyright (c) 2015 Microsoft Corporation
 // This is to test the print-parse facilities over the API
 // for SMT-LIB2.
 
-#include "z3.h"
+#include "api/z3.h"
 #include <iostream>
 
 void test_print(Z3_context ctx, Z3_ast a) {

src/test/smt_context.cpp

@@ -4,8 +4,8 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "smt_context.h"
-#include "reg_decl_plugins.h"
+#include "smt/smt_context.h"
+#include "ast/reg_decl_plugins.h"
 
 void tst_smt_context()
 {

src/test/sorting_network.cpp

@@ -4,16 +4,16 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "trace.h"
-#include "vector.h"
-#include "ast.h"
-#include "ast_pp.h"
-#include "reg_decl_plugins.h"
-#include "sorting_network.h"
-#include "smt_kernel.h"
-#include "model_smt2_pp.h"
-#include "smt_params.h"
-#include "ast_util.h"
+#include "util/trace.h"
+#include "util/vector.h"
+#include "ast/ast.h"
+#include "ast/ast_pp.h"
+#include "ast/reg_decl_plugins.h"
+#include "util/sorting_network.h"
+#include "smt/smt_kernel.h"
+#include "model/model_smt2_pp.h"
+#include "smt/params/smt_params.h"
+#include "ast/ast_util.h"
 
 
 

src/test/stack.cpp

@@ -16,8 +16,8 @@ Notes:
 
 --*/
 #include<utility>
-#include"stack.h"
-#include"vector.h"
+#include "util/stack.h"
+#include "util/vector.h"
 
 typedef std::pair<unsigned, unsigned> point;
 

src/test/string_buffer.cpp

@@ -17,9 +17,9 @@ Revision History:
 
 --*/
 #include<cstdlib>
-#include"debug.h"
-#include"string_buffer.h"
-#include"trace.h"
+#include "util/debug.h"
+#include "util/string_buffer.h"
+#include "util/trace.h"
 
 static void tst1() {
   string_buffer<> b;

src/test/substitution.cpp

@@ -4,14 +4,14 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "expr_substitution.h"
-#include "smt_params.h"
-#include "substitution.h"
-#include "unifier.h"
-#include "bv_decl_plugin.h"
-#include "ast_pp.h"
-#include "arith_decl_plugin.h"
-#include "reg_decl_plugins.h"
+#include "ast/expr_substitution.h"
+#include "smt/params/smt_params.h"
+#include "ast/substitution/substitution.h"
+#include "ast/substitution/unifier.h"
+#include "ast/bv_decl_plugin.h"
+#include "ast/ast_pp.h"
+#include "ast/arith_decl_plugin.h"
+#include "ast/reg_decl_plugins.h"
 
 void tst_substitution()
 {

src/test/symbol.cpp

@@ -17,8 +17,8 @@ Revision History:
 
 --*/
 #include<iostream>
-#include"symbol.h"
-#include"debug.h"
+#include "util/symbol.h"
+#include "util/debug.h"
 
 static void tst1() {
     symbol s1("foo");

src/test/symbol_table.cpp

@@ -16,7 +16,7 @@ Author:
 Revision History:
 
 --*/
-#include"symbol_table.h"
+#include "util/symbol_table.h"
 
 static void tst1() {
     symbol_table<int> t;

src/test/tbv.cpp

@@ -4,7 +4,7 @@ Copyright (c) 2015 Microsoft Corporation
 
 --*/
 
-#include "tbv.h"
+#include "muz/rel/tbv.h"
 
 static void tst1(unsigned num_bits) {
     tbv_manager m(num_bits);