package restructure