More tree gen stuff
Moved everything to new package