Added exe-dir awareness as opposed to just run-dir.