Rename some modules to better distinguish what is in oasis.cli library and not.