Added new refactoring, base of npc, new scenes folder...