Add command line arguments to run.py; organize imports