Added Makefile
Reorganized