Updating directory handling logic
Updating run script.
Merge remote-tracking branch 'origin/master'