Moved data related classes out to their own namespace.