[BACKLOG-872] Restructure Data Access to allow for deterministic build
Merge pull request #588 from mdamour1976/master

[BACKLOG-872] Restructure Data Access to allow for deterministic build