moved stuff into a directory
Makefile