Move metadata to right class