package restructured