REFACTORING: Getting rid of disturbing generics in the Tree classes, only one generic remains. Also some code cleaning around the Tree classes.
REFACTORING: Renaming and deleting of old classes