move controls to their own directory