Oops, move o-core.js back to o.js.