Updated Makefile
* makefile uses folder structure
* updated README