reorganize CLJS support for next release candidate