SSP-2465 Modified package structure in SSP-PLATFORM