removed one import-warning, renamed client-classes 4 better locking in
diagram and now it should be clear, what which class does.