Troia 340 - reorganized maven structure and changed modules names