Maven build + Updated package names