Rearranged things according to https://github.com/chartjes/opencfp/pull/2