Add views and routes to the structure.
Fix needs to happen to show views.
Deleted merge conflict.