Rename cdbifunc2.py to cdbifunc.py