Move metadata into separate files