Fix File Formats & MD Structure