Data Model Fix

* fix one to many logfile -> filters configuration
* reorder two autogen classes.