(fix) Put controllers in separate files
Merge pull request #36 from NBallaney/master

(fix) Put controllers in separate files