Restructure packages of wrap visitor