master: Moved Metadata to the right place.