Some quick code re-shuffling around collision detection

the goal being to allow for automatic collision handling, i would like
first to get all the collision detection function out of the current
container object. Having a collision solver/handler seems to be the
right (clean) way for it