converted to a proper package