slight naming / organizational changes to ctl
merge commit