Changing structure for packaging

Signed-off-by:  <>