Minor updates

- Added collection base for models and views
- Added mediator module helper/wrapper
- OCD clean up