Improvements to FileFormat detection and loading
Work on DataFolder constructor