[bugfix] Number of fixes relating to reference of consts in class.
[bugfix] Quite a big bug introduced affecting URI lookup.
[refactor] Functions to split URI moved to response class.
[refactor] Re-organising code layout.
[refactor] re-organizing code layout.
[feature] API functionality.