General: Looked over all Classes and make some refactorings. Now we can
programm new functions.