Modularization of the PhysicsWorld and created the CollisionModule.
Fixing merges
Committing Xcode project