#36 more fixes to structures of project and POMs