Restructure
Merge branch 'install-mode'