Reorganise tree so there's less clutter