Move metadata-related classes to make.metatata
Remove unnecessary imports