Refactoring view names 30% done | Also fixing old view
Rearrange modules
ceanup