Add support for UHR 2.0.
Change project structure.
Refactor.