Cleaned up some more.
Moved CollisionContactListener to controller.