Firew eindhoven

Most of the changes are code refactoring of the scenario-aware analysis. It is tested with the RVC-MPEG and WLAN.