Refactoring project structure to be multi-module