CollisionDetector + Bullets restructured