I was going to move the controllers to core as part of the re-org, could we take this opportunity to move add content-controller to core?