Some import-fixes, added generated JavaDoc added png-versions of UML-
diagrams