big update

to much to list erverything - mostly I moved parts in single classes.