Rename package and separate out cli tool