First batch of renaming and work.

Implemented an initial data manager provider and worked on the data manager.