diff --git a/odata/lib/odata2cqn.js b/odata/lib/index.js
similarity index 51%
rename from odata/lib/odata2cqn.js
rename to odata/lib/index.js
index d7e98d3d..1a2d79ae 100644
--- a/odata/lib/odata2cqn.js
+++ b/odata/lib/index.js
@@ -2,11 +2,25 @@ const fs = require("fs");
 const path = require("path");
 const peg = require("pegjs");
 const pegGrammarPath = path.join(__dirname, "/odata2cqn.pegjs");
-
 const odataPegGrammar = fs.readFileSync(pegGrammarPath, {
   encoding: "utf8",
   flag: "r",
 });
 const parser = peg.generate(odataPegGrammar);
 
-module.exports = { parser };
+
+module.exports = {
+  parse: {
+    url: parser.parse,
+  },
+  to: {
+    cqn: parser.parse,
+    url: (cqn) => pending(cqn)
+  },
+  serialize: (data) => pending(data),
+  deserialize: (body) => pending(body),
+}
+
+const pending = ()=>{
+  throw new Error ('Not yet implemented')
+}
diff --git a/odata/test/odata2cqn.test.js b/odata/test/odata2cqn.test.js
index 7606d26f..5b32e970 100644
--- a/odata/test/odata2cqn.test.js
+++ b/odata/test/odata2cqn.test.js
@@ -1,5 +1,5 @@
-const { parse:{cql:CQL}, test:{expect}} = require("@sap/cds/lib")
-const { parser:{parse:OData} } = require("../lib/odata2cqn")
+const cds = require("@sap/cds/lib"), {expect} = cds.test
+cds.odata = require("../lib")
 
 describe("$filter", () => {
 
@@ -12,8 +12,8 @@ describe("$filter", () => {
       // ...
     }
     it.each(Object.keys(types))("should support expressions with %s", (t) => {
-      expect (OData(`Foo?$filter=bar eq ${types[t]}`))
-      .to.eql (CQL(`SELECT from Foo where bar = ${types[t]}`))
+      expect (cds.odata.parse.url(`Foo?$filter=bar eq ${types[t]}`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where bar = ${types[t]}`))
     })
 
     const operators = {
@@ -26,8 +26,8 @@ describe("$filter", () => {
       // ...
     }
     it.each(Object.keys(operators))("should support comparison operator '%s'", (op) => {
-      expect (OData(`Foo?$filter=bar ${op} 11`))
-      .to.eql (CQL(`SELECT from Foo where bar ${operators[op]} 11`))
+      expect (cds.odata.parse.url(`Foo?$filter=bar ${op} 11`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where bar ${operators[op]} 11`))
     })
 
   });
@@ -35,69 +35,69 @@ describe("$filter", () => {
   describe("logical expressions", () => {
 
     it.each(['and','or'])("should support '%s'", (t) => {
-      expect (OData(`Foo?$filter=bar lt 11 ${t} name eq 'some name'`))
-      .to.eql (CQL(`SELECT from Foo where bar < 11 ${t} name = 'some name'`))
+      expect (cds.odata.parse.url(`Foo?$filter=bar lt 11 ${t} name eq 'some name'`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where bar < 11 ${t} name = 'some name'`))
     })
 
     it("should support 'not'", () => {
       // REVISIT: We need to check with the Node.js team why they translated that to the equivalent of:
       // not name like concat('%','sunny','%') escape '^'
-      expect (OData(`Foo?$filter= not contains(name,'sunny')`))
-      .to.eql (CQL(`SELECT from Foo where not contains(name,'sunny')`))
+      expect (cds.odata.parse.url(`Foo?$filter= not contains(name,'sunny')`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where not contains(name,'sunny')`))
     });
 
     // REVISIT: wait for compiler v2
     it("should support group expr", () => {
-      expect (OData(`Foo?$filter= (unitPrice gt 11 and length(name) eq 12) or name eq 'Restless and Wild'`))
-      .to.eql (CQL(`SELECT from Foo where (unitPrice > 11 and length(name) = 12) or name = 'Restless and Wild'`))
+      expect (cds.odata.parse.url(`Foo?$filter= (unitPrice gt 11 and length(name) eq 12) or name eq 'Restless and Wild'`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where (unitPrice > 11 and length(name) = 12) or name = 'Restless and Wild'`))
     });
   });
 
   describe("function expressions", () => {
 
     it("should support contains", () => {
-      expect (OData(`Foo?$filter= contains(name,'sunny')`))
-      .to.eql (CQL(`SELECT from Foo where contains(name,'sunny')`))
+      expect (cds.odata.parse.url(`Foo?$filter= contains(name,'sunny')`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where contains(name,'sunny')`))
     });
 
     it("should support startswith", () => {
-      expect (OData(`Foo?$filter= startswith(name,'sunny')`))
-      .to.eql (CQL(`SELECT from Foo where startswith(name,'sunny')`))
+      expect (cds.odata.parse.url(`Foo?$filter= startswith(name,'sunny')`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where startswith(name,'sunny')`))
     });
 
     it("should support endswith", () => {
-      expect (OData(`Foo?$filter= endswith(name,'sunny')`))
-      .to.eql (CQL(`SELECT from Foo where endswith(name,'sunny')`))
+      expect (cds.odata.parse.url(`Foo?$filter= endswith(name,'sunny')`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where endswith(name,'sunny')`))
     });
 
     it("should support length", () => {
-      expect (OData(`Foo?$filter= length(name) lt 11`))
-      .to.eql (CQL(`SELECT from Foo where length(name) < 11`))
+      expect (cds.odata.parse.url(`Foo?$filter= length(name) lt 11`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where length(name) < 11`))
     });
 
     it("should support indexof", () => {
-      expect (OData(`Foo?$filter= indexof(name,'x') eq 11`))
-      .to.eql (CQL(`SELECT from Foo where indexof(name,'x') = 11`))
+      expect (cds.odata.parse.url(`Foo?$filter= indexof(name,'x') eq 11`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where indexof(name,'x') = 11`))
     });
 
     it("should support substring", () => {
-      expect (OData(`Foo?$filter= substring(name,1) eq 'foo'`))
-      .to.eql (CQL(`SELECT from Foo where substring(name,1) = 'foo'`))
+      expect (cds.odata.parse.url(`Foo?$filter= substring(name,1) eq 'foo'`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where substring(name,1) = 'foo'`))
     });
 
     it.each(['tolower','toupper','trim'])("should support '%s'", (fn) => {
-      expect (OData(`Foo?$filter= ${fn}(name) eq 'foo'`))
-      .to.eql (CQL(`SELECT from Foo where ${fn}(name) = 'foo'`))
+      expect (cds.odata.parse.url(`Foo?$filter= ${fn}(name) eq 'foo'`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where ${fn}(name) = 'foo'`))
     });
 
     it("should support 'day'", () => {
-      expect (OData(`Foo?$filter= day(name) eq 11`))
-      .to.eql (CQL(`SELECT from Foo where day(name) = 11`))
+      expect (cds.odata.parse.url(`Foo?$filter= day(name) eq 11`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where day(name) = 11`))
     });
 
     it("should support concat", () => {
-      expect (OData(`Foo?$filter= concat(name,'o') eq 'foo'`))
-      .to.eql (CQL(`SELECT from Foo where concat(name,'o') = 'foo'`))
+      expect (cds.odata.parse.url(`Foo?$filter= concat(name,'o') eq 'foo'`))
+      .to.eql (cds.parse.cql(`SELECT from Foo where concat(name,'o') = 'foo'`))
     });
 
   });