Bug fixes and reorganizations
Fixed import bug in running.py