transitioning to fewer modules, moving to be able to provide more convenient client interfaces