collision specific changes + some collision template classes -> should delete them probably