Updated Controller Class

Added function/variable definitions into controller class, grouped
#includes in main for clarity, created testDriver for Controller.