Moved run_* to according dirs. Also fixed newbish method-related bug