Collapse controllers into a single package