Group datasource 'Source's by navigation group

WIP