Moved Data Model to Main Package