Updated run script (code layout only)

Did a bit of cleaning up on the run.py script, see commit messages.

Not touching FILE_LIB at all (as discussed in #144)