Reorganizing package structure.