Clean up

Cleaned up directory, added vampir trace files, untarred stuff.