Added titles to Category pages and flattened Category folder structure