diff --git a/lib/st2tactic.cpp b/src/assertion_set/st2tactic.cpp
similarity index 100%
rename from lib/st2tactic.cpp
rename to src/assertion_set/st2tactic.cpp
diff --git a/lib/st2tactic.h b/src/assertion_set/st2tactic.h
similarity index 100%
rename from lib/st2tactic.h
rename to src/assertion_set/st2tactic.h
diff --git a/lib/cost_parser.cpp b/src/parser_util/cost_parser.cpp
similarity index 100%
rename from lib/cost_parser.cpp
rename to src/parser_util/cost_parser.cpp
diff --git a/lib/cost_parser.h b/src/parser_util/cost_parser.h
similarity index 100%
rename from lib/cost_parser.h
rename to src/parser_util/cost_parser.h
diff --git a/lib/scanner.cpp b/src/parser_util/scanner.cpp
similarity index 100%
rename from lib/scanner.cpp
rename to src/parser_util/scanner.cpp
diff --git a/lib/scanner.h b/src/parser_util/scanner.h
similarity index 100%
rename from lib/scanner.h
rename to src/parser_util/scanner.h
diff --git a/lib/simple_parser.cpp b/src/parser_util/simple_parser.cpp
similarity index 100%
rename from lib/simple_parser.cpp
rename to src/parser_util/simple_parser.cpp
diff --git a/lib/simple_parser.h b/src/parser_util/simple_parser.h
similarity index 100%
rename from lib/simple_parser.h
rename to src/parser_util/simple_parser.h