Examples directory reorganized and Makefile environment variables fixed