Move metadata to separate file