Modularisation, instead of 13 modules now we have 3. Common, claim and circs