Moving to a different structure, pagination working.