package restructring