Refactoring: simplify from multi (3) module to single module project