added module collecting metadata; organized filenaming