Moved collision related stuff into a new folders