Added restructuring, now using YAML.