Reclassified a few public API funcs.