upd: restructure