Minor bugfixes in Makefile, renamed Thrift code

I renamed the skeleton files for the user-generated portions of the
Thrift code for reasons relating to Make pattern matching (in implicit
rules), and realized that Make was calling make clean in the gen
directory twice, now fixed.