Move the metadata types into their respective files