Renamed func1 and func2 files and update makefile