Renamed Packages, made some minor fixes