Different dirs fix

Submitting a Jira which will explain and reference this pull request.  I don't know why there are 2 commits in this pull request along with mine, ignore them.. I'm not sure why I did wrong.