Made multi-module and change package names