refactoring NPC class, impproved constructor. Deleted old files
Merge branch 'npc' into develop