Unifying the source tree