Renamed classes
Removed managers from Model