More cleanup to collision code.
Break cmodel into sub-module.