rewrite make file and add extractor skeleton