3.0 typos and folder correction

I was almost ready to propose to remove it in the first place.