Remove duplication and move qcamerasvr for consistency