Update file names
Update
Add Makefile