diff --git a/Microsoft.Z3/AST.cs b/src/Microsoft.Z3/AST.cs
similarity index 100%
rename from Microsoft.Z3/AST.cs
rename to src/Microsoft.Z3/AST.cs
diff --git a/Microsoft.Z3/ASTMap.cs b/src/Microsoft.Z3/ASTMap.cs
similarity index 100%
rename from Microsoft.Z3/ASTMap.cs
rename to src/Microsoft.Z3/ASTMap.cs
diff --git a/Microsoft.Z3/ASTVector.cs b/src/Microsoft.Z3/ASTVector.cs
similarity index 100%
rename from Microsoft.Z3/ASTVector.cs
rename to src/Microsoft.Z3/ASTVector.cs
diff --git a/Microsoft.Z3/ApplyResult.cs b/src/Microsoft.Z3/ApplyResult.cs
similarity index 100%
rename from Microsoft.Z3/ApplyResult.cs
rename to src/Microsoft.Z3/ApplyResult.cs
diff --git a/Microsoft.Z3/Constructor.cs b/src/Microsoft.Z3/Constructor.cs
similarity index 100%
rename from Microsoft.Z3/Constructor.cs
rename to src/Microsoft.Z3/Constructor.cs
diff --git a/Microsoft.Z3/Context.cs b/src/Microsoft.Z3/Context.cs
similarity index 100%
rename from Microsoft.Z3/Context.cs
rename to src/Microsoft.Z3/Context.cs
diff --git a/Microsoft.Z3/DecRefQUeue.cs b/src/Microsoft.Z3/DecRefQUeue.cs
similarity index 100%
rename from Microsoft.Z3/DecRefQUeue.cs
rename to src/Microsoft.Z3/DecRefQUeue.cs
diff --git a/Microsoft.Z3/Enumerations.cs b/src/Microsoft.Z3/Enumerations.cs
similarity index 100%
rename from Microsoft.Z3/Enumerations.cs
rename to src/Microsoft.Z3/Enumerations.cs
diff --git a/Microsoft.Z3/Expr.cs b/src/Microsoft.Z3/Expr.cs
similarity index 100%
rename from Microsoft.Z3/Expr.cs
rename to src/Microsoft.Z3/Expr.cs
diff --git a/Microsoft.Z3/Fixedpoint.cs b/src/Microsoft.Z3/Fixedpoint.cs
similarity index 100%
rename from Microsoft.Z3/Fixedpoint.cs
rename to src/Microsoft.Z3/Fixedpoint.cs
diff --git a/Microsoft.Z3/FuncDecl.cs b/src/Microsoft.Z3/FuncDecl.cs
similarity index 100%
rename from Microsoft.Z3/FuncDecl.cs
rename to src/Microsoft.Z3/FuncDecl.cs
diff --git a/Microsoft.Z3/FuncInterp.cs b/src/Microsoft.Z3/FuncInterp.cs
similarity index 100%
rename from Microsoft.Z3/FuncInterp.cs
rename to src/Microsoft.Z3/FuncInterp.cs
diff --git a/Microsoft.Z3/Goal.cs b/src/Microsoft.Z3/Goal.cs
similarity index 100%
rename from Microsoft.Z3/Goal.cs
rename to src/Microsoft.Z3/Goal.cs
diff --git a/Microsoft.Z3/Log.cs b/src/Microsoft.Z3/Log.cs
similarity index 100%
rename from Microsoft.Z3/Log.cs
rename to src/Microsoft.Z3/Log.cs
diff --git a/Microsoft.Z3/Microsoft.Z3.csproj b/src/Microsoft.Z3/Microsoft.Z3.csproj
similarity index 100%
rename from Microsoft.Z3/Microsoft.Z3.csproj
rename to src/Microsoft.Z3/Microsoft.Z3.csproj
diff --git a/Microsoft.Z3/Microsoft.Z3_35.csproj b/src/Microsoft.Z3/Microsoft.Z3_35.csproj
similarity index 100%
rename from Microsoft.Z3/Microsoft.Z3_35.csproj
rename to src/Microsoft.Z3/Microsoft.Z3_35.csproj
diff --git a/Microsoft.Z3/Model.cs b/src/Microsoft.Z3/Model.cs
similarity index 100%
rename from Microsoft.Z3/Model.cs
rename to src/Microsoft.Z3/Model.cs
diff --git a/Microsoft.Z3/Native.cs b/src/Microsoft.Z3/Native.cs
similarity index 100%
rename from Microsoft.Z3/Native.cs
rename to src/Microsoft.Z3/Native.cs
diff --git a/Microsoft.Z3/Numeral.cs b/src/Microsoft.Z3/Numeral.cs
similarity index 100%
rename from Microsoft.Z3/Numeral.cs
rename to src/Microsoft.Z3/Numeral.cs
diff --git a/Microsoft.Z3/ParamDescrs.cs b/src/Microsoft.Z3/ParamDescrs.cs
similarity index 100%
rename from Microsoft.Z3/ParamDescrs.cs
rename to src/Microsoft.Z3/ParamDescrs.cs
diff --git a/Microsoft.Z3/Params.cs b/src/Microsoft.Z3/Params.cs
similarity index 100%
rename from Microsoft.Z3/Params.cs
rename to src/Microsoft.Z3/Params.cs
diff --git a/Microsoft.Z3/Pattern.cs b/src/Microsoft.Z3/Pattern.cs
similarity index 100%
rename from Microsoft.Z3/Pattern.cs
rename to src/Microsoft.Z3/Pattern.cs
diff --git a/Microsoft.Z3/Probe.cs b/src/Microsoft.Z3/Probe.cs
similarity index 100%
rename from Microsoft.Z3/Probe.cs
rename to src/Microsoft.Z3/Probe.cs
diff --git a/Microsoft.Z3/Properties/AssemblyInfo.cs b/src/Microsoft.Z3/Properties/AssemblyInfo.cs
similarity index 100%
rename from Microsoft.Z3/Properties/AssemblyInfo.cs
rename to src/Microsoft.Z3/Properties/AssemblyInfo.cs
diff --git a/Microsoft.Z3/Quantifier.cs b/src/Microsoft.Z3/Quantifier.cs
similarity index 100%
rename from Microsoft.Z3/Quantifier.cs
rename to src/Microsoft.Z3/Quantifier.cs
diff --git a/Microsoft.Z3/Solver.cs b/src/Microsoft.Z3/Solver.cs
similarity index 100%
rename from Microsoft.Z3/Solver.cs
rename to src/Microsoft.Z3/Solver.cs
diff --git a/Microsoft.Z3/Sort.cs b/src/Microsoft.Z3/Sort.cs
similarity index 100%
rename from Microsoft.Z3/Sort.cs
rename to src/Microsoft.Z3/Sort.cs
diff --git a/Microsoft.Z3/Statistics.cs b/src/Microsoft.Z3/Statistics.cs
similarity index 100%
rename from Microsoft.Z3/Statistics.cs
rename to src/Microsoft.Z3/Statistics.cs
diff --git a/Microsoft.Z3/Status.cs b/src/Microsoft.Z3/Status.cs
similarity index 100%
rename from Microsoft.Z3/Status.cs
rename to src/Microsoft.Z3/Status.cs
diff --git a/Microsoft.Z3/Symbol.cs b/src/Microsoft.Z3/Symbol.cs
similarity index 100%
rename from Microsoft.Z3/Symbol.cs
rename to src/Microsoft.Z3/Symbol.cs
diff --git a/Microsoft.Z3/Tactic.cs b/src/Microsoft.Z3/Tactic.cs
similarity index 100%
rename from Microsoft.Z3/Tactic.cs
rename to src/Microsoft.Z3/Tactic.cs
diff --git a/Microsoft.Z3/Version.cs b/src/Microsoft.Z3/Version.cs
similarity index 100%
rename from Microsoft.Z3/Version.cs
rename to src/Microsoft.Z3/Version.cs
diff --git a/Microsoft.Z3/Z3Exception.cs b/src/Microsoft.Z3/Z3Exception.cs
similarity index 100%
rename from Microsoft.Z3/Z3Exception.cs
rename to src/Microsoft.Z3/Z3Exception.cs
diff --git a/Microsoft.Z3/Z3Object.cs b/src/Microsoft.Z3/Z3Object.cs
similarity index 100%
rename from Microsoft.Z3/Z3Object.cs
rename to src/Microsoft.Z3/Z3Object.cs
diff --git a/Microsoft.Z3/test_mapi/Program.cs b/src/Microsoft.Z3/test_mapi/Program.cs
similarity index 100%
rename from Microsoft.Z3/test_mapi/Program.cs
rename to src/Microsoft.Z3/test_mapi/Program.cs
diff --git a/Microsoft.Z3/test_mapi/build.cmd b/src/Microsoft.Z3/test_mapi/build.cmd
similarity index 100%
rename from Microsoft.Z3/test_mapi/build.cmd
rename to src/Microsoft.Z3/test_mapi/build.cmd
diff --git a/Microsoft.Z3/test_mapi/test_mapi.csproj b/src/Microsoft.Z3/test_mapi/test_mapi.csproj
similarity index 100%
rename from Microsoft.Z3/test_mapi/test_mapi.csproj
rename to src/Microsoft.Z3/test_mapi/test_mapi.csproj
diff --git a/Microsoft.Z3V3/AssemblyInfo.cpp b/src/Microsoft.Z3V3/AssemblyInfo.cpp
similarity index 100%
rename from Microsoft.Z3V3/AssemblyInfo.cpp
rename to src/Microsoft.Z3V3/AssemblyInfo.cpp
diff --git a/Microsoft.Z3V3/Microsoft.Z3V3.cpp b/src/Microsoft.Z3V3/Microsoft.Z3V3.cpp
similarity index 100%
rename from Microsoft.Z3V3/Microsoft.Z3V3.cpp
rename to src/Microsoft.Z3V3/Microsoft.Z3V3.cpp
diff --git a/Microsoft.Z3V3/Microsoft.Z3V3.h b/src/Microsoft.Z3V3/Microsoft.Z3V3.h
similarity index 100%
rename from Microsoft.Z3V3/Microsoft.Z3V3.h
rename to src/Microsoft.Z3V3/Microsoft.Z3V3.h
diff --git a/Microsoft.Z3V3/Microsoft.Z3V3.vcxproj b/src/Microsoft.Z3V3/Microsoft.Z3V3.vcxproj
similarity index 100%
rename from Microsoft.Z3V3/Microsoft.Z3V3.vcxproj
rename to src/Microsoft.Z3V3/Microsoft.Z3V3.vcxproj
diff --git a/ml/add_error_checking.V3.sed b/src/ml/add_error_checking.V3.sed
similarity index 100%
rename from ml/add_error_checking.V3.sed
rename to src/ml/add_error_checking.V3.sed
diff --git a/ml/add_error_checking.sed b/src/ml/add_error_checking.sed
similarity index 100%
rename from ml/add_error_checking.sed
rename to src/ml/add_error_checking.sed
diff --git a/ml/build.cmd b/src/ml/build.cmd
similarity index 100%
rename from ml/build.cmd
rename to src/ml/build.cmd
diff --git a/ml/build.sed b/src/ml/build.sed
similarity index 100%
rename from ml/build.sed
rename to src/ml/build.sed
diff --git a/ml/clean.cmd b/src/ml/clean.cmd
similarity index 100%
rename from ml/clean.cmd
rename to src/ml/clean.cmd
diff --git a/ml/cleantmp.cmd b/src/ml/cleantmp.cmd
similarity index 100%
rename from ml/cleantmp.cmd
rename to src/ml/cleantmp.cmd
diff --git a/ml/compile_mlapi.cmd b/src/ml/compile_mlapi.cmd
similarity index 100%
rename from ml/compile_mlapi.cmd
rename to src/ml/compile_mlapi.cmd
diff --git a/ml/error_handling.idl b/src/ml/error_handling.idl
similarity index 100%
rename from ml/error_handling.idl
rename to src/ml/error_handling.idl
diff --git a/ml/generate_mlapi.cmd b/src/ml/generate_mlapi.cmd
similarity index 100%
rename from ml/generate_mlapi.cmd
rename to src/ml/generate_mlapi.cmd
diff --git a/ml/import.cmd b/src/ml/import.cmd
similarity index 100%
rename from ml/import.cmd
rename to src/ml/import.cmd
diff --git a/ml/mlx_get_app_args.idl b/src/ml/mlx_get_app_args.idl
similarity index 100%
rename from ml/mlx_get_app_args.idl
rename to src/ml/mlx_get_app_args.idl
diff --git a/ml/mlx_get_array_sort.idl b/src/ml/mlx_get_array_sort.idl
similarity index 100%
rename from ml/mlx_get_array_sort.idl
rename to src/ml/mlx_get_array_sort.idl
diff --git a/ml/mlx_get_datatype_sort.idl b/src/ml/mlx_get_datatype_sort.idl
similarity index 100%
rename from ml/mlx_get_datatype_sort.idl
rename to src/ml/mlx_get_datatype_sort.idl
diff --git a/ml/mlx_get_domains.idl b/src/ml/mlx_get_domains.idl
similarity index 100%
rename from ml/mlx_get_domains.idl
rename to src/ml/mlx_get_domains.idl
diff --git a/ml/mlx_get_error_msg.idl b/src/ml/mlx_get_error_msg.idl
similarity index 100%
rename from ml/mlx_get_error_msg.idl
rename to src/ml/mlx_get_error_msg.idl
diff --git a/ml/mlx_get_pattern_terms.idl b/src/ml/mlx_get_pattern_terms.idl
similarity index 100%
rename from ml/mlx_get_pattern_terms.idl
rename to src/ml/mlx_get_pattern_terms.idl
diff --git a/ml/mlx_get_tuple_sort.idl b/src/ml/mlx_get_tuple_sort.idl
similarity index 100%
rename from ml/mlx_get_tuple_sort.idl
rename to src/ml/mlx_get_tuple_sort.idl
diff --git a/ml/mlx_mk_context_x.idl b/src/ml/mlx_mk_context_x.idl
similarity index 100%
rename from ml/mlx_mk_context_x.idl
rename to src/ml/mlx_mk_context_x.idl
diff --git a/ml/mlx_mk_datatypes.idl b/src/ml/mlx_mk_datatypes.idl
similarity index 100%
rename from ml/mlx_mk_datatypes.idl
rename to src/ml/mlx_mk_datatypes.idl
diff --git a/ml/mlx_mk_numeral.idl b/src/ml/mlx_mk_numeral.idl
similarity index 100%
rename from ml/mlx_mk_numeral.idl
rename to src/ml/mlx_mk_numeral.idl
diff --git a/ml/mlx_mk_sort.idl b/src/ml/mlx_mk_sort.idl
similarity index 100%
rename from ml/mlx_mk_sort.idl
rename to src/ml/mlx_mk_sort.idl
diff --git a/ml/mlx_mk_symbol.idl b/src/ml/mlx_mk_symbol.idl
similarity index 100%
rename from ml/mlx_mk_symbol.idl
rename to src/ml/mlx_mk_symbol.idl
diff --git a/ml/mlx_model.idl b/src/ml/mlx_model.idl
similarity index 100%
rename from ml/mlx_model.idl
rename to src/ml/mlx_model.idl
diff --git a/ml/mlx_numeral_refine.idl b/src/ml/mlx_numeral_refine.idl
similarity index 100%
rename from ml/mlx_numeral_refine.idl
rename to src/ml/mlx_numeral_refine.idl
diff --git a/ml/mlx_parse_smtlib.idl b/src/ml/mlx_parse_smtlib.idl
similarity index 100%
rename from ml/mlx_parse_smtlib.idl
rename to src/ml/mlx_parse_smtlib.idl
diff --git a/ml/mlx_sort_refine.idl b/src/ml/mlx_sort_refine.idl
similarity index 100%
rename from ml/mlx_sort_refine.idl
rename to src/ml/mlx_sort_refine.idl
diff --git a/ml/mlx_statistics.idl b/src/ml/mlx_statistics.idl
similarity index 100%
rename from ml/mlx_statistics.idl
rename to src/ml/mlx_statistics.idl
diff --git a/ml/mlx_symbol_refine.idl b/src/ml/mlx_symbol_refine.idl
similarity index 100%
rename from ml/mlx_symbol_refine.idl
rename to src/ml/mlx_symbol_refine.idl
diff --git a/ml/mlx_term_refine.idl b/src/ml/mlx_term_refine.idl
similarity index 100%
rename from ml/mlx_term_refine.idl
rename to src/ml/mlx_term_refine.idl
diff --git a/ml/msbuild.proj b/src/ml/msbuild.proj
similarity index 100%
rename from ml/msbuild.proj
rename to src/ml/msbuild.proj
diff --git a/ml/queen.ml b/src/ml/queen.ml
similarity index 100%
rename from ml/queen.ml
rename to src/ml/queen.ml
diff --git a/ml/queen.regress.err b/src/ml/queen.regress.err
similarity index 100%
rename from ml/queen.regress.err
rename to src/ml/queen.regress.err
diff --git a/ml/queen.regress.out b/src/ml/queen.regress.out
similarity index 100%
rename from ml/queen.regress.out
rename to src/ml/queen.regress.out
diff --git a/ml/readme.txt b/src/ml/readme.txt
similarity index 100%
rename from ml/readme.txt
rename to src/ml/readme.txt
diff --git a/ml/regress.cmd b/src/ml/regress.cmd
similarity index 100%
rename from ml/regress.cmd
rename to src/ml/regress.cmd
diff --git a/ml/test_capi.regress.err b/src/ml/test_capi.regress.err
similarity index 100%
rename from ml/test_capi.regress.err
rename to src/ml/test_capi.regress.err
diff --git a/ml/test_capi.regress.out b/src/ml/test_capi.regress.out
similarity index 100%
rename from ml/test_capi.regress.out
rename to src/ml/test_capi.regress.out
diff --git a/ml/test_mlapi.cmd b/src/ml/test_mlapi.cmd
similarity index 100%
rename from ml/test_mlapi.cmd
rename to src/ml/test_mlapi.cmd
diff --git a/ml/test_mlapi.ml b/src/ml/test_mlapi.ml
similarity index 100%
rename from ml/test_mlapi.ml
rename to src/ml/test_mlapi.ml
diff --git a/ml/test_mlapi.regress.err b/src/ml/test_mlapi.regress.err
similarity index 100%
rename from ml/test_mlapi.regress.err
rename to src/ml/test_mlapi.regress.err
diff --git a/ml/test_mlapi.regress.out b/src/ml/test_mlapi.regress.out
similarity index 100%
rename from ml/test_mlapi.regress.out
rename to src/ml/test_mlapi.regress.out
diff --git a/ml/test_mlapiV3.ml b/src/ml/test_mlapiV3.ml
similarity index 100%
rename from ml/test_mlapiV3.ml
rename to src/ml/test_mlapiV3.ml
diff --git a/ml/test_mlapiV3.regress.err b/src/ml/test_mlapiV3.regress.err
similarity index 100%
rename from ml/test_mlapiV3.regress.err
rename to src/ml/test_mlapiV3.regress.err
diff --git a/ml/test_mlapiV3.regress.out b/src/ml/test_mlapiV3.regress.out
similarity index 100%
rename from ml/test_mlapiV3.regress.out
rename to src/ml/test_mlapiV3.regress.out
diff --git a/ml/test_theory.ml b/src/ml/test_theory.ml
similarity index 100%
rename from ml/test_theory.ml
rename to src/ml/test_theory.ml
diff --git a/ml/update-ml-doc.cmd b/src/ml/update-ml-doc.cmd
similarity index 100%
rename from ml/update-ml-doc.cmd
rename to src/ml/update-ml-doc.cmd
diff --git a/ml/x3.ml b/src/ml/x3.ml
similarity index 100%
rename from ml/x3.ml
rename to src/ml/x3.ml
diff --git a/ml/x3V3.ml b/src/ml/x3V3.ml
similarity index 100%
rename from ml/x3V3.ml
rename to src/ml/x3V3.ml
diff --git a/ml/x3V3.mli b/src/ml/x3V3.mli
similarity index 100%
rename from ml/x3V3.mli
rename to src/ml/x3V3.mli
diff --git a/ml/z3.idl b/src/ml/z3.idl
similarity index 100%
rename from ml/z3.idl
rename to src/ml/z3.idl
diff --git a/ml/z3.ml b/src/ml/z3.ml
similarity index 100%
rename from ml/z3.ml
rename to src/ml/z3.ml
diff --git a/ml/z3.mli b/src/ml/z3.mli
similarity index 100%
rename from ml/z3.mli
rename to src/ml/z3.mli
diff --git a/ml/z3.proj b/src/ml/z3.proj
similarity index 100%
rename from ml/z3.proj
rename to src/ml/z3.proj
diff --git a/ml/z3_stubs.c b/src/ml/z3_stubs.c
similarity index 100%
rename from ml/z3_stubs.c
rename to src/ml/z3_stubs.c
diff --git a/ml/z3_theory_stubs.c b/src/ml/z3_theory_stubs.c
similarity index 100%
rename from ml/z3_theory_stubs.c
rename to src/ml/z3_theory_stubs.c