cleanup & move tree files, minor debugging