Moved classes/Renamed packages.