organise in one maven module, refactor the project architecture for further extentions.