Cleanup of Spring config classes. Updated Readme.md