File system hierarchy correction, mostly.