Initial rework of tree to support different architectures/OSes.