[JBTM-1754] Change project names to be consitent with directory structure
Remove duplicate surefire declaration to fix warning