merged app and controllers files for angular