Reorg GCD folder