Use versioned directory for base
Use versioned directory for base