Added notes
Renamed classes and added notes