added Makefile
better structure