Renamed Config to PackageConfig. Small improvements and fixes.