(#393) - Modularise all the things