arranging files and added Makefile