Renamed classes
Merge branch 'master' of github.com:langest/komp14