Quick commit.
Reorganisation.
Add missing.
Merge branch 'whisper' into develop