Brought back missing organization data

Was accidentally removed by cleanpom SNAPSHOT
Updated the plugins to prevent it in the future.