Reorganized package structure.