Merges maven modules

- RIO-80