Restructured ctrls and deps