Modified file structure. Makefile is not very sophisticated, but it should work. One has to set the flags for both Makefiles by hand!