renamed controller.js and services.js