diff --git a/.gitignore b/.gitignore
index cc1c2a754..b7e4a0186 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,14 +75,3 @@ src/api/ml/z3.mllib
 *.bak
 doc/api
 doc/code
-
-# CMake files copied over by the ``contrib/cmake/boostrap.py`` script
-# See #461
-examples/CMakeLists.txt
-examples/*/CMakeLists.txt
-src/CMakeLists.txt
-src/*/CMakeLists.txt
-src/*/*/CMakeLists.txt
-src/*/*/*/CMakeLists.txt
-src/api/dotnet/cmake_install_gac.cmake.in
-src/api/dotnet/cmake_uninstall_gac.cmake.in
diff --git a/contrib/cmake/cmake/Z3Config.cmake.in b/cmake/Z3Config.cmake.in
similarity index 100%
rename from contrib/cmake/cmake/Z3Config.cmake.in
rename to cmake/Z3Config.cmake.in
diff --git a/contrib/cmake/cmake/cmake_uninstall.cmake.in b/cmake/cmake_uninstall.cmake.in
similarity index 100%
rename from contrib/cmake/cmake/cmake_uninstall.cmake.in
rename to cmake/cmake_uninstall.cmake.in
diff --git a/contrib/cmake/cmake/compiler_lto.cmake b/cmake/compiler_lto.cmake
similarity index 100%
rename from contrib/cmake/cmake/compiler_lto.cmake
rename to cmake/compiler_lto.cmake
diff --git a/contrib/cmake/cmake/compiler_warnings.cmake b/cmake/compiler_warnings.cmake
similarity index 100%
rename from contrib/cmake/cmake/compiler_warnings.cmake
rename to cmake/compiler_warnings.cmake
diff --git a/contrib/cmake/cmake/cxx_compiler_flags_overrides.cmake b/cmake/cxx_compiler_flags_overrides.cmake
similarity index 100%
rename from contrib/cmake/cmake/cxx_compiler_flags_overrides.cmake
rename to cmake/cxx_compiler_flags_overrides.cmake
diff --git a/contrib/cmake/cmake/git_utils.cmake b/cmake/git_utils.cmake
similarity index 100%
rename from contrib/cmake/cmake/git_utils.cmake
rename to cmake/git_utils.cmake
diff --git a/contrib/cmake/cmake/modules/FindDotNetToolchain.cmake b/cmake/modules/FindDotNetToolchain.cmake
similarity index 100%
rename from contrib/cmake/cmake/modules/FindDotNetToolchain.cmake
rename to cmake/modules/FindDotNetToolchain.cmake
diff --git a/contrib/cmake/cmake/modules/FindGMP.cmake b/cmake/modules/FindGMP.cmake
similarity index 100%
rename from contrib/cmake/cmake/modules/FindGMP.cmake
rename to cmake/modules/FindGMP.cmake
diff --git a/contrib/cmake/cmake/msvc_legacy_quirks.cmake b/cmake/msvc_legacy_quirks.cmake
similarity index 100%
rename from contrib/cmake/cmake/msvc_legacy_quirks.cmake
rename to cmake/msvc_legacy_quirks.cmake
diff --git a/contrib/cmake/cmake/target_arch_detect.cmake b/cmake/target_arch_detect.cmake
similarity index 100%
rename from contrib/cmake/cmake/target_arch_detect.cmake
rename to cmake/target_arch_detect.cmake
diff --git a/contrib/cmake/cmake/target_arch_detect.cpp b/cmake/target_arch_detect.cpp
similarity index 100%
rename from contrib/cmake/cmake/target_arch_detect.cpp
rename to cmake/target_arch_detect.cpp
diff --git a/contrib/cmake/cmake/z3_add_component.cmake b/cmake/z3_add_component.cmake
similarity index 100%
rename from contrib/cmake/cmake/z3_add_component.cmake
rename to cmake/z3_add_component.cmake
diff --git a/contrib/cmake/cmake/z3_add_cxx_flag.cmake b/cmake/z3_add_cxx_flag.cmake
similarity index 100%
rename from contrib/cmake/cmake/z3_add_cxx_flag.cmake
rename to cmake/z3_add_cxx_flag.cmake
diff --git a/contrib/cmake/cmake/z3_append_linker_flag_list_to_target.cmake b/cmake/z3_append_linker_flag_list_to_target.cmake
similarity index 100%
rename from contrib/cmake/cmake/z3_append_linker_flag_list_to_target.cmake
rename to cmake/z3_append_linker_flag_list_to_target.cmake
diff --git a/contrib/cmake/doc/CMakeLists.txt b/doc/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/doc/CMakeLists.txt
rename to doc/CMakeLists.txt
diff --git a/contrib/cmake/examples/CMakeLists.txt b/examples/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/examples/CMakeLists.txt
rename to examples/CMakeLists.txt
diff --git a/contrib/cmake/examples/c++/CMakeLists.txt b/examples/c++/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/examples/c++/CMakeLists.txt
rename to examples/c++/CMakeLists.txt
diff --git a/contrib/cmake/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/examples/c/CMakeLists.txt
rename to examples/c/CMakeLists.txt
diff --git a/contrib/cmake/examples/python/CMakeLists.txt b/examples/python/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/examples/python/CMakeLists.txt
rename to examples/python/CMakeLists.txt
diff --git a/contrib/cmake/examples/tptp/CMakeLists.txt b/examples/tptp/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/examples/tptp/CMakeLists.txt
rename to examples/tptp/CMakeLists.txt
diff --git a/contrib/cmake/src/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/contrib/cmake/src/ackermannization/CMakeLists.txt b/src/ackermannization/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ackermannization/CMakeLists.txt
rename to src/ackermannization/CMakeLists.txt
diff --git a/contrib/cmake/src/api/CMakeLists.txt b/src/api/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/api/CMakeLists.txt
rename to src/api/CMakeLists.txt
diff --git a/contrib/cmake/src/api/dll/CMakeLists.txt b/src/api/dll/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/api/dll/CMakeLists.txt
rename to src/api/dll/CMakeLists.txt
diff --git a/contrib/cmake/src/api/dotnet/CMakeLists.txt b/src/api/dotnet/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/api/dotnet/CMakeLists.txt
rename to src/api/dotnet/CMakeLists.txt
diff --git a/contrib/cmake/src/api/dotnet/cmake_install_gac.cmake.in b/src/api/dotnet/cmake_install_gac.cmake.in
similarity index 100%
rename from contrib/cmake/src/api/dotnet/cmake_install_gac.cmake.in
rename to src/api/dotnet/cmake_install_gac.cmake.in
diff --git a/contrib/cmake/src/api/dotnet/cmake_uninstall_gac.cmake.in b/src/api/dotnet/cmake_uninstall_gac.cmake.in
similarity index 100%
rename from contrib/cmake/src/api/dotnet/cmake_uninstall_gac.cmake.in
rename to src/api/dotnet/cmake_uninstall_gac.cmake.in
diff --git a/contrib/cmake/src/api/java/CMakeLists.txt b/src/api/java/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/api/java/CMakeLists.txt
rename to src/api/java/CMakeLists.txt
diff --git a/contrib/cmake/src/api/python/CMakeLists.txt b/src/api/python/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/api/python/CMakeLists.txt
rename to src/api/python/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/CMakeLists.txt
rename to src/ast/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/fpa/CMakeLists.txt b/src/ast/fpa/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/fpa/CMakeLists.txt
rename to src/ast/fpa/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/macros/CMakeLists.txt b/src/ast/macros/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/macros/CMakeLists.txt
rename to src/ast/macros/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/normal_forms/CMakeLists.txt b/src/ast/normal_forms/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/normal_forms/CMakeLists.txt
rename to src/ast/normal_forms/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/pattern/CMakeLists.txt b/src/ast/pattern/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/pattern/CMakeLists.txt
rename to src/ast/pattern/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/proof_checker/CMakeLists.txt b/src/ast/proof_checker/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/proof_checker/CMakeLists.txt
rename to src/ast/proof_checker/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/rewriter/CMakeLists.txt b/src/ast/rewriter/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/rewriter/CMakeLists.txt
rename to src/ast/rewriter/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/rewriter/bit_blaster/CMakeLists.txt b/src/ast/rewriter/bit_blaster/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/rewriter/bit_blaster/CMakeLists.txt
rename to src/ast/rewriter/bit_blaster/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/simplifier/CMakeLists.txt b/src/ast/simplifier/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/simplifier/CMakeLists.txt
rename to src/ast/simplifier/CMakeLists.txt
diff --git a/contrib/cmake/src/ast/substitution/CMakeLists.txt b/src/ast/substitution/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/ast/substitution/CMakeLists.txt
rename to src/ast/substitution/CMakeLists.txt
diff --git a/contrib/cmake/src/cmd_context/CMakeLists.txt b/src/cmd_context/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/cmd_context/CMakeLists.txt
rename to src/cmd_context/CMakeLists.txt
diff --git a/contrib/cmake/src/cmd_context/extra_cmds/CMakeLists.txt b/src/cmd_context/extra_cmds/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/cmd_context/extra_cmds/CMakeLists.txt
rename to src/cmd_context/extra_cmds/CMakeLists.txt
diff --git a/contrib/cmake/src/duality/CMakeLists.txt b/src/duality/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/duality/CMakeLists.txt
rename to src/duality/CMakeLists.txt
diff --git a/contrib/cmake/src/interp/CMakeLists.txt b/src/interp/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/interp/CMakeLists.txt
rename to src/interp/CMakeLists.txt
diff --git a/contrib/cmake/src/math/automata/CMakeLists.txt b/src/math/automata/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/automata/CMakeLists.txt
rename to src/math/automata/CMakeLists.txt
diff --git a/contrib/cmake/src/math/euclid/CMakeLists.txt b/src/math/euclid/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/euclid/CMakeLists.txt
rename to src/math/euclid/CMakeLists.txt
diff --git a/contrib/cmake/src/math/grobner/CMakeLists.txt b/src/math/grobner/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/grobner/CMakeLists.txt
rename to src/math/grobner/CMakeLists.txt
diff --git a/contrib/cmake/src/math/hilbert/CMakeLists.txt b/src/math/hilbert/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/hilbert/CMakeLists.txt
rename to src/math/hilbert/CMakeLists.txt
diff --git a/contrib/cmake/src/math/interval/CMakeLists.txt b/src/math/interval/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/interval/CMakeLists.txt
rename to src/math/interval/CMakeLists.txt
diff --git a/contrib/cmake/src/math/polynomial/CMakeLists.txt b/src/math/polynomial/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/polynomial/CMakeLists.txt
rename to src/math/polynomial/CMakeLists.txt
diff --git a/contrib/cmake/src/math/realclosure/CMakeLists.txt b/src/math/realclosure/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/realclosure/CMakeLists.txt
rename to src/math/realclosure/CMakeLists.txt
diff --git a/contrib/cmake/src/math/simplex/CMakeLists.txt b/src/math/simplex/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/simplex/CMakeLists.txt
rename to src/math/simplex/CMakeLists.txt
diff --git a/contrib/cmake/src/math/subpaving/CMakeLists.txt b/src/math/subpaving/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/subpaving/CMakeLists.txt
rename to src/math/subpaving/CMakeLists.txt
diff --git a/contrib/cmake/src/math/subpaving/tactic/CMakeLists.txt b/src/math/subpaving/tactic/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/math/subpaving/tactic/CMakeLists.txt
rename to src/math/subpaving/tactic/CMakeLists.txt
diff --git a/contrib/cmake/src/model/CMakeLists.txt b/src/model/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/model/CMakeLists.txt
rename to src/model/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/base/CMakeLists.txt b/src/muz/base/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/base/CMakeLists.txt
rename to src/muz/base/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/bmc/CMakeLists.txt b/src/muz/bmc/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/bmc/CMakeLists.txt
rename to src/muz/bmc/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/clp/CMakeLists.txt b/src/muz/clp/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/clp/CMakeLists.txt
rename to src/muz/clp/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/dataflow/CMakeLists.txt b/src/muz/dataflow/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/dataflow/CMakeLists.txt
rename to src/muz/dataflow/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/ddnf/CMakeLists.txt b/src/muz/ddnf/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/ddnf/CMakeLists.txt
rename to src/muz/ddnf/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/duality/CMakeLists.txt b/src/muz/duality/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/duality/CMakeLists.txt
rename to src/muz/duality/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/fp/CMakeLists.txt b/src/muz/fp/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/fp/CMakeLists.txt
rename to src/muz/fp/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/pdr/CMakeLists.txt b/src/muz/pdr/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/pdr/CMakeLists.txt
rename to src/muz/pdr/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/rel/CMakeLists.txt b/src/muz/rel/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/rel/CMakeLists.txt
rename to src/muz/rel/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/tab/CMakeLists.txt b/src/muz/tab/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/tab/CMakeLists.txt
rename to src/muz/tab/CMakeLists.txt
diff --git a/contrib/cmake/src/muz/transforms/CMakeLists.txt b/src/muz/transforms/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/muz/transforms/CMakeLists.txt
rename to src/muz/transforms/CMakeLists.txt
diff --git a/contrib/cmake/src/nlsat/CMakeLists.txt b/src/nlsat/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/nlsat/CMakeLists.txt
rename to src/nlsat/CMakeLists.txt
diff --git a/contrib/cmake/src/nlsat/tactic/CMakeLists.txt b/src/nlsat/tactic/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/nlsat/tactic/CMakeLists.txt
rename to src/nlsat/tactic/CMakeLists.txt
diff --git a/contrib/cmake/src/opt/CMakeLists.txt b/src/opt/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/opt/CMakeLists.txt
rename to src/opt/CMakeLists.txt
diff --git a/contrib/cmake/src/parsers/smt/CMakeLists.txt b/src/parsers/smt/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/parsers/smt/CMakeLists.txt
rename to src/parsers/smt/CMakeLists.txt
diff --git a/contrib/cmake/src/parsers/smt2/CMakeLists.txt b/src/parsers/smt2/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/parsers/smt2/CMakeLists.txt
rename to src/parsers/smt2/CMakeLists.txt
diff --git a/contrib/cmake/src/parsers/util/CMakeLists.txt b/src/parsers/util/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/parsers/util/CMakeLists.txt
rename to src/parsers/util/CMakeLists.txt
diff --git a/contrib/cmake/src/qe/CMakeLists.txt b/src/qe/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/qe/CMakeLists.txt
rename to src/qe/CMakeLists.txt
diff --git a/contrib/cmake/src/sat/CMakeLists.txt b/src/sat/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/sat/CMakeLists.txt
rename to src/sat/CMakeLists.txt
diff --git a/contrib/cmake/src/sat/sat_solver/CMakeLists.txt b/src/sat/sat_solver/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/sat/sat_solver/CMakeLists.txt
rename to src/sat/sat_solver/CMakeLists.txt
diff --git a/contrib/cmake/src/sat/tactic/CMakeLists.txt b/src/sat/tactic/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/sat/tactic/CMakeLists.txt
rename to src/sat/tactic/CMakeLists.txt
diff --git a/contrib/cmake/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/shell/CMakeLists.txt
rename to src/shell/CMakeLists.txt
diff --git a/contrib/cmake/src/smt/CMakeLists.txt b/src/smt/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/smt/CMakeLists.txt
rename to src/smt/CMakeLists.txt
diff --git a/contrib/cmake/src/smt/params/CMakeLists.txt b/src/smt/params/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/smt/params/CMakeLists.txt
rename to src/smt/params/CMakeLists.txt
diff --git a/contrib/cmake/src/smt/proto_model/CMakeLists.txt b/src/smt/proto_model/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/smt/proto_model/CMakeLists.txt
rename to src/smt/proto_model/CMakeLists.txt
diff --git a/contrib/cmake/src/smt/tactic/CMakeLists.txt b/src/smt/tactic/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/smt/tactic/CMakeLists.txt
rename to src/smt/tactic/CMakeLists.txt
diff --git a/contrib/cmake/src/solver/CMakeLists.txt b/src/solver/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/solver/CMakeLists.txt
rename to src/solver/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/CMakeLists.txt b/src/tactic/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/CMakeLists.txt
rename to src/tactic/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/aig/CMakeLists.txt b/src/tactic/aig/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/aig/CMakeLists.txt
rename to src/tactic/aig/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/arith/CMakeLists.txt b/src/tactic/arith/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/arith/CMakeLists.txt
rename to src/tactic/arith/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/bv/CMakeLists.txt b/src/tactic/bv/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/bv/CMakeLists.txt
rename to src/tactic/bv/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/core/CMakeLists.txt b/src/tactic/core/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/core/CMakeLists.txt
rename to src/tactic/core/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/fpa/CMakeLists.txt b/src/tactic/fpa/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/fpa/CMakeLists.txt
rename to src/tactic/fpa/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/nlsat_smt/CMakeLists.txt b/src/tactic/nlsat_smt/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/nlsat_smt/CMakeLists.txt
rename to src/tactic/nlsat_smt/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/portfolio/CMakeLists.txt b/src/tactic/portfolio/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/portfolio/CMakeLists.txt
rename to src/tactic/portfolio/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/sls/CMakeLists.txt b/src/tactic/sls/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/sls/CMakeLists.txt
rename to src/tactic/sls/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/smtlogics/CMakeLists.txt b/src/tactic/smtlogics/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/smtlogics/CMakeLists.txt
rename to src/tactic/smtlogics/CMakeLists.txt
diff --git a/contrib/cmake/src/tactic/ufbv/CMakeLists.txt b/src/tactic/ufbv/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/tactic/ufbv/CMakeLists.txt
rename to src/tactic/ufbv/CMakeLists.txt
diff --git a/contrib/cmake/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/test/CMakeLists.txt
rename to src/test/CMakeLists.txt
diff --git a/contrib/cmake/src/test/fuzzing/CMakeLists.txt b/src/test/fuzzing/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/test/fuzzing/CMakeLists.txt
rename to src/test/fuzzing/CMakeLists.txt
diff --git a/contrib/cmake/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/util/CMakeLists.txt
rename to src/util/CMakeLists.txt
diff --git a/contrib/cmake/src/util/lp/CMakeLists.txt b/src/util/lp/CMakeLists.txt
similarity index 100%
rename from contrib/cmake/src/util/lp/CMakeLists.txt
rename to src/util/lp/CMakeLists.txt