Fixed the Makefile after reorganization of the source files