diff --git a/scripts/mk_make.py b/scripts/mk_make.py
index a79a0034f..1a3a6229a 100644
--- a/scripts/mk_make.py
+++ b/scripts/mk_make.py
@@ -30,8 +30,8 @@ add_lib('old_params', ['model', 'simplifier'])
 add_lib('cmd_context', ['tactic', 'rewriter', 'model', 'old_params', 'simplifier'])
 add_lib('substitution', ['ast'], 'ast/substitution')
 add_lib('normal_forms', ['rewriter', 'old_params'], 'ast/normal_forms')
-add_lib('parser_util', ['ast'])
-add_lib('smt2parser', ['cmd_context', 'parser_util'])
+add_lib('parser_util', ['ast'], 'parsers/util')
+add_lib('smt2parser', ['cmd_context', 'parser_util'], 'parsers/smt2')
 add_lib('pattern', ['normal_forms', 'smt2parser'], 'ast/pattern')
 add_lib('macros', ['simplifier', 'old_params'], 'ast/macros')
 add_lib('grobner', ['ast'], 'math/grobner')
@@ -59,7 +59,7 @@ add_lib('smtlogic_tactics', ['arith_tactics', 'bv_tactics', 'nlsat_tactic', 'smt
 add_lib('ufbv_tactic', ['normal_forms', 'core_tactics', 'macros', 'smt_tactic', 'rewriter'], 'tactic/ufbv')
 add_lib('portfolio', ['smtlogic_tactics', 'ufbv_tactic', 'fpa', 'aig', 'muz_qe', 'sls_tactic', 'subpaving_tactic'], 'tactic/portfolio')
 # TODO: delete SMT 1.0 frontend
-add_lib('smtparser', ['portfolio'])
+add_lib('smtparser', ['portfolio'], 'parsers/smt')
 add_lib('api', ['portfolio', 'user_plugin', 'smtparser'])
 add_exe('shell', ['api', 'sat', 'extra_cmds'], exe_name='z3')
 add_exe('test', ['api', 'fuzzing'], exe_name='test-z3')
diff --git a/src/smtparser/smtlib.cpp b/src/parsers/smt/smtlib.cpp
similarity index 100%
rename from src/smtparser/smtlib.cpp
rename to src/parsers/smt/smtlib.cpp
diff --git a/src/smtparser/smtlib.h b/src/parsers/smt/smtlib.h
similarity index 100%
rename from src/smtparser/smtlib.h
rename to src/parsers/smt/smtlib.h
diff --git a/src/smtparser/smtlib_solver.cpp b/src/parsers/smt/smtlib_solver.cpp
similarity index 100%
rename from src/smtparser/smtlib_solver.cpp
rename to src/parsers/smt/smtlib_solver.cpp
diff --git a/src/smtparser/smtlib_solver.h b/src/parsers/smt/smtlib_solver.h
similarity index 100%
rename from src/smtparser/smtlib_solver.h
rename to src/parsers/smt/smtlib_solver.h
diff --git a/src/smtparser/smtparser.cpp b/src/parsers/smt/smtparser.cpp
similarity index 100%
rename from src/smtparser/smtparser.cpp
rename to src/parsers/smt/smtparser.cpp
diff --git a/src/smtparser/smtparser.h b/src/parsers/smt/smtparser.h
similarity index 100%
rename from src/smtparser/smtparser.h
rename to src/parsers/smt/smtparser.h
diff --git a/src/smt2parser/smt2parser.cpp b/src/parsers/smt2/smt2parser.cpp
similarity index 100%
rename from src/smt2parser/smt2parser.cpp
rename to src/parsers/smt2/smt2parser.cpp
diff --git a/src/smt2parser/smt2parser.h b/src/parsers/smt2/smt2parser.h
similarity index 100%
rename from src/smt2parser/smt2parser.h
rename to src/parsers/smt2/smt2parser.h
diff --git a/src/smt2parser/smt2scanner.cpp b/src/parsers/smt2/smt2scanner.cpp
similarity index 100%
rename from src/smt2parser/smt2scanner.cpp
rename to src/parsers/smt2/smt2scanner.cpp
diff --git a/src/smt2parser/smt2scanner.h b/src/parsers/smt2/smt2scanner.h
similarity index 100%
rename from src/smt2parser/smt2scanner.h
rename to src/parsers/smt2/smt2scanner.h
diff --git a/src/parser_util/cost_parser.cpp b/src/parsers/util/cost_parser.cpp
similarity index 100%
rename from src/parser_util/cost_parser.cpp
rename to src/parsers/util/cost_parser.cpp
diff --git a/src/parser_util/cost_parser.h b/src/parsers/util/cost_parser.h
similarity index 100%
rename from src/parser_util/cost_parser.h
rename to src/parsers/util/cost_parser.h
diff --git a/src/parser_util/pattern_validation.cpp b/src/parsers/util/pattern_validation.cpp
similarity index 100%
rename from src/parser_util/pattern_validation.cpp
rename to src/parsers/util/pattern_validation.cpp
diff --git a/src/parser_util/pattern_validation.h b/src/parsers/util/pattern_validation.h
similarity index 100%
rename from src/parser_util/pattern_validation.h
rename to src/parsers/util/pattern_validation.h
diff --git a/src/parser_util/scanner.cpp b/src/parsers/util/scanner.cpp
similarity index 100%
rename from src/parser_util/scanner.cpp
rename to src/parsers/util/scanner.cpp
diff --git a/src/parser_util/scanner.h b/src/parsers/util/scanner.h
similarity index 100%
rename from src/parser_util/scanner.h
rename to src/parsers/util/scanner.h
diff --git a/src/parser_util/simple_parser.cpp b/src/parsers/util/simple_parser.cpp
similarity index 100%
rename from src/parser_util/simple_parser.cpp
rename to src/parsers/util/simple_parser.cpp
diff --git a/src/parser_util/simple_parser.h b/src/parsers/util/simple_parser.h
similarity index 100%
rename from src/parser_util/simple_parser.h
rename to src/parsers/util/simple_parser.h