Separated collision into new package and updated makefile for it