more directory layout + Makefile