finish package restructure