moved class / package references