[UPDATE] restructure.