rearrange packages, other cleanup