Chaned the paths so that less has to change when using a different fs.
These should have been in the last cl.
More file extension consistency renames.