Merge "script update to preserve the spec dir structure"