Return to separate common folder for builds