Moved out BaseController and added StorageController