Working on reorganizing NPC structure/adding NPCs
more reorganization of NPC movement/behavior