Rework dependencies
Rename to gem