Minor refractoring done to collision example and common library
To remove warnings/run-time errors (run-time error in collision example)
Forgot to add these files in previous commit