Created new data service and cleaned up imports and controllers.