Makefile

Adjust in the Makefile to the new directiry structure