Mustn't forget Western Swing!
Which (unless I'm mistaken) evolved through Bob Wills and the Texas Playboys and Jimmy Rogers into what is now "country."
And really, Today's country is NOT the same genre as the stuff I listened to growing up in the late fifties, early sixties. "Modern Country?"