119383 - changed structure to meet maven release limitations