Clearer documentation and moving classes used in both protocols

- Makes a few function-calls clearer
- Moves some classes previously implemented in oictest to superclass