Restructured files
Updated Makefile and Readme