Initial working state structure with 7zip available.
Merge remote-tracking branch 'remotes/origin/master'