Adds Makefile  and changes some names to avoid clashing