Consolidate cljs into core ns