Package Cleanup

- Cleanups (ZCML, code, pep8, indenting)
- Move views into browser package.