Switched a few files over to using inner classes, remade translation to support YAML.