Renamed classes to UpperCamel, add attributes and methods.