Goal 7 Part 2(d): Clean up naming and organization of controller