(fix) refactor structure