It follows the movies, because I use the scripts of the movies. I have the books, but not in English, so I can't use those very well.
This is going to be very long. I guess One or two more chapts for the first movie. There will be about 7 chaps for one movie, so in the end there will be like 21 chaps.
I will finish Detective Tezuka when I run out of ideas XD