More moving things around and clean up the external interface of
commands-cordova.js