Upgrade directory-layout dependency