Move controls into separate folder