Finishing the initial refactor with broken out controllers