Convert to a proper package