reorg'd repo, and merged some gpfs trace libs