Add xmunch-atomspace dependency to pom.xml
Modify templates to match new description
Refactor