Package refactoring - fixed package structure