Updates to collision classes, structure cleanup