Tidying up various cross module dependencies