Restructure Metadata