fix package references in subpackages
fix package references in servo
minor fix to README