Package restructure and housekeeping