Move FileDataStream & clean-up.

Cosmetic fixes and a class re-name.