AT-9: reorganising dependencies