update makefile with the new organizing folders