Migration to new build structure