Work on structure and upgrade dependencies.