22-8-08 Astra & Hotbird

Added some more and move some.

Might not work for you back up yours in case.