Changed packages to match maven groupId