Add application view and controller
Merge
Merge init
Rebuild
Remove old files preventing build