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

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