Housekeeping: cleaning up folder naming.