controller: port to new controller location and api
37 files changed