diff --git a/scripts/mk_make.py b/scripts/mk_make.py
index 22ad87dea..052e44028 100644
--- a/scripts/mk_make.py
+++ b/scripts/mk_make.py
@@ -35,31 +35,31 @@ add_lib('tactic', ['ast', 'model'])
 # Old (non-modular) parameter framework. It has been subsumed by util\params.h.
 # However, it is still used by many old components.
 add_lib('old_params', ['model', 'simplifier'])
-add_lib('framework', ['tactic', 'rewriter', 'model', 'old_params', 'simplifier'])
+add_lib('cmd_context', ['tactic', 'rewriter', 'model', 'old_params', 'simplifier'])
 # Assertion set is the old tactic framework used in Z3 3.x. It will be deleted as soon as we finish the porting old
 # code to the new tactic framework.
-add_lib('assertion_set', ['framework'])
+add_lib('assertion_set', ['cmd_context'])
 add_lib('substitution', ['ast'])
-add_lib('normal_forms', ['framework', 'assertion_set'])
+add_lib('normal_forms', ['tactic', 'assertion_set'])
 add_lib('pattern', ['normal_forms'])
 add_lib('spc', ['simplifier', 'substitution', 'old_params', 'pattern'])
 add_lib('parser_util', ['ast'])
-add_lib('smt2parser', ['framework', 'parser_util'])
+add_lib('smt2parser', ['cmd_context', 'parser_util'])
 add_lib('macros', ['simplifier', 'old_params'])
 add_lib('grobner', ['ast'])
 add_lib('euclid', ['util'])
 add_lib('proof_checker', ['rewriter', 'spc'])
-add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'framework', 'assertion_set'])
-add_lib('smt', ['assertion_set', 'bit_blaster', 'macros', 'normal_forms', 'framework', 
+add_lib('bit_blaster', ['rewriter', 'simplifier', 'old_params', 'tactic', 'assertion_set'])
+add_lib('smt', ['assertion_set', 'bit_blaster', 'macros', 'normal_forms', 'cmd_context', 
                 'substitution', 'grobner', 'euclid', 'proof_checker', 'pattern', 'parser_util'])
 add_lib('user_plugin', ['smt'])
-add_lib('core_tactics', ['framework', 'normal_forms'])
+add_lib('core_tactics', ['tactic', 'normal_forms'])
 add_lib('arith_tactics', ['core_tactics', 'assertion_set', 'sat'])
-add_lib('sat_tactic', ['framework', 'sat'])
+add_lib('sat_tactic', ['tactic', 'sat'])
 add_lib('sat_strategy', ['assertion_set', 'sat_tactic'])
 # TODO: split muz_qe into muz, qe. Perhaps, we should also consider breaking muz into muz and pdr.
 add_lib('muz_qe', ['smt', 'sat', 'smt2parser'])
-add_lib('aig', ['framework', 'assertion_set'])
+add_lib('aig', ['cmd_context', 'assertion_set'])
 # TODO: delete SMT 1.0 frontend
 add_lib('smtparser', ['api_headers', 'smt', 'spc'])
 
diff --git a/src/framework/README b/src/cmd_context/README
similarity index 100%
rename from src/framework/README
rename to src/cmd_context/README
diff --git a/src/framework/basic_cmds.cpp b/src/cmd_context/basic_cmds.cpp
similarity index 100%
rename from src/framework/basic_cmds.cpp
rename to src/cmd_context/basic_cmds.cpp
diff --git a/src/framework/basic_cmds.h b/src/cmd_context/basic_cmds.h
similarity index 100%
rename from src/framework/basic_cmds.h
rename to src/cmd_context/basic_cmds.h
diff --git a/src/framework/check_logic.cpp b/src/cmd_context/check_logic.cpp
similarity index 100%
rename from src/framework/check_logic.cpp
rename to src/cmd_context/check_logic.cpp
diff --git a/src/framework/check_logic.h b/src/cmd_context/check_logic.h
similarity index 100%
rename from src/framework/check_logic.h
rename to src/cmd_context/check_logic.h
diff --git a/src/framework/check_sat_result.h b/src/cmd_context/check_sat_result.h
similarity index 100%
rename from src/framework/check_sat_result.h
rename to src/cmd_context/check_sat_result.h
diff --git a/src/framework/cmd_context.cpp b/src/cmd_context/cmd_context.cpp
similarity index 100%
rename from src/framework/cmd_context.cpp
rename to src/cmd_context/cmd_context.cpp
diff --git a/src/framework/cmd_context.h b/src/cmd_context/cmd_context.h
similarity index 100%
rename from src/framework/cmd_context.h
rename to src/cmd_context/cmd_context.h
diff --git a/src/framework/cmd_context_to_goal.cpp b/src/cmd_context/cmd_context_to_goal.cpp
similarity index 100%
rename from src/framework/cmd_context_to_goal.cpp
rename to src/cmd_context/cmd_context_to_goal.cpp
diff --git a/src/framework/cmd_context_to_goal.h b/src/cmd_context/cmd_context_to_goal.h
similarity index 100%
rename from src/framework/cmd_context_to_goal.h
rename to src/cmd_context/cmd_context_to_goal.h
diff --git a/src/framework/cmd_util.cpp b/src/cmd_context/cmd_util.cpp
similarity index 100%
rename from src/framework/cmd_util.cpp
rename to src/cmd_context/cmd_util.cpp
diff --git a/src/framework/cmd_util.h b/src/cmd_context/cmd_util.h
similarity index 100%
rename from src/framework/cmd_util.h
rename to src/cmd_context/cmd_util.h
diff --git a/src/framework/echo_tactic.cpp b/src/cmd_context/echo_tactic.cpp
similarity index 100%
rename from src/framework/echo_tactic.cpp
rename to src/cmd_context/echo_tactic.cpp
diff --git a/src/framework/echo_tactic.h b/src/cmd_context/echo_tactic.h
similarity index 100%
rename from src/framework/echo_tactic.h
rename to src/cmd_context/echo_tactic.h
diff --git a/src/framework/eval_cmd.cpp b/src/cmd_context/eval_cmd.cpp
similarity index 100%
rename from src/framework/eval_cmd.cpp
rename to src/cmd_context/eval_cmd.cpp
diff --git a/src/framework/eval_cmd.h b/src/cmd_context/eval_cmd.h
similarity index 100%
rename from src/framework/eval_cmd.h
rename to src/cmd_context/eval_cmd.h
diff --git a/src/framework/parametric_cmd.cpp b/src/cmd_context/parametric_cmd.cpp
similarity index 100%
rename from src/framework/parametric_cmd.cpp
rename to src/cmd_context/parametric_cmd.cpp
diff --git a/src/framework/parametric_cmd.h b/src/cmd_context/parametric_cmd.h
similarity index 100%
rename from src/framework/parametric_cmd.h
rename to src/cmd_context/parametric_cmd.h
diff --git a/src/framework/pdecl.cpp b/src/cmd_context/pdecl.cpp
similarity index 100%
rename from src/framework/pdecl.cpp
rename to src/cmd_context/pdecl.cpp
diff --git a/src/framework/pdecl.h b/src/cmd_context/pdecl.h
similarity index 100%
rename from src/framework/pdecl.h
rename to src/cmd_context/pdecl.h
diff --git a/src/framework/progress_callback.h b/src/cmd_context/progress_callback.h
similarity index 100%
rename from src/framework/progress_callback.h
rename to src/cmd_context/progress_callback.h
diff --git a/src/framework/simplify_cmd.cpp b/src/cmd_context/simplify_cmd.cpp
similarity index 100%
rename from src/framework/simplify_cmd.cpp
rename to src/cmd_context/simplify_cmd.cpp
diff --git a/src/framework/simplify_cmd.h b/src/cmd_context/simplify_cmd.h
similarity index 100%
rename from src/framework/simplify_cmd.h
rename to src/cmd_context/simplify_cmd.h
diff --git a/src/framework/solver.cpp b/src/cmd_context/solver.cpp
similarity index 100%
rename from src/framework/solver.cpp
rename to src/cmd_context/solver.cpp
diff --git a/src/framework/solver.h b/src/cmd_context/solver.h
similarity index 100%
rename from src/framework/solver.h
rename to src/cmd_context/solver.h
diff --git a/src/framework/strategic_solver.cpp b/src/cmd_context/strategic_solver.cpp
similarity index 100%
rename from src/framework/strategic_solver.cpp
rename to src/cmd_context/strategic_solver.cpp
diff --git a/src/framework/strategic_solver.h b/src/cmd_context/strategic_solver.h
similarity index 100%
rename from src/framework/strategic_solver.h
rename to src/cmd_context/strategic_solver.h
diff --git a/src/framework/tactic2solver.cpp b/src/cmd_context/tactic2solver.cpp
similarity index 100%
rename from src/framework/tactic2solver.cpp
rename to src/cmd_context/tactic2solver.cpp
diff --git a/src/framework/tactic2solver.h b/src/cmd_context/tactic2solver.h
similarity index 100%
rename from src/framework/tactic2solver.h
rename to src/cmd_context/tactic2solver.h
diff --git a/src/framework/tactic_cmds.cpp b/src/cmd_context/tactic_cmds.cpp
similarity index 100%
rename from src/framework/tactic_cmds.cpp
rename to src/cmd_context/tactic_cmds.cpp
diff --git a/src/framework/tactic_cmds.h b/src/cmd_context/tactic_cmds.h
similarity index 100%
rename from src/framework/tactic_cmds.h
rename to src/cmd_context/tactic_cmds.h
diff --git a/src/framework/tactic_manager.cpp b/src/cmd_context/tactic_manager.cpp
similarity index 100%
rename from src/framework/tactic_manager.cpp
rename to src/cmd_context/tactic_manager.cpp
diff --git a/src/framework/tactic_manager.h b/src/cmd_context/tactic_manager.h
similarity index 100%
rename from src/framework/tactic_manager.h
rename to src/cmd_context/tactic_manager.h