OpenAire+ integration

Some refactoring and integration with OA+