towards modularisation