Moved metadata into base folder