Add ship collisions and rename types to classes