Update file extension to distinguish between C and C++ & Add 1.7