Sounds to me like you have the idea. Here's a quote from chemguide.co.uk (one of my fave chem sites) about geometric isomerism:
"In stereoisomerism, the atoms making up the isomers are joined up in the same order, but still manage to have a different spatial arrangement. Geometric isomerism is one form of stereoisomerism."
He then goes on to talk about cis-trans isomerism as geometric isomerism.
Here's the isomerism menu page:
http://www.chemguide.co.uk/basicorg/isomermenu.html#topYou can read about structural isomers there, too if you want.