Make modules to use public API as appropriate