Javadoc
Package & XML attribute refactor following spring conventions