Fixed units. Added factories
fixed merge in projectile class