Update project layout to post 1.4
Simplify common views
Tidy with flake8