Restructuring to pave way to keep matrix decorations, matrices are now kept in a proper bean
Shouldn't have added those
Merge branch 'master' of https://github.com/dfci-cccb/mev