the green that you have labled to white wire from engine do you mean the yellow?
If you look at the picture provided, there is only one wire that has the words "to white wire from engine" next to it. The wire it is pointing to looks to be green.
No offense here - but are you even looking at the pic? I can't make it any clearer.
P.S. You've consistenty used the phrase "CDI", and I've used it too, so you could follow along, but according to an A35 manual, your Tomos doesn't have CDI - just a plain points-type ignition. The part you have labelled CDI is actually the ignition coil. It doesn't change the wiring you've drawn out, but when communicating with others, it will be helpful to call it what it is.