WIOS-74 Restructured dependenices