Moved all data related classes to a new namespace