Moved file formats into subdirectory.
Removed references to previous files.