Starting to clean up and correct packaging for new design