Updated makefile, structure, documentation