first commit for adaption for the classes.
try to improve readability
really big changes.