[task] minor structure changes