Rename SoftwarePackage to Software.

Change-Id: Ic8584f0e88aea5814bc74b0e65cde342b51d0de6
Fix ProjectQuota import.

Change-Id: I1acaf6becc0af34567df38bddcf88378e44e6dc8