Cleanup packages, rearrange