Reorganize package structure.