- remove the dirty vpath hack - factorize between the two estimation DLLs - factorize within SWZ makefile