Minor file reorg