Deeper modularisation