Move towards single file.