Move controls to new control folder