Edited build to reflect single source tree