Organizing, makefile, some documentation and some shapes