Remove obsolete files, add indirection/collapsed
Files used for paper experiments