Renamed folders again.

Okay, I really can't help myself.