Refactored namespaces.

Seems to make more sense if something deriving from data is under its namespace.