Upverter

Please pull this one that clean up the build system and allow make -jN