KRACOEUS-6958: more modularity of spring files