Added Makefile
Minor detail in Makefile
Started refactoring extractor.