Collisions refactored,
Code layout changed