Refactored Spring Configuration Files