Organized game files and added more robust collision support.

Given the fact that the number of objects being tested is small, a
somewhat naive implementation works well and is not
resource/computationally too intensive.