Reorg

Now ready to merge !