rearranged controllers to be next to views