File reorg before more refactoring.