Add new pyx templates.
Move around some files
Move around some files
Move around some files