Get folder naming correct.