Removed unused code, created model for broadcasts
Renamed files to enforce code style