Moved API stuff around, added shim class