Refactor + modif makefile.