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

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