Moved files from app to root
Got router up and running with indexView
Merge conflict resolved