Modified project to multi-module