Changed packages, added generic bst data structure