Reorganize package.