added Makefile, reorganized tests directory structure