Restructured config file to support multiple storage targets