update NPO mapping, move to subfolder
update makefile for NPO
add status attribute to Directorship