some minor changes and pom
Result of templates generation