moved and modifed views to fit with Jinja2 Templating
Removed files from views, proper templates added where they belong