IR-102: Some Tidying up the structure (now same as in the german bern.xml)