add some more packages, re-org others