Cleaned out model of all unnecessary entities. Renamed/organized and
sorted the remaining.