Changed package name and updated formatting