Small changes in package hierarchy.