Un-Nested Data Classes and moved to own Namespace