More organisation; changed class names from Xcode defaults
organization; changed class names