Yes, the 30 day program now starts CFI and the second half of the course is CFII.
30 day starts 3rd Thursday of every month.
But I'm sure you can do the CFII as the initial checkride then add the CFI.