Refactored package names
More changes to multi-module setup