Moved classes around in packages.