Restructure a bit for different environments like

- What machine (by %USERNAME%) things are running on
- Whether things are running in the original model run dir style
structure or results style directory