Moved location of metadata classes.