Move unit event generation into fleet

Big step towards #638 
return here