Retrieving the org tree via API instead of file to get .shortname() again. Eventuall...