Change naming conventions slightly -- use "data_{index}.extension" for filenames in the zip file, and "f_{index}" and "d_{index}" for file and div elements in the METS.
Comments and formatting
Set source and target version to 1.6