Update makefile. Using C++11.
Re-allocate source files. Update makefile.