join controllers into fewer files