Adapted path to new source tree organisation