Fixing decompositions / refactoring cotsal et cotpat