Extracted controllers into their own files and made the application modular. All test passing