added Makefile and flattened structure