Start refactoring collision detection

Start refactoring collision detection and setting up classes for
inheritance