re-organized dependencies