Fix location change issues
Merge pull request #43 from atlasapi/MBST-8643-reordered-sources

Fix location change issues