move more extra packages from ./trunk to ./packages