Files adapted for correct use of Makefile!