Added better file names
Cleaned up cmake dir