Huge refactor; rename of classes and tree nodes, removed unused jars etc