Non-spring configs and custom xstreams
refactored and added javadoc
Merge pull request #1 from AllTheDucks/refactor

Refactor