Move OTR to separate modules
Do some refactoring/cleanup