reorganize package