More reorganzation, added temp sub-biome test