Upload to npm. Many refactor, way to use it as cli-tool, more params