Moved values around, upgraded Spring.
Moved hardcoded values to properties file.
Upgraded Spring version.
Removed Spring XML config file.