Moved classes. Updated with a drill-down class for E200 structures
Formatting
Updated with better calibrations