Changed package names, groupId