re-org packages