refactored into separate Maven sub modules
fixed merge