rename header files & fix thread idx

Threads are numbered in column major order within blocks. Simply by
exchange the (x, y) idx, the speed is doubled from 2 to 4.