Removed sun model.
Renamed the file and relocated.
Renamed and relocated views.