stop using main.cc! Also, update makefile