Fixed the project structure with the new Makefile