Refactor dungeon and level