changed folders around, adding mainapp and controllers.js