Make constraint solver accept multiple constraints per package
Defer PackageSource import from project to avoid circular dep.
Fix typos and undefined things