Remove old file
Add new one, better writing style
Add makefile to compile the all thing