Moved DataController to model package