Finished package restructuring.