Reorganize runs with ExpRuns. Clean up code.
Massive reorganization