- Reorganized package structure