Some refectoring of pom project, to build from the root)