Move BaseController to CoreController