Moved some controls to subfolders