Redo config format, different paths, more general