Updated makefile

Cleaned up project directories
All the Etats are now in their own folder
All object files are now output to an "obj" directory
merge merde