Update metadata.rb and standardize layout