restructure
Merge branch 'bugfix-desktops'