Renamed packages and some paths fixed names for 1.5