fixed views exports and added router
simplified views
merged