Renamed classes
Added images