Multiple organizations support

@mst-appear I'm not up to date with java versions, now do you do that?