Changed class/method-names and sorted files