packaging: reorder packaging to meet physical layout

Change-Id: I35e95e689adc1fc8bbc487a63c094817ae5b1cdb
Signed-off-by: Alon Bar-Lev <alonbl@redhat.com>