Makefile updated to new folder structure