Return the fabuloso properties in another format

Return the properties hierarchically by service instead of a raw list