added NPC filter example
restructures modules