Makefile, restructering directories.