Restructuring of Spring configuration.
#IAA-75 work development 5m