Fixing Makefile
Fixing files for linux compilation