added Makefile and moved files into main directory