Restructure the control packages