Migration to new superbuild components structure