move OTR plugin from dev to generic