Merging dungeons classes into project