Modal dialogs, source reorganisation