code reorg for vw