Updated config references. Unmarked package as private