Added code for friendly NPC's and cleaned up some other stuff/directories.