APW - img re-org