removed controller.js, each has its' own file now.