Moved base controller to core package