Continued refactoring as a multi-module project
Continued refactoring as a multi-module project