cleaned up obj handling code a little and removed legacy code.
Split npc's up into base code and extensions