#900 Part 2 - Reorganize Data Code

This is the 2nd part of a chain of pull requests that will all be pulled in together. I separated them out to make it easier to review

---

This is the big reorganization and renamespacing of data stuff. As @TimLovellSmith suggested, I initially kept the namespace the same, but the Entity discovery code I have later depends on searching a namespace because I want to keep it really simple.