Project structure; Corrections; New Makefile.