moved otapi's to separate folder