Daq2 consolidation

This pull request only concerns daq and does not affect any other packages. Please consider it as early as possible. E.