Updated imports to reflect moved metadata.