Réorganisation

Signed-off-by: Charles Minc <charles.minc@wanadoo.fr>
Merge remote-tracking branch 'origin/Geography'