Renamed packages to meet naming conventions