Made it into a proper package