Basic makefile, and renamed sources