Modularise all the things!