Undo previous commit

This does not fix the test on travis
Exposes api modules to public API