Some Layer cleanup regarding BiomeGroups

Nothing has changed here logically... Just shuffling code, renaming, and
simplifying