Refactored CollsionDetector
Removed unnecessary files