Move control objects to their own files