First step towards more modularisation