The file layout described in the upgrades design document has changed.
Adapt the base directories accordingly.

Signed-off-by: Klaus Aehlig <aehlig@google.com>
Reviewed-by: Michele Tartara <mtartara@google.com>