public API refactoring

details forthcoming