creating npc with new structure
Merge branch 'npc' into develop