Restructured rubrics. Now sorted by date and grab id from filename