Closes #2: Changed package names to reflect GroupId