#11 Moved controllers into individual folders to make code easier to browse