Reorganizing, and skeletal physics code.