Packages refactored to place all implementation-specific code in a
single package.