Moved controls files to control folder