added npc1.gb file and refactored some code