Move CPControl to own package