Rationalise dependency lists

Close #20