Update dependencies
Reorganize