Mostly cosmetic.
Package refactoring.