refactoring into 2-module project
Refactoring into 2-module project