Changed collision functionality

Removed the collision class, there is now no such thing as a collision
class. Put the methods in the namespace