reorganised metadata structure
removed snapshot