Update: Merge VariantDir and SConscript