Everything now builds in the right location,.