Removed globals from includes, updated all files to remove global dependencies
Rearranged files so handlers (controllers) have their own directory