Improvements
Add makefile
Layout changed