(ITS#6166) Overlay/backend restructuring