changes in folder names and name of binary in Makefile