Merge "Actually give raw folders a name."