Reorganize code, mostly to have a central controller object (Scene)
Merge branch 'features/control-window'