Update Npc.java

Structure changes.