fix build; move to the correct packages