Merge ControllerProvider and Controller into unique file