Reorganised PyOCD code... Ironic really, reorganising OCD code...