Move more base controllers to core
Move more base controllers to core module