a lot more xml/json files moved to separate files