Update move controllers to classes and mount provider