update deps
move things around
2.0.0