Upgrade dir tree and make system