Adapted various components to common proto folder and corrected various errors See merge request teraflow-h2020/controller!129