Updates for file reorg