Some data-file structure changes
Optics Work

Optics Data now extends Comparable, also overrides equals() method.