Papadop reorg

Second try...