Last commit of reorg work