Introduce KPTreeControllerRework classes, revert KPTreeController to original pre-C state