Fixed directory structure
Update dependencies and fix bugs for dependencies
Merge branch 'develop'