Moved metadata classes into individual classes and moved it into a folder.