Moved npc to its own file
Added collisions