Cleanup dependencies
Fix keywords
Use crates.io for dependencies