Moved classes around in sub-packages.