Modified makefile to suit new directory structure

Conflicts:
	zen/makefile