Package namespace cleanup