Restructured dependencies