Simplify biome names; refactor Container.java