- Reorganized package naming structure