#389430 PATCH: restructure to enable use for add-on debs