Change: working makefile, new dir-structure