Wrote Makefile, reorganized project
Fixed