Re-Add XML config, XML and YAML Config can now co-exist

Note: Make sure that you do not have duplicate entity names,
the yaml config will overwrite any item from the xml config
that has the same name