cleanup, move and aggregate coherent logic to better package structure

NOTE: Has impact of sos-instances.data.xml as full qualified types are
configured!