Further work on migrating the meta data to their own files.