Collision Handler correction.
Capitalized source files for consistiency, cleaned up main a little.