Fixes Issue #30

Controllers now follow [name]-controller.js naming convention