Modularised and tidied up dependencies