Reorganize dependencies, upgrade packages
Version 2.0.0-beta009