Re-organization of BlockWormwood