Reorganised spring xml files - each environment has its own complete xml. This will probably change during the refactoring phase as it violates DRY rule. Passing first step of the first useful scenario.