Updating new package structure for sources and targets