Split dependency classes into separate files