reorganize view functions so they're all in views.py
Merge branch 'cleanup'
remove old unused main file
Merge branch 'cleanup'