At one time country music was folk but both have evolved in different directions. Dylan was folk in his early days but has also evolved to something else. (not always an improvement IMHO! ) :-}
Many years ago Canada and USA were America before our good friends to the south dumped all that good tea in Boston Hbr.
The music of Canada and the USA is often shared as a common pool and can not easily be defined as changing at the border. However, we sing Woody's This Land a bit different. :-}
             Obie