Update folder structure and Makefile.
Update README with instructions.
Update Makefile.