move controls into library