Reorganize and add clean pix2angle / angle2pix