Renamed CollisionWrapper
Renamed CollisionWrapper
Added more utility classes