again a new directory structure, also makefile edited