Modularisation of the source