Working out structures
Added Makefile