WDF class (plus the reordering to be checked)
Switched to a class when reading wdf files. Modified the visualization functions accordingly. Created the reordering function. Double-check the reordering function - there are probably some cases still not covered, but it should now be easy to integrate them.