Revert "[BACKLOG-872] Restructure Data Access to allow for deterministic build"
Merge pull request #2171 from pentaho/revert-2164-cleanup

Revert "[BACKLOG-872] Restructure Data Access to allow for deterministic...